From 23a620460b7b350fad4b71334c5d6b6ddec31115 Mon Sep 17 00:00:00 2001 From: vga91 Date: Tue, 17 Dec 2024 09:20:47 +0100 Subject: [PATCH 1/3] Fix TeamCity errors for 5.26 --- .../java/apoc/couchbase/CouchbaseTestUtils.java | 15 +++++++++------ .../src/test/java/apoc/vectordb/WeaviateTest.java | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java index 224e27627b..0f91c0122d 100644 --- a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java +++ b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java @@ -10,12 +10,12 @@ import com.couchbase.client.java.json.JsonArray; import com.couchbase.client.java.json.JsonObject; import com.couchbase.client.java.env.ClusterEnvironment; +import com.couchbase.client.java.manager.bucket.BucketSettings; import com.couchbase.client.java.manager.collection.CollectionManager; import com.couchbase.client.java.manager.collection.CollectionSpec; import com.couchbase.client.java.query.QueryResult; import com.couchbase.client.java.query.QueryScanConsistency; import org.testcontainers.containers.Container; -import org.testcontainers.couchbase.BucketDefinition; import org.testcontainers.couchbase.CouchbaseContainer; import java.time.Duration; @@ -65,7 +65,7 @@ public class CouchbaseTestUtils { public static boolean fillDB(Cluster cluster) { Bucket couchbaseBucket = cluster.bucket(BUCKET_NAME); - couchbaseBucket.waitUntilReady(Duration.ofMinutes(1)); + couchbaseBucket.waitUntilReady(Duration.ofMinutes(5)); Collection collection = couchbaseBucket.defaultCollection(); collection.insert("artist:vincent_van_gogh", VINCENT_VAN_GOGH); QueryResult queryResult = cluster.query(String.format(QUERY, BUCKET_NAME), @@ -85,7 +85,7 @@ public static boolean fillDB(Cluster cluster) { } public static String getUrl(CouchbaseContainer couchbaseContainer) { - return String.format("couchbase://%s:%s@%s:%s", USERNAME, PASSWORD, couchbaseContainer.getContainerIpAddress(), couchbaseContainer.getMappedPort(8091)); + return String.format("couchbase://%s:%s@%s:%s", USERNAME, PASSWORD, couchbaseContainer.getHost(), couchbaseContainer.getMappedPort(8091)); } @SuppressWarnings("unchecked") @@ -135,10 +135,9 @@ protected static void checkDocumentMetadata(CouchbaseJsonDocument jsonDocumentCr protected static void createCouchbaseContainer() { // 7.x support stably multi collections and scopes - couchbase = new CouchbaseContainer("couchbase/server:7.2.6") + couchbase = new CouchbaseContainer("couchbase/server:7.6.4") .withStartupAttempts(3) - .withCredentials(USERNAME, PASSWORD) - .withBucket(new BucketDefinition(BUCKET_NAME)); + .withCredentials(USERNAME, PASSWORD); couchbase.start(); ClusterEnvironment environment = ClusterEnvironment.create(); @@ -150,6 +149,10 @@ protected static void createCouchbaseContainer() { Cluster cluster = Cluster.connect(seedNodes, ClusterOptions.clusterOptions(USERNAME, PASSWORD).environment(environment)); + cluster.buckets().createBucket( + BucketSettings.create(BUCKET_NAME) + ); + boolean isFilled = fillDB(cluster); HOST = getUrl(couchbase); Bucket bucket = cluster.bucket(BUCKET_NAME); diff --git a/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java b/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java index 66671e26de..aaece6918d 100644 --- a/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java +++ b/extended-it/src/test/java/apoc/vectordb/WeaviateTest.java @@ -561,7 +561,7 @@ private static void assertQueryVectorsWithSystemDbStorage(String keyConfig, Stri db, query, params, - "Caused by: java.io.FileNotFoundException: http://127.0.0.1:" + HOST.split(":")[1] + "/v3/graphql" + "Caused by: java.io.FileNotFoundException" ); return; } From af82357e04bb77edb44f3cebbc38d393b29be372 Mon Sep 17 00:00:00 2001 From: vga91 Date: Tue, 17 Dec 2024 10:17:50 +0100 Subject: [PATCH 2/3] added waitOptions --- .../src/test/java/apoc/couchbase/CouchbaseTestUtils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java index 0f91c0122d..3971653bc5 100644 --- a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java +++ b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java @@ -3,10 +3,12 @@ import apoc.couchbase.document.CouchbaseJsonDocument; import com.couchbase.client.core.env.SeedNode; import com.couchbase.client.core.io.CollectionIdentifier; +import com.couchbase.client.core.service.ServiceType; import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Cluster; import com.couchbase.client.java.ClusterOptions; import com.couchbase.client.java.Collection; +import com.couchbase.client.java.diagnostics.WaitUntilReadyOptions; import com.couchbase.client.java.json.JsonArray; import com.couchbase.client.java.json.JsonObject; import com.couchbase.client.java.env.ClusterEnvironment; @@ -65,7 +67,9 @@ public class CouchbaseTestUtils { public static boolean fillDB(Cluster cluster) { Bucket couchbaseBucket = cluster.bucket(BUCKET_NAME); - couchbaseBucket.waitUntilReady(Duration.ofMinutes(5)); + WaitUntilReadyOptions waitOptions = WaitUntilReadyOptions.waitUntilReadyOptions() + .serviceTypes(ServiceType.QUERY); + couchbaseBucket.waitUntilReady(Duration.ofMinutes(5), waitOptions); Collection collection = couchbaseBucket.defaultCollection(); collection.insert("artist:vincent_van_gogh", VINCENT_VAN_GOGH); QueryResult queryResult = cluster.query(String.format(QUERY, BUCKET_NAME), From a418e3efe5c9eca794b6e26f3412a3d9b0faa666 Mon Sep 17 00:00:00 2001 From: vga91 Date: Tue, 17 Dec 2024 11:02:46 +0100 Subject: [PATCH 3/3] restored withBucket instead of manual bucket creation --- .../src/test/java/apoc/couchbase/CouchbaseTestUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java index 3971653bc5..25c2da3041 100644 --- a/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java +++ b/extended-it/src/test/java/apoc/couchbase/CouchbaseTestUtils.java @@ -18,6 +18,7 @@ import com.couchbase.client.java.query.QueryResult; import com.couchbase.client.java.query.QueryScanConsistency; import org.testcontainers.containers.Container; +import org.testcontainers.couchbase.BucketDefinition; import org.testcontainers.couchbase.CouchbaseContainer; import java.time.Duration; @@ -141,7 +142,8 @@ protected static void createCouchbaseContainer() { // 7.x support stably multi collections and scopes couchbase = new CouchbaseContainer("couchbase/server:7.6.4") .withStartupAttempts(3) - .withCredentials(USERNAME, PASSWORD); + .withCredentials(USERNAME, PASSWORD) + .withBucket(new BucketDefinition(BUCKET_NAME)); couchbase.start(); ClusterEnvironment environment = ClusterEnvironment.create(); @@ -153,10 +155,6 @@ protected static void createCouchbaseContainer() { Cluster cluster = Cluster.connect(seedNodes, ClusterOptions.clusterOptions(USERNAME, PASSWORD).environment(environment)); - cluster.buckets().createBucket( - BucketSettings.create(BUCKET_NAME) - ); - boolean isFilled = fillDB(cluster); HOST = getUrl(couchbase); Bucket bucket = cluster.bucket(BUCKET_NAME);