couchbase 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c1e2edfe7f74eb3f3094dd526e7dc1896f3002caca935ddeb76923b593f341
-  data.tar.gz: b5409f7083156b38aee870037ce0c5d3a14dc7ffe3aa3ac64b5862245b47e4d5
+  metadata.gz: 85cf5d55d22898824be380bb1a1da7e8b29e294d06a9c5789964220afcb916f8
+  data.tar.gz: c56798cd37877f4b4560d224f7ae31d522c7b84ebf643e6f530e73111bca8347
 SHA512:
-  metadata.gz: 16705649dc3954db461a7f8a63ee1168a4b191cacb0744e4e5b5b7b110788491d42fab78611b4898078a0276bbe0d9930352e24b4f95db87ab79ed6b6e8f9101
-  data.tar.gz: 157af7be99dc745ef7d95ef45490c0025f16ead6abb2f75079188405e82fcec9a64abb681695720e9080fd36b3c17883a56f84bafd06062e56c22ad9286c7ed4
+  metadata.gz: d3453198ae619b3ca540fc909688a3132aaf1f2ef47b402eeec7ae63a8110328f4bad6cfec356a218c35a3f1aafc8abf2a51869b2808ec14cc4521064ddb8a41
+  data.tar.gz: 05bd481ed690587544062493db78198b07f13728e65df45cdfbb5538c6a3c9f1e25fca5b78e1385d10d88c8a802d146cb363e115f206b679ff4e58bb1cfe0391

data/README.md

@@ -23,7 +23,7 @@ The library has been tested with MRI 3.0, 3.1 and 3.2. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.4.4"
+gem "couchbase", "3.4.5"
 ```
 
 And then execute:

data/ext/couchbase/CMakeLists.txt

@@ -170,6 +170,7 @@ set(couchbase_cxx_client_FILES
         core/operations/management/cluster_developer_preview_enable.cxx
         core/operations/management/collection_create.cxx
         core/operations/management/collection_drop.cxx
+        core/operations/management/collection_update.cxx
         core/operations/management/collections_manifest_get.cxx
         core/operations/management/error_utils.cxx
         core/operations/management/eventing_deploy_function.cxx
@@ -271,7 +272,9 @@ set(couchbase_cxx_client_FILES
         core/impl/configuration_profiles_registry.cxx
         core/impl/conjunction_query.cxx
         core/impl/create_bucket.cxx
+        core/impl/create_collection.cxx
         core/impl/create_query_index.cxx
+        core/impl/create_scope.cxx
         core/impl/date_range.cxx
         core/impl/date_range_facet.cxx
         core/impl/date_range_facet_result.cxx
@@ -280,7 +283,9 @@ set(couchbase_cxx_client_FILES
         core/impl/disjunction_query.cxx
         core/impl/dns_srv_tracker.cxx
         core/impl/drop_bucket.cxx
+        core/impl/drop_collection.cxx
         core/impl/drop_query_index.cxx
+        core/impl/drop_scope.cxx
         core/impl/exists.cxx
         core/impl/expiry.cxx
         core/impl/fail_fast_retry_strategy.cxx
@@ -293,6 +298,7 @@ set(couchbase_cxx_client_FILES
         core/impl/get_all_buckets.cxx
         core/impl/get_all_query_indexes.cxx
         core/impl/get_all_replicas.cxx
+        core/impl/get_all_scopes.cxx
         core/impl/get_and_lock.cxx
         core/impl/get_and_touch.cxx
         core/impl/get_any_replica.cxx
@@ -380,6 +386,7 @@ set(couchbase_cxx_client_FILES
         core/impl/transaction_op_error_category.cxx
         core/impl/unlock.cxx
         core/impl/update_bucket.cxx
+        core/impl/update_collection.cxx
         core/impl/upsert.cxx
         core/impl/view_error_category.cxx
         core/impl/watch_query_indexes.cxx

data/ext/couchbase/core/cluster.hxx

@@ -336,6 +336,13 @@ class cluster : public std::enable_shared_from_this<cluster>
     template<typename Handler>
     void do_open(Handler&& handler)
     {
+        // Warn users if idle_http_connection_timeout is too close to server idle timeouts
+        if (origin_.options().idle_http_connection_timeout > std::chrono::milliseconds(4'500)) {
+            CB_LOG_INFO("[{}]: The SDK may produce trivial warnings due to the idle HTTP connection timeout being set above the idle"
+                        "timeout of various services",
+                        id_);
+        }
+
         // Warn users if they attempt to use Capella without TLS being enabled.
         bool has_capella_host = false;
         {

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

@@ -59,6 +59,9 @@ map_bucket_settings(const couchbase::management::cluster::bucket_settings& bucke
     bucket_settings.num_replicas = bucket.num_replicas;
     bucket_settings.replica_indexes = bucket.replica_indexes;
     bucket_settings.flush_enabled = bucket.flush_enabled;
+    bucket_settings.history_retention_collection_default = bucket.history_retention_collection_default;
+    bucket_settings.history_retention_bytes = bucket.history_retention_bytes;
+    bucket_settings.history_retention_duration = bucket.history_retention_duration;
     switch (bucket.conflict_resolution_type) {
         case management::cluster::bucket_conflict_resolution::unknown:
             bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::unknown;

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

@@ -0,0 +1,83 @@
+/* -*- 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 "core/cluster.hxx"
+#include "core/operations/management/collection_create.hxx"
+#include "couchbase/collection_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::collection_create_request
+build_collection_create_request(std::string bucket_name,
+                                std::string scope_name,
+                                std::string collection_name,
+                                const create_collection_settings& settings,
+                                const create_collection_options::built& options)
+{
+    core::operations::management::collection_create_request request{
+        std::move(bucket_name), std::move(scope_name), std::move(collection_name), settings.max_expiry, settings.history, {},
+        options.timeout
+    };
+    return request;
+}
+
+void
+collection_manager::create_collection(std::string scope_name,
+                                      std::string collection_name,
+                                      const couchbase::create_collection_settings& settings,
+                                      const couchbase::create_collection_options& options,
+                                      couchbase::create_collection_handler&& handler) const
+{
+    auto request =
+      build_collection_create_request(bucket_name_, std::move(scope_name), std::move(collection_name), settings, options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::collection_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+collection_manager::create_collection(std::string scope_name,
+                                      std::string collection_name,
+                                      const couchbase::create_collection_settings& settings,
+                                      const couchbase::create_collection_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_collection(std::move(scope_name), std::move(collection_name), settings, options, [barrier](auto ctx) mutable {
+        barrier->set_value(std::move(ctx));
+    });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -0,0 +1,69 @@
+/* -*- 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 "core/operations/management/scope_create.hxx"
+#include "couchbase/collection_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::scope_create_request
+build_scope_create_request(std::string bucket_name, std::string scope_name, const create_scope_options::built& options)
+{
+    core::operations::management::scope_create_request request{ std::move(bucket_name), std::move(scope_name), {}, options.timeout };
+    return request;
+}
+
+void
+collection_manager::create_scope(std::string scope_name,
+                                 const couchbase::create_scope_options& options,
+                                 couchbase::create_scope_handler&& handler) const
+{
+    auto request = build_scope_create_request(bucket_name_, std::move(scope_name), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::scope_create_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+collection_manager::create_scope(std::string scope_name, const couchbase::create_scope_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_scope(std::move(scope_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -0,0 +1,76 @@
+/* -*- 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 "core/cluster.hxx"
+#include "core/operations/management/collection_drop.hxx"
+#include "couchbase/collection_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::collection_drop_request
+build_collection_drop_request(std::string bucket_name,
+                              std::string scope_name,
+                              std::string collection_name,
+                              const drop_collection_options::built& options)
+{
+    core::operations::management::collection_drop_request request{
+        std::move(bucket_name), std::move(scope_name), std::move(collection_name), {}, options.timeout
+    };
+    return request;
+}
+
+void
+collection_manager::drop_collection(std::string scope_name,
+                                    std::string collection_name,
+                                    const couchbase::drop_collection_options& options,
+                                    couchbase::drop_collection_handler&& handler) const
+{
+    auto request = build_collection_drop_request(bucket_name_, std::move(scope_name), std::move(collection_name), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::collection_drop_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+collection_manager::drop_collection(std::string scope_name,
+                                    std::string collection_name,
+                                    const couchbase::drop_collection_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_collection(
+      std::move(scope_name), std::move(collection_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -0,0 +1,68 @@
+/* -*- 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 "core/cluster.hxx"
+#include "core/operations/management/scope_drop.hxx"
+#include "couchbase/collection_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::scope_drop_request
+build_drop_scope_request(std::string bucket_name, std::string scope_name, const drop_scope_options::built& options)
+{
+    core::operations::management::scope_drop_request request{ std::move(bucket_name), std::move(scope_name), {}, options.timeout };
+    return request;
+}
+
+void
+collection_manager::drop_scope(std::string scope_name,
+                               const couchbase::drop_scope_options& options,
+                               couchbase::drop_scope_handler&& handler) const
+{
+    auto request = build_drop_scope_request(bucket_name_, std::move(scope_name), options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::scope_drop_response resp) mutable {
+        return handler(build_context(resp));
+    });
+}
+
+auto
+collection_manager::drop_scope(std::string scope_name, const couchbase::drop_scope_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    drop_scope(std::move(scope_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -52,11 +52,26 @@ map_bucket_settings(const couchbase::core::management::cluster::bucket_settings&
     couchbase::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;
+    bucket_settings.history_retention_collection_default = bucket.history_retention_collection_default;
+    if (bucket.max_expiry.has_value()) {
+        bucket_settings.max_expiry = bucket.max_expiry.value();
+    }
+    if (bucket.num_replicas.has_value()) {
+        bucket_settings.num_replicas = bucket.num_replicas.value();
+    }
+    if (bucket.replica_indexes.has_value()) {
+        bucket_settings.replica_indexes = bucket.replica_indexes.value();
+    }
+    if (bucket.flush_enabled.has_value()) {
+        bucket_settings.flush_enabled = bucket.flush_enabled.value();
+    }
+    if (bucket.history_retention_bytes.has_value()) {
+        bucket_settings.history_retention_bytes = bucket.history_retention_bytes.value();
+    }
+    if (bucket.history_retention_duration.has_value()) {
+        bucket_settings.history_retention_duration = bucket.history_retention_duration.value();
+    }
     switch (bucket.conflict_resolution_type) {
         case core::management::cluster::bucket_conflict_resolution::unknown:
             bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::unknown;

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

@@ -0,0 +1,94 @@
+/* -*- 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 "core/cluster.hxx"
+#include "core/operations/management/scope_get_all.hxx"
+#include "couchbase/collection_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::scope_get_all_request
+build_get_all_scopes_request(std::string bucket_name, const get_all_scopes_options::built& options)
+{
+    core::operations::management::scope_get_all_request request{ std::move(bucket_name), {}, options.timeout };
+    return request;
+}
+
+static management::bucket::collection_spec
+map_collection(std::string scope_name, const core::topology::collections_manifest::collection& collection)
+{
+    management::bucket::collection_spec spec{};
+    spec.name = collection.name;
+    spec.scope_name = std::move(scope_name);
+    spec.max_expiry = collection.max_expiry;
+    spec.history = collection.history;
+    return spec;
+}
+
+static std::vector<couchbase::management::bucket::scope_spec>
+map_scope_specs(core::topology::collections_manifest& manifest)
+{
+    std::vector<couchbase::management::bucket::scope_spec> scope_specs{};
+    for (const auto& scope : manifest.scopes) {
+        couchbase::management::bucket::scope_spec converted_scope{};
+        converted_scope.name = scope.name;
+        for (const auto& collection : scope.collections) {
+            auto collection_spec = map_collection(scope.name, collection);
+            converted_scope.collections.emplace_back(collection_spec);
+        }
+        scope_specs.emplace_back(converted_scope);
+    }
+    return scope_specs;
+}
+
+void
+collection_manager::get_all_scopes(const get_all_scopes_options& options, get_all_scopes_handler&& handler) const
+{
+    auto request = build_get_all_scopes_request(bucket_name_, options.build());
+
+    core_->execute(std::move(request), [handler = std::move(handler)](core::operations::management::scope_get_all_response resp) mutable {
+        return handler(build_context(resp), map_scope_specs(resp.manifest));
+    });
+}
+
+auto
+collection_manager::get_all_scopes(const couchbase::get_all_scopes_options& options) const
+  -> std::future<std::pair<manager_error_context, std::vector<management::bucket::scope_spec>>>
+{
+    auto barrier = std::make_shared<std::promise<std::pair<manager_error_context, std::vector<management::bucket::scope_spec>>>>();
+    get_all_scopes(options,
+                   [barrier](auto ctx, auto result) mutable { barrier->set_value(std::make_pair(std::move(ctx), std::move(result))); });
+    return barrier->get_future();
+}
+} // namespace couchbase

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

@@ -52,11 +52,26 @@ map_bucket_settings(const couchbase::core::management::cluster::bucket_settings&
     couchbase::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;
+    bucket_settings.history_retention_collection_default = bucket.history_retention_collection_default;
+    if (bucket.max_expiry.has_value()) {
+        bucket_settings.max_expiry = bucket.max_expiry.value();
+    }
+    if (bucket.num_replicas.has_value()) {
+        bucket_settings.num_replicas = bucket.num_replicas.value();
+    }
+    if (bucket.replica_indexes.has_value()) {
+        bucket_settings.replica_indexes = bucket.replica_indexes.value();
+    }
+    if (bucket.flush_enabled.has_value()) {
+        bucket_settings.flush_enabled = bucket.flush_enabled.value();
+    }
+    if (bucket.history_retention_bytes.has_value()) {
+        bucket_settings.history_retention_bytes = bucket.history_retention_bytes.value();
+    }
+    if (bucket.history_retention_duration.has_value()) {
+        bucket_settings.history_retention_duration = bucket.history_retention_duration.value();
+    }
     switch (bucket.conflict_resolution_type) {
         case core::management::cluster::bucket_conflict_resolution::unknown:
             bucket_settings.conflict_resolution_type = management::cluster::bucket_conflict_resolution::unknown;

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

@@ -113,6 +113,7 @@ initiate_lookup_in_all_replicas_operation(std::shared_ptr<cluster> core,
                                 lookup_in_entry.value = field.value;
                                 lookup_in_entry.exists = field.exists;
                                 lookup_in_entry.original_index = field.original_index;
+                                lookup_in_entry.ec = field.ec;
                                 entries.emplace_back(lookup_in_entry);
                             }
                             ctx->result_.emplace_back(lookup_in_replica_result{ resp.cas, entries, resp.deleted, true /* replica */ });
@@ -155,6 +156,7 @@ initiate_lookup_in_all_replicas_operation(std::shared_ptr<cluster> core,
                           lookup_in_entry.value = field.value;
                           lookup_in_entry.exists = field.exists;
                           lookup_in_entry.original_index = field.original_index;
+                          lookup_in_entry.ec = field.ec;
                           entries.emplace_back(lookup_in_entry);
                       }
                       ctx->result_.emplace_back(lookup_in_replica_result{ resp.cas, entries, resp.deleted, false /* active */ });

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

@@ -118,6 +118,7 @@ initiate_lookup_in_any_replica_operation(std::shared_ptr<cluster> core,
                                         entry.original_index = field.original_index;
                                         entry.exists = field.exists;
                                         entry.value = field.value;
+                                        entry.ec = field.ec;
                                         entries.emplace_back(entry);
                                     }
                                     return local_handler(std::move(resp.ctx),
@@ -156,6 +157,7 @@ initiate_lookup_in_any_replica_operation(std::shared_ptr<cluster> core,
                       entry.original_index = field.original_index;
                       entry.exists = field.exists;
                       entry.value = field.value;
+                      entry.ec = field.ec;
                       entries.emplace_back(entry);
                   }
                   return local_handler(std::move(resp.ctx),

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

@@ -70,6 +70,9 @@ lookup_in_replica_request::make_response(key_value_error_context&& ctx, const en
             fields[i].status = res_entry.status;
             fields[i].ec =
               protocol::map_status_code(protocol::client_opcode::subdoc_multi_mutation, static_cast<std::uint16_t>(res_entry.status));
+            if (fields[i].opcode == protocol::subdoc_opcode::exists && fields[i].ec == errc::key_value::path_not_found) {
+                fields[i].ec.clear();
+            }
             if (!fields[i].ec && !ctx.ec()) {
                 ec = fields[i].ec;
             }
@@ -79,7 +82,11 @@ lookup_in_replica_request::make_response(key_value_error_context&& ctx, const en
             }
             fields[i].exists =
               res_entry.status == key_value_status_code::success || res_entry.status == key_value_status_code::subdoc_success_deleted;
-            fields[i].value = utils::to_binary(res_entry.value);
+            if (fields[i].opcode == protocol::subdoc_opcode::exists && !fields[i].ec) {
+                fields[i].value = utils::json::generate_binary(fields[i].exists);
+            } else {
+                fields[i].value = utils::to_binary(res_entry.value);
+            }
         }
         if (!ec) {
             cas = encoded.cas();

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

@@ -59,6 +59,9 @@ map_bucket_settings(const couchbase::management::cluster::bucket_settings& bucke
     bucket_settings.num_replicas = bucket.num_replicas;
     bucket_settings.replica_indexes = bucket.replica_indexes;
     bucket_settings.flush_enabled = bucket.flush_enabled;
+    bucket_settings.history_retention_collection_default = bucket.history_retention_collection_default;
+    bucket_settings.history_retention_bytes = bucket.history_retention_bytes;
+    bucket_settings.history_retention_duration = bucket.history_retention_duration;
     switch (bucket.conflict_resolution_type) {
         case management::cluster::bucket_conflict_resolution::unknown:
             bucket_settings.conflict_resolution_type = core::management::cluster::bucket_conflict_resolution::unknown;