couchbase 3.4.2 → 3.4.4

data/ext/couchbase/test/test_integration_query.cxx

@@ -31,6 +31,10 @@ TEST_CASE("integration: trivial non-data query", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -46,6 +50,10 @@ TEST_CASE("integration: query with handler capturing non-copyable object", "[int
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (!integration.cluster_version().supports_gcccp()) {
@@ -70,9 +78,14 @@ TEST_CASE("integration: query with handler capturing non-copyable object", "[int
 TEST_CASE("integration: query on a collection", "[integration]")
 {
     test::utils::integration_test_guard integration;
+
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     auto scope_name = test::utils::uniq_id("scope");
@@ -102,14 +115,20 @@ TEST_CASE("integration: query on a collection", "[integration]")
     }
 
     {
-        couchbase::core::operations::management::query_index_create_request req{};
-        req.bucket_name = integration.ctx.bucket;
-        req.scope_name = scope_name;
-        req.collection_name = collection_name;
-        req.index_name = index_name;
-        req.is_primary = true;
-        auto resp = test::utils::execute(integration.cluster, req);
-        INFO(resp.ctx.http_body)
+        couchbase::core::operations::management::query_index_create_response resp;
+        bool operation_completed = test::utils::wait_until([&integration, &index_name, &scope_name, &collection_name, &resp]() {
+            couchbase::core::operations::management::query_index_create_request req{};
+            req.bucket_name = integration.ctx.bucket;
+            req.scope_name = scope_name;
+            req.collection_name = collection_name;
+            req.index_name = index_name;
+            req.is_primary = true;
+            resp = test::utils::execute(integration.cluster, req);
+
+            return resp.ctx.ec != couchbase::errc::common::bucket_not_found && resp.ctx.ec != couchbase::errc::common::scope_not_found;
+        });
+        REQUIRE(operation_completed);
+        INFO(resp.ctx.http_body);
         REQUIRE_SUCCESS(resp.ctx.ec);
     }
 
@@ -166,12 +185,22 @@ TEST_CASE("integration: query on a collection", "[integration]")
         REQUIRE(resp.rows.size() == 1);
         REQUIRE(value == couchbase::core::utils::json::parse(resp.rows[0]));
     }
+
+    {
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
+        auto resp = test::utils::execute(integration.cluster, req);
+        REQUIRE_SUCCESS(resp.ctx.ec);
+    }
 }
 
 TEST_CASE("integration: read only with no results", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -188,6 +217,10 @@ TEST_CASE("integration: invalid query", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -199,12 +232,16 @@ TEST_CASE("integration: invalid query", "[integration]")
     }
 }
 
-TEST_CASE("integration: preserve expiry for mutatation query", "[integration]")
+TEST_CASE("integration: preserve expiry for mutation query", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_preserve_expiry_for_query()) {
-        return;
+        SKIP("cluster does not support support preserve expiry for query");
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -264,6 +301,10 @@ TEST_CASE("integration: streaming query results", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -286,6 +327,10 @@ TEST_CASE("integration: streaming query results with stop in the middle", "[inte
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -315,8 +360,11 @@ TEST_CASE("integration: streaming analytics results", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics() || !integration.has_analytics_service()) {
-        return;
+    if (!integration.cluster_version().supports_analytics()) {
+        SKIP("cluster does not support analytics");
+    }
+    if (!integration.has_analytics_service()) {
+        SKIP("cluster does not have analytics service");
     }
 
     if (!integration.cluster_version().supports_gcccp()) {
@@ -345,6 +393,10 @@ TEST_CASE("integration: sticking query to the service node", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -412,10 +464,16 @@ TEST_CASE("analytics create dataset")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics() || !integration.has_analytics_service() ||
-        !integration.cluster_version().supports_collections()) {
-        return;
+    if (!integration.cluster_version().supports_analytics()) {
+        SKIP("cluster does not support analytics");
+    }
+    if (!integration.cluster_version().supports_collections()) {
+        SKIP("cluster does not support collections");
+    }
+    if (!integration.has_analytics_service()) {
+        SKIP("cluster does not have analytics service");
     }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -434,6 +492,11 @@ TEST_CASE("analytics create dataset")
 TEST_CASE("integration: prepared query", "[integration]")
 {
     test::utils::integration_test_guard integration;
+
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     auto key = test::utils::uniq_id("foo");
     tao::json::value value = {
@@ -468,6 +531,10 @@ TEST_CASE("integration: query with public API", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
+
     if (!integration.cluster_version().supports_gcccp()) {
         test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     }
@@ -505,8 +572,11 @@ TEST_CASE("integration: query from scope with public API", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query()) {
+        SKIP("cluster does not support query");
+    }
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
 
     if (!integration.cluster_version().supports_gcccp()) {