couchbase 3.4.2 → 3.4.4

data/ext/couchbase/core/impl/build_deferred_query_indexes.cxx

@@ -20,44 +20,116 @@
 
 #include "core/cluster.hxx"
 #include "core/operations/management/query_index_build.hxx"
-#include "core/operations/management/query_index_get_all_deferred.hxx"
-#include "core/utils/json.hxx"
+#include "core/operations/management/query_index_build_deferred.hxx"
 
-namespace couchbase::core::impl
+namespace couchbase
 {
 template<typename Response>
 static manager_error_context
 build_context(Response& resp)
 {
-    return { resp.ctx.ec,
-             resp.ctx.last_dispatched_to,
-             resp.ctx.last_dispatched_from,
-             resp.ctx.retry_attempts,
-             std::move(resp.ctx.retry_reasons),
-             std::move(resp.ctx.client_context_id),
-             resp.ctx.http_status,
-             std::move(resp.ctx.http_body),
-             std::move(resp.ctx.path) };
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
 }
+
+static core::operations::management::query_index_build_request
+build_build_index_request(std::string bucket_name,
+                          core::operations::management::query_index_get_all_deferred_response list_resp,
+                          const build_query_index_options::built& options)
+{
+    core::operations::management::query_index_build_request request{
+        std::move(bucket_name), {}, {}, {}, std::move(list_resp.index_names), {}, options.timeout
+    };
+    return request;
+}
+
+static core::operations::management::query_index_get_all_deferred_request
+build_get_all_request(std::string bucket_name, const build_query_index_options::built& options)
+{
+    core::operations::management::query_index_get_all_deferred_request request{ std::move(bucket_name), {}, {}, {}, {}, options.timeout };
+    return request;
+}
+
+static core::operations::management::query_index_build_request
+build_build_index_request(std::string bucket_name,
+                          std::string scope_name,
+                          std::string collection_name,
+                          core::operations::management::query_index_get_all_deferred_response list_resp,
+                          const build_query_index_options::built& options)
+{
+    core::operations::management::query_index_build_request request{ "",
+                                                                     "",
+                                                                     std::move(collection_name),
+                                                                     core::query_context{ std::move(bucket_name), std::move(scope_name) },
+                                                                     std::move(list_resp.index_names),
+                                                                     {},
+                                                                     options.timeout };
+    return request;
+}
+
+static core::operations::management::query_index_get_all_deferred_request
+build_get_all_request(std::string bucket_name,
+                      std::string scope_name,
+                      std::string collection_name,
+                      const build_query_index_options::built& options)
+{
+    core::operations::management::query_index_get_all_deferred_request request{
+        "", "", std::move(collection_name), core::query_context{ std::move(bucket_name), std::move(scope_name) }, {}, options.timeout
+    };
+    return request;
+}
+
 void
-initiate_build_deferred_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                                std::string bucket_name,
-                                build_query_index_options::built options,
-                                query_context query_ctx,
-                                std::string collection_name,
-                                build_deferred_query_indexes_handler&& handler)
+query_index_manager::build_deferred_indexes(std::string bucket_name,
+                                            const couchbase::build_query_index_options& options,
+                                            couchbase::build_deferred_query_indexes_handler&& handler) const
+{
+
+    auto get_all_request = build_get_all_request(bucket_name, options.build());
+    core_->execute(std::move(get_all_request),
+                   [handler = std::move(handler), this, bucket_name, options](
+                     core::operations::management::query_index_get_all_deferred_response resp1) mutable {
+                       auto list_resp = std::move(resp1);
+                       if (list_resp.ctx.ec) {
+                           return handler(build_context(list_resp));
+                       }
+                       if (list_resp.index_names.empty()) {
+                           return handler(build_context(list_resp));
+                       }
+                       auto build_request = build_build_index_request(std::move(bucket_name), list_resp, options.build());
+                       core_->execute(
+                         std::move(build_request),
+                         [handler = std::move(handler)](core::operations::management::query_index_build_response resp2) mutable {
+                             auto build_resp = std::move(resp2);
+                             return handler(build_context(build_resp));
+                         });
+                   });
+}
+
+auto
+query_index_manager::build_deferred_indexes(std::string bucket_name, const couchbase::build_query_index_options& options) const
+  -> std::future<manager_error_context>
 {
-    core->execute(
-      operations::management::query_index_get_all_deferred_request{
-        bucket_name,
-        "",
-        collection_name,
-        query_ctx,
-        {},
-        options.timeout,
-      },
-      [core, bucket_name, collection_name, options = std::move(options), query_ctx, handler = std::move(handler)](
-        operations::management::query_index_get_all_deferred_response resp1) mutable {
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    build_deferred_indexes(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
+void
+collection_query_index_manager::build_deferred_indexes(const build_query_index_options& options,
+                                                       build_deferred_query_indexes_handler&& handler) const
+{
+    auto get_all_request = build_get_all_request(bucket_name_, scope_name_, collection_name_, options.build());
+    core_->execute(
+      std::move(get_all_request),
+      [handler = std::move(handler), this, options](core::operations::management::query_index_get_all_deferred_response resp1) mutable {
           auto list_resp = std::move(resp1);
           if (list_resp.ctx.ec) {
               return handler(build_context(list_resp));
@@ -65,28 +137,21 @@ initiate_build_deferred_indexes(std::shared_ptr<couchbase::core::cluster> core,
           if (list_resp.index_names.empty()) {
               return handler(build_context(list_resp));
           }
-          core->execute(
-            operations::management::query_index_build_request{
-              std::move(bucket_name),
-              "",
-              collection_name,
-              query_ctx,
-              std::move(list_resp.index_names),
-              {},
-              options.timeout,
-            },
-            [handler = std::move(handler)](operations::management::query_index_build_response resp2) {
-                auto build_resp = std::move(resp2);
-                return handler(build_context(build_resp));
-            });
+          auto build_request = build_build_index_request(bucket_name_, scope_name_, collection_name_, list_resp, options.build());
+          core_->execute(std::move(build_request),
+                         [handler = std::move(handler)](core::operations::management::query_index_build_response resp2) mutable {
+                             auto build_resp = std::move(resp2);
+                             return handler(build_context(build_resp));
+                         });
       });
 }
-void
-initiate_build_deferred_indexes(std::shared_ptr<couchbase::core::cluster> core,
-                                std::string bucket_name,
-                                build_query_index_options::built options,
-                                build_deferred_query_indexes_handler&& handler)
+
+auto
+collection_query_index_manager::build_deferred_indexes(const couchbase::build_query_index_options& options) const
+  -> std::future<manager_error_context>
 {
-    return initiate_build_deferred_indexes(core, std::move(bucket_name), options, {}, "", std::move(handler));
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    build_deferred_indexes(options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
 }
-} // namespace couchbase::core::impl
+} // namespace couchbase

data/ext/couchbase/core/impl/cluster.cxx

@@ -82,6 +82,9 @@ options_to_origin(const std::string& connection_string, const couchbase::cluster
         if (opts.security.trust_certificate.has_value()) {
             user_options.trust_certificate = opts.security.trust_certificate.value();
         }
+        if (opts.security.trust_certificate_value.has_value()) {
+            user_options.trust_certificate_value = opts.security.trust_certificate_value.value();
+        }
         switch (opts.security.tls_verify) {
             case couchbase::tls_verify_mode::none:
                 user_options.tls_verify = core::tls_verify_mode::none;
@@ -90,6 +93,9 @@ options_to_origin(const std::string& connection_string, const couchbase::cluster
                 user_options.tls_verify = core::tls_verify_mode::peer;
                 break;
         }
+        user_options.disable_mozilla_ca_certificates = opts.security.disable_mozilla_ca_certificates;
+        user_options.tls_disable_deprecated_protocols = opts.security.disable_deprecated_protocols;
+        user_options.tls_disable_v1_2 = opts.security.disable_tls_v1_2;
     }
 
     if (opts.dns.nameserver) {
@@ -98,9 +104,11 @@ options_to_origin(const std::string& connection_string, const couchbase::cluster
     }
     user_options.enable_clustermap_notification = opts.behavior.enable_clustermap_notification;
     user_options.show_queries = opts.behavior.show_queries;
+    user_options.dump_configuration = opts.behavior.dump_configuration;
     user_options.enable_mutation_tokens = opts.behavior.enable_mutation_tokens;
     user_options.enable_unordered_execution = opts.behavior.enable_unordered_execution;
     user_options.user_agent_extra = opts.behavior.user_agent_extra;
+    user_options.network = opts.behavior.network;
 
     user_options.enable_tcp_keep_alive = opts.network.enable_tcp_keep_alive;
     user_options.tcp_keep_alive_interval = opts.network.tcp_keep_alive_interval;

data/ext/couchbase/core/impl/conjunction_query.cxx

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#include "encoded_search_query.hxx"
+
+#include <couchbase/conjunction_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+conjunction_query::encode() const -> encoded_search_query
+{
+    if (conjuncts_.empty()) {
+        return { errc::common::invalid_argument };
+    }
+
+    encoded_search_query built;
+    built.query = tao::json::empty_object;
+    if (boost_) {
+        built.query["boost"] = boost_.value();
+    }
+
+    tao::json::value conjuncts = tao::json::empty_array;
+    for (const auto& conjunct : conjuncts_) {
+        auto encoded = conjunct->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        conjuncts.push_back(encoded.query);
+    }
+    built.query["conjuncts"] = conjuncts;
+
+    return built;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/create_bucket.cxx

@@ -0,0 +1,155 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#include <couchbase/manager_error_context.hxx>
+#include <utility>
+
+#include "core/cluster.hxx"
+#include "couchbase/bucket_manager.hxx"
+
+namespace couchbase
+{
+template<typename Response>
+static manager_error_context
+build_context(Response& resp)
+{
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
+}
+
+static core::operations::management::bucket_create_request
+build_create_bucket_request(couchbase::core::management::cluster::bucket_settings bucket_settings,
+                            const create_bucket_options::built& options)
+{
+    core::operations::management::bucket_create_request request{ std::move(bucket_settings), {}, options.timeout };
+    return request;
+}
+
+static couchbase::core::management::cluster::bucket_settings
+map_bucket_settings(const couchbase::management::cluster::bucket_settings& bucket)
+{
+
+    couchbase::core::management::cluster::bucket_settings bucket_settings{};
+
+    bucket_settings.name = bucket.name;
+    bucket_settings.ram_quota_mb = bucket.ram_quota_mb;
+    bucket_settings.max_expiry = bucket.max_expiry;
+    bucket_settings.minimum_durability_level = bucket.minimum_durability_level;
+    bucket_settings.num_replicas = bucket.num_replicas;
+    bucket_settings.replica_indexes = bucket.replica_indexes;
+    bucket_settings.flush_enabled = bucket.flush_enabled;
+    switch (bucket.conflict_resolution_type) {
+        case management::cluster::bucket_conflict_resolution::unknown:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::unknown;
+            break;
+        case management::cluster::bucket_conflict_resolution::timestamp:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::timestamp;
+            break;
+        case management::cluster::bucket_conflict_resolution::sequence_number:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::sequence_number;
+            break;
+        case management::cluster::bucket_conflict_resolution::custom:
+            bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::custom;
+            break;
+    }
+    switch (bucket.eviction_policy) {
+        case management::cluster::bucket_eviction_policy::unknown:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::unknown;
+            break;
+        case management::cluster::bucket_eviction_policy::full:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::full;
+            break;
+        case management::cluster::bucket_eviction_policy::value_only:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::value_only;
+            break;
+        case management::cluster::bucket_eviction_policy::no_eviction:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::no_eviction;
+            break;
+        case management::cluster::bucket_eviction_policy::not_recently_used:
+            bucket_settings.eviction_policy = core::management::cluster::bucket_eviction_policy::not_recently_used;
+            break;
+    }
+    switch (bucket.compression_mode) {
+        case management::cluster::bucket_compression::unknown:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::unknown;
+            break;
+        case management::cluster::bucket_compression::active:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::active;
+            break;
+        case management::cluster::bucket_compression::passive:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::passive;
+            break;
+        case management::cluster::bucket_compression::off:
+            bucket_settings.compression_mode = core::management::cluster::bucket_compression::off;
+            break;
+    }
+    switch (bucket.bucket_type) {
+        case management::cluster::bucket_type::unknown:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::unknown;
+            break;
+        case management::cluster::bucket_type::couchbase:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::couchbase;
+            break;
+        case management::cluster::bucket_type::memcached:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::memcached;
+            break;
+        case management::cluster::bucket_type::ephemeral:
+            bucket_settings.bucket_type = core::management::cluster::bucket_type::ephemeral;
+            break;
+    }
+    switch (bucket.storage_backend) {
+        case management::cluster::bucket_storage_backend::unknown:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::unknown;
+            break;
+        case management::cluster::bucket_storage_backend::magma:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::magma;
+            break;
+        case management::cluster::bucket_storage_backend::couchstore:
+            bucket_settings.storage_backend = core::management::cluster::bucket_storage_backend::couchstore;
+            break;
+    }
+    return bucket_settings;
+}
+
+void
+bucket_manager::create_bucket(const management::cluster::bucket_settings& bucket_settings,
+                              const create_bucket_options& options,
+                              create_bucket_handler&& handler) const
+{
+    auto request = build_create_bucket_request(map_bucket_settings(bucket_settings), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::bucket_create_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+bucket_manager::create_bucket(const management::cluster::bucket_settings& bucket_settings, const create_bucket_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_bucket(bucket_settings, options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase