couchbase 4.4.1-dev.2 → 4.4.2

package/deps/couchbase-cxx-client/core/impl/boolean_query.cxx

@@ -15,12 +15,14 @@
  *   limitations under the License.
  */
 
-#include "encoded_search_query.hxx"
-
 #include <couchbase/boolean_query.hxx>
 
+#include "encoded_search_query.hxx"
+
 #include <couchbase/error_codes.hxx>
 
+#include <tao/json/type.hpp>
+
 namespace couchbase
 {
 auto

package/deps/couchbase-cxx-client/core/impl/bootstrap_error.hxx

@@ -0,0 +1,34 @@
+/* -*- 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.
+ */
+
+#pragma once
+
+#include <optional>
+#include <string>
+#include <system_error>
+
+namespace couchbase::core::impl
+{
+
+struct bootstrap_error {
+  std::error_code ec;
+  std::string error_message;
+  std::optional<std::string> hostname;
+  std::optional<std::string> port;
+};
+
+} // namespace couchbase::core::impl

package/deps/couchbase-cxx-client/core/impl/bucket.cxx

@@ -15,12 +15,22 @@
  *   limitations under the License.
  */
 
+#include <couchbase/bucket.hxx>
+
 #include "core/cluster.hxx"
 #include "diagnostics.hxx"
 
-#include <couchbase/bucket.hxx>
+#include <couchbase/collection.hxx>
+#include <couchbase/collection_manager.hxx>
+#include <couchbase/error.hxx>
+#include <couchbase/ping_options.hxx>
+#include <couchbase/ping_result.hxx>
+#include <couchbase/scope.hxx>
 
+#include <future>
 #include <memory>
+#include <string_view>
+#include <utility>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/core/impl/bucket_manager.cxx

@@ -15,8 +15,11 @@
  *   limitations under the License.
  */
 
-#include "core/cluster.hxx"
+#include <couchbase/bucket_manager.hxx>
 
+#include "core/cluster.hxx"
+#include "core/impl/error.hxx"
+#include "core/management/bucket_settings.hxx"
 #include "core/operations/management/bucket_create.hxx"
 #include "core/operations/management/bucket_drop.hxx"
 #include "core/operations/management/bucket_flush.hxx"
@@ -24,11 +27,19 @@
 #include "core/operations/management/bucket_get_all.hxx"
 #include "core/operations/management/bucket_update.hxx"
 
-#include "core/impl/error.hxx"
-
-#include <couchbase/bucket_manager.hxx>
+#include <couchbase/create_bucket_options.hxx>
+#include <couchbase/drop_bucket_options.hxx>
+#include <couchbase/error.hxx>
+#include <couchbase/flush_bucket_options.hxx>
+#include <couchbase/get_all_buckets_options.hxx>
+#include <couchbase/get_bucket_options.hxx>
+#include <couchbase/management/bucket_settings.hxx>
+#include <couchbase/update_bucket_options.hxx>
 
+#include <future>
 #include <memory>
+#include <utility>
+#include <vector>
 
 namespace couchbase
 {
@@ -44,24 +55,12 @@ map_bucket_settings(const couchbase::core::management::cluster::bucket_settings&
   bucket_settings.minimum_durability_level = bucket.minimum_durability_level;
   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();
-  }
+  bucket_settings.max_expiry = bucket.max_expiry;
+  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_bytes = bucket.history_retention_bytes;
+  bucket_settings.history_retention_duration = bucket.history_retention_duration;
   switch (bucket.conflict_resolution_type) {
     case core::management::cluster::bucket_conflict_resolution::unknown:
       bucket_settings.conflict_resolution_type =

package/deps/couchbase-cxx-client/core/impl/cluster.cxx

@@ -19,25 +19,56 @@
 
 #include "analytics.hxx"
 #include "core/agent_group.hxx"
+#include "core/agent_group_config.hxx"
+#include "core/cluster_options.hxx"
+#include "core/core_sdk_shim.hxx"
+#include "core/io/ip_protocol.hxx"
+#include "core/origin.hxx"
+#include "core/tls_verify_mode.hxx"
 #include "core/transactions.hxx"
 #include "core/utils/connection_string.hxx"
+#include "core/utils/movable_function.hxx"
 #include "diagnostics.hxx"
 #include "error.hxx"
-#include "internal_search_error_context.hxx"
-#include "internal_search_meta_data.hxx"
 #include "internal_search_result.hxx"
-#include "internal_search_row.hxx"
-#include "internal_search_row_location.hxx"
-#include "internal_search_row_locations.hxx"
 #include "query.hxx"
 #include "search.hxx"
 
+#include <couchbase/analytics_index_manager.hxx>
+#include <couchbase/analytics_options.hxx>
+#include <couchbase/analytics_result.hxx>
 #include <couchbase/bucket.hxx>
+#include <couchbase/bucket_manager.hxx>
 #include <couchbase/cluster.hxx>
+#include <couchbase/cluster_options.hxx>
+#include <couchbase/diagnostics_options.hxx>
+#include <couchbase/diagnostics_result.hxx>
+#include <couchbase/fork_event.hxx>
+#include <couchbase/ip_protocol.hxx>
+#include <couchbase/ping_options.hxx>
+#include <couchbase/ping_result.hxx>
+#include <couchbase/query_index_manager.hxx>
+#include <couchbase/query_options.hxx>
+#include <couchbase/query_result.hxx>
+#include <couchbase/search_index_manager.hxx>
+#include <couchbase/search_options.hxx>
+#include <couchbase/search_request.hxx>
+#include <couchbase/tls_verify_mode.hxx>
+#include <couchbase/transactions.hxx>
 
 #include <asio/bind_executor.hpp>
+#include <asio/detail/concurrency_hint.hpp>
+#include <asio/execution_context.hpp>
 #include <asio/post.hpp>
 
+#include <functional>
+#include <future>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <system_error>
+#include <utility>
+
 namespace couchbase
 {
 cluster::cluster(std::shared_ptr<cluster_impl> impl)
@@ -109,7 +140,6 @@ options_to_origin(const std::string& connection_string,
   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.server_group = opts.network.server_group;
   user_options.enable_tcp_keep_alive = opts.network.enable_tcp_keep_alive;
@@ -119,8 +149,10 @@ options_to_origin(const std::string& connection_string,
   if (opts.network.max_http_connections) {
     user_options.max_http_connections = opts.network.max_http_connections.value();
   }
-  if (!opts.network.network.empty()) {
-    user_options.network = opts.network.network;
+  user_options.network = opts.network.network;
+  if (user_options.network.empty()) {
+    // this is deprecated option, but use it in case main options is empty
+    user_options.network = opts.behavior.network;
   }
   switch (opts.network.ip_protocol) {
     case ip_protocol::any:
@@ -183,6 +215,12 @@ fork_event_to_asio(fork_event event) -> asio::execution_context::fork_event
 class cluster_impl : public std::enable_shared_from_this<cluster_impl>
 {
 public:
+  cluster_impl() = default;
+  cluster_impl(const cluster_impl&) = delete;
+  cluster_impl(cluster_impl&&) = delete;
+  auto operator=(const cluster_impl&) = delete;
+  auto operator=(cluster_impl&&) = delete;
+
   ~cluster_impl()
   {
     std::promise<void> barrier;

package/deps/couchbase-cxx-client/core/impl/collection.cxx

@@ -15,8 +15,18 @@
  *   limitations under the License.
  */
 
+#include <couchbase/collection.hxx>
+
+#include "error.hxx"
+#include "get_all_replicas.hxx"
+#include "get_any_replica.hxx"
+#include "internal_scan_result.hxx"
+#include "observe_poll.hxx"
+
 #include "core/agent_group.hxx"
+#include "core/agent_group_config.hxx"
 #include "core/cluster.hxx"
+#include "core/impl/subdoc/command.hxx"
 #include "core/logger/logger.hxx"
 #include "core/operations/document_append.hxx"
 #include "core/operations/document_decrement.hxx"
@@ -41,19 +51,57 @@
 #include "core/operations/document_upsert.hxx"
 #include "core/range_scan_options.hxx"
 #include "core/range_scan_orchestrator.hxx"
-#include "error.hxx"
-#include "get_all_replicas.hxx"
-#include "get_any_replica.hxx"
-#include "get_replica.hxx"
-#include "internal_scan_result.hxx"
-#include "lookup_in_all_replicas.hxx"
-#include "lookup_in_any_replica.hxx"
-#include "lookup_in_replica.hxx"
-#include "observe_poll.hxx"
-
-#include <couchbase/collection.hxx>
-
+#include "core/range_scan_orchestrator_options.hxx"
+#include "core/topology/configuration.hxx"
+
+#include <couchbase/binary_collection.hxx>
+#include <couchbase/cas.hxx>
+#include <couchbase/codec/encoded_value.hxx>
+#include <couchbase/collection_query_index_manager.hxx>
+#include <couchbase/durability_level.hxx>
+#include <couchbase/error.hxx>
+#include <couchbase/error_codes.hxx>
+#include <couchbase/exists_options.hxx>
+#include <couchbase/exists_result.hxx>
+#include <couchbase/expiry.hxx>
+#include <couchbase/get_all_replicas_options.hxx>
+#include <couchbase/get_and_lock_options.hxx>
+#include <couchbase/get_and_touch_options.hxx>
+#include <couchbase/get_any_replica_options.hxx>
+#include <couchbase/get_options.hxx>
+#include <couchbase/get_replica_result.hxx>
+#include <couchbase/get_result.hxx>
+#include <couchbase/insert_options.hxx>
+#include <couchbase/lookup_in_all_replicas_options.hxx>
+#include <couchbase/lookup_in_any_replica_options.hxx>
+#include <couchbase/lookup_in_options.hxx>
+#include <couchbase/lookup_in_replica_result.hxx>
+#include <couchbase/lookup_in_specs.hxx>
+#include <couchbase/mutate_in_options.hxx>
+#include <couchbase/mutate_in_specs.hxx>
+#include <couchbase/persist_to.hxx>
+#include <couchbase/remove_options.hxx>
+#include <couchbase/replace_options.hxx>
+#include <couchbase/replicate_to.hxx>
+#include <couchbase/result.hxx>
+#include <couchbase/scan_options.hxx>
+#include <couchbase/scan_type.hxx>
+#include <couchbase/touch_options.hxx>
+#include <couchbase/unlock_options.hxx>
+#include <couchbase/upsert_options.hxx>
+
+#include <fmt/format.h>
+
+#include <chrono>
+#include <cstdint>
+#include <future>
 #include <memory>
+#include <optional>
+#include <string_view>
+#include <system_error>
+#include <utility>
+#include <variant>
+#include <vector>
 
 namespace couchbase
 {
@@ -422,6 +470,7 @@ public:
       },
       [handler = std::move(handler)](auto resp) mutable {
         std::vector<lookup_in_result::entry> entries;
+        entries.reserve(resp.fields.size());
         for (auto& field : resp.fields) {
           entries.emplace_back(lookup_in_result::entry{
             std::move(field.path),
@@ -862,8 +911,7 @@ public:
                 }
                 auto internal_result =
                   std::make_shared<internal_scan_result>(std::move(core_scan_result));
-                scan_result result{ internal_result };
-                return handler({}, result);
+                return handler({}, scan_result{ internal_result });
               });
           });
       });

package/deps/couchbase-cxx-client/core/impl/collection_manager.cxx

@@ -17,17 +17,32 @@
 
 #include "core/cluster.hxx"
 
+#include "core/impl/error.hxx"
 #include "core/operations/management/collection_create.hxx"
 #include "core/operations/management/collection_drop.hxx"
 #include "core/operations/management/collection_update.hxx"
 #include "core/operations/management/scope_create.hxx"
 #include "core/operations/management/scope_drop.hxx"
 #include "core/operations/management/scope_get_all.hxx"
+#include "core/topology/collections_manifest.hxx"
 
-#include "core/impl/error.hxx"
 #include <couchbase/collection_manager.hxx>
+#include <couchbase/create_collection_options.hxx>
+#include <couchbase/create_scope_options.hxx>
+#include <couchbase/drop_collection_options.hxx>
+#include <couchbase/drop_scope_options.hxx>
+#include <couchbase/error.hxx>
+#include <couchbase/get_all_scopes_options.hxx>
+#include <couchbase/management/collection_spec.hxx>
+#include <couchbase/management/scope_spec.hxx>
+#include <couchbase/update_collection_options.hxx>
 
+#include <future>
 #include <memory>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/core/impl/common_error_category.cxx

@@ -18,6 +18,7 @@
 #include <couchbase/error_codes.hxx>
 
 #include <string>
+#include <system_error>
 
 namespace couchbase::core::impl
 {

package/deps/couchbase-cxx-client/core/impl/configuration_profiles_registry.cxx

@@ -15,12 +15,19 @@
  *   limitations under the License.
  */
 
-#include <couchbase/cluster_options.hxx>
 #include <couchbase/configuration_profiles_registry.hxx>
+
+#include <couchbase/cluster_options.hxx>
+#include <couchbase/configuration_profile.hxx>
 #include <couchbase/wan_development_configuration_profile.hxx>
 
+#include <functional>
 #include <map>
+#include <memory>
 #include <mutex>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace couchbase
 {
@@ -50,7 +57,7 @@ configuration_profiles_registry::register_profile(const std::string& name,
     return;
   }
   auto& instance = registry_instance();
-  std::scoped_lock lock(instance.store_mutex);
+  const std::scoped_lock lock(instance.store_mutex);
   instance.store[name] = std::move(profile);
 }
 
@@ -63,7 +70,7 @@ configuration_profiles_registry::apply_profile(const std::string& name,
     return;
   }
   auto& instance = registry_instance();
-  std::scoped_lock lock(instance.store_mutex);
+  const std::scoped_lock lock(instance.store_mutex);
   if (auto it = instance.store.find(name); it != instance.store.end() && it->second != nullptr) {
     profile = it->second;
   } else {
@@ -79,7 +86,7 @@ configuration_profiles_registry::available_profiles() -> std::vector<std::string
 {
   std::vector<std::string> profile_names;
   auto& instance = registry_instance();
-  std::scoped_lock lock(instance.store_mutex);
+  const std::scoped_lock lock(instance.store_mutex);
   profile_names.reserve(instance.store.size());
   for (const auto& [name, _] : instance.store) {
     profile_names.push_back(name);

package/deps/couchbase-cxx-client/core/impl/conjunction_query.cxx

@@ -18,9 +18,10 @@
 #include "encoded_search_query.hxx"
 
 #include <couchbase/conjunction_query.hxx>
-
 #include <couchbase/error_codes.hxx>
 
+#include <tao/json/type.hpp>
+
 namespace couchbase
 {
 auto

package/deps/couchbase-cxx-client/core/impl/date_range.cxx

@@ -18,6 +18,13 @@
 #include <couchbase/date_range.hxx>
 
 #include <fmt/chrono.h>
+#include <fmt/format.h>
+
+#include <chrono>
+#include <ctime>
+#include <optional>
+#include <string>
+#include <utility>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/core/impl/date_range_facet.cxx

@@ -20,6 +20,8 @@
 #include <couchbase/date_range_facet.hxx>
 #include <couchbase/error_codes.hxx>
 
+#include <tao/json/type.hpp>
+
 namespace couchbase
 {
 auto

package/deps/couchbase-cxx-client/core/impl/date_range_facet_result.cxx

@@ -15,9 +15,17 @@
  *   limitations under the License.
  */
 
+#include <couchbase/date_range_facet_result.hxx>
+
 #include "internal_date_range_facet_result.hxx"
 
-#include <couchbase/date_range_facet_result.hxx>
+#include <couchbase/search_date_range.hxx>
+
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/core/impl/date_range_query.cxx

@@ -15,13 +15,18 @@
  *   limitations under the License.
  */
 
-#include "encoded_search_query.hxx"
-
 #include <couchbase/date_range_query.hxx>
 
+#include "encoded_search_query.hxx"
+
 #include <couchbase/error_codes.hxx>
 
 #include <fmt/chrono.h>
+#include <fmt/format.h>
+#include <tao/json/type.hpp>
+
+#include <chrono>
+#include <ctime>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/core/impl/diagnostics.cxx

@@ -23,10 +23,14 @@
 
 #include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/diagnostics_result.hxx>
+#include <couchbase/endpoint_diagnostics.hxx>
 #include <couchbase/endpoint_ping_report.hxx>
 #include <couchbase/ping_result.hxx>
 #include <couchbase/service_type.hxx>
 
+#include <tao/json/forward.hpp>
+#include <tao/json/type.hpp>
+
 #include <cstdint>
 #include <map>
 #include <set>
@@ -100,11 +104,11 @@ endpoint_ping_report_as_json(const endpoint_ping_report& report)
     { "local", report.local() },
     { "state", ping_state_as_string(report.state()) },
   };
-  if (report.error()) {
-    res["error"] = report.error().value();
+  if (auto val = report.error(); val) {
+    res["error"] = val.value();
   }
-  if (report.endpoint_namespace()) {
-    res["namespace"] = report.endpoint_namespace().value();
+  if (auto val = report.endpoint_namespace(); val) {
+    res["namespace"] = val.value();
   }
   return res;
 }
@@ -119,14 +123,14 @@ endpoint_diagnostics_as_json(const endpoint_diagnostics& report)
     { "remote", report.remote() },
     { "state", endpoint_state_as_string(report.state()) },
   };
-  if (report.last_activity()) {
-    res["last_activity_us"] = report.last_activity().value().count();
+  if (auto val = report.last_activity(); val) {
+    res["last_activity_us"] = val.value().count();
   }
-  if (report.endpoint_namespace()) {
-    res["namespace"] = report.endpoint_namespace().value();
+  if (auto val = report.endpoint_namespace(); val) {
+    res["namespace"] = val.value();
   }
-  if (report.details()) {
-    res["details"] = report.details();
+  if (auto val = report.details(); val) {
+    res["details"] = val.value();
   }
   return res;
 }

package/deps/couchbase-cxx-client/core/impl/disjunction_query.cxx

@@ -15,12 +15,14 @@
  *   limitations under the License.
  */
 
-#include "encoded_search_query.hxx"
-
 #include <couchbase/disjunction_query.hxx>
 
+#include "encoded_search_query.hxx"
+
 #include <couchbase/error_codes.hxx>
 
+#include <tao/json/type.hpp>
+
 namespace couchbase
 {
 auto