couchbase 3.7.0 → 3.8.0

data/ext/couchbase/core/operations/management/search_index_drop.hxx

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -47,6 +48,7 @@ struct search_index_drop_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/search_index_get.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/search_index.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -48,6 +49,7 @@ struct search_index_get_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/search_index_get_all.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/search_index.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -47,6 +48,7 @@ struct search_index_get_all_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/search_index_get_documents_count.hxx

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -49,6 +50,7 @@ struct search_index_get_documents_count_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/search_index_get_stats.hxx

@@ -21,6 +21,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -45,6 +46,7 @@ struct search_index_get_stats_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/search_index_upsert.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/search_index.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -50,6 +51,7 @@ struct search_index_upsert_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/user_drop.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -46,6 +47,7 @@ struct user_drop_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/user_get.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -47,6 +48,7 @@ struct user_get_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/user_get_all.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -46,6 +47,7 @@ struct user_get_all_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/user_upsert.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/rbac.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -47,6 +48,7 @@ struct user_upsert_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/view_index_drop.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_context.hxx"
 #include "core/io/http_message.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -45,6 +46,7 @@ struct view_index_drop_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/view_index_get.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/design_document.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -46,6 +47,7 @@ struct view_index_get_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/view_index_get_all.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/design_document.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -46,6 +47,7 @@ struct view_index_get_all_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/management/view_index_upsert.hxx

@@ -22,6 +22,7 @@
 #include "core/io/http_message.hxx"
 #include "core/management/design_document.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations::management
@@ -44,6 +45,7 @@ struct view_index_upsert_request {
 
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
+  std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
 
   [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
                                           http_context& context) const;

data/ext/couchbase/core/operations/operation_traits.hxx

@@ -28,4 +28,10 @@ struct is_compound_operation : public std::false_type {
 template<typename T>
 inline constexpr bool is_compound_operation_v = is_compound_operation<T>::value;
 
+template<typename T>
+struct is_cancellable_operation : public std::false_type {
+};
+
+template<typename T>
+inline constexpr bool is_cancellable_operation_v = is_cancellable_operation<T>::value;
 } // namespace couchbase::core::operations

data/ext/couchbase/core/operations.hxx

@@ -41,5 +41,4 @@
 #include "core/operations/document_touch.hxx"
 #include "core/operations/document_unlock.hxx"
 #include "core/operations/document_upsert.hxx"
-#include "core/operations/document_view.hxx"
 #include "core/operations/http_noop.hxx"

data/ext/couchbase/core/operations_fwd.hxx

@@ -36,6 +36,8 @@ struct observe_seqno_request;
 struct observe_seqno_response;
 template<typename mutation_request>
 struct with_legacy_durability;
+template<typename kv_request>
+struct with_cancellation;
 } // namespace impl
 
 namespace operations
@@ -103,6 +105,12 @@ using remove_request_with_legacy_durability = impl::with_legacy_durability<remov
 using replace_request_with_legacy_durability = impl::with_legacy_durability<replace_request>;
 using upsert_request_with_legacy_durability = impl::with_legacy_durability<upsert_request>;
 
+using get_request_with_cancellation = impl::with_cancellation<get_request>;
+using get_replica_request_with_cancellation = impl::with_cancellation<impl::get_replica_request>;
+using lookup_in_request_with_cancellation = impl::with_cancellation<lookup_in_request>;
+using lookup_in_replica_request_with_cancellation =
+  impl::with_cancellation<impl::lookup_in_replica_request>;
+
 namespace management
 {
 struct analytics_dataset_create_request;

data/ext/couchbase/core/origin.cxx

@@ -26,6 +26,7 @@
 
 #include <tao/json.hpp>
 
+#include <mutex>
 #include <random>
 #include <utility>
 
@@ -99,6 +100,19 @@ struct traits<couchbase::core::io::dns::dns_config> {
   }
 };
 
+template<>
+struct traits<couchbase::core::orphan_reporter_options> {
+  template<template<typename...> class Traits>
+  static void assign(tao::json::basic_value<Traits>& v,
+                     const couchbase::core::orphan_reporter_options& o)
+  {
+    v = {
+      { "emit_interval", o.emit_interval },
+      { "sample_size", o.sample_size },
+    };
+  }
+};
+
 template<>
 struct traits<couchbase::core::tracing::threshold_logging_options> {
   template<template<typename...> class Traits>
@@ -106,8 +120,6 @@ struct traits<couchbase::core::tracing::threshold_logging_options> {
                      const couchbase::core::tracing::threshold_logging_options& o)
   {
     v = {
-      { "orphaned_emit_interval", o.orphaned_emit_interval },
-      { "orphaned_sample_size", o.orphaned_sample_size },
       { "threshold_emit_interval", o.threshold_emit_interval },
       { "threshold_sample_size", o.threshold_sample_size },
       { "key_value_threshold", o.key_value_threshold },
@@ -275,12 +287,14 @@ origin::to_json() const -> std::string
         { "enable_compression", options_.enable_compression },
         { "enable_tracing", options_.enable_tracing },
         { "enable_metrics", options_.enable_metrics },
+        { "enable_orphan_reporting", options_.enable_orphan_reporting },
         { "tcp_keep_alive_interval", options_.tcp_keep_alive_interval },
         { "config_idle_redial_timeout", options_.config_idle_redial_timeout },
         { "max_http_connections", options_.max_http_connections },
         { "idle_http_connection_timeout", options_.idle_http_connection_timeout },
         { "metrics_options", options_.metrics_options },
         { "tracing_options", options_.tracing_options },
+        { "orphan_reporter_options", options_.orphan_options },
         { "transactions_options", options_.transactions },
         { "server_group", options_.server_group },
 #endif
@@ -302,12 +316,36 @@ origin::to_json() const -> std::string
 
 } // namespace couchbase::core
 
+couchbase::core::origin::origin(origin&& other) noexcept
+  : options_(std::move(other.options_))
+  , nodes_(std::move(other.nodes_))
+  , next_node_(other.next_node_)
+  , exhausted_(other.exhausted_)
+  , connection_string_(std::move(other.connection_string_))
+  , credentials_(std::move(other.credentials_))
+{
+}
+
+auto
+couchbase::core::origin::operator=(origin&& other) noexcept -> origin&
+{
+  if (this != &other) {
+    options_ = std::move(other.options_);
+    nodes_ = std::move(other.nodes_);
+    next_node_ = other.next_node_;
+    exhausted_ = other.exhausted_;
+    connection_string_ = std::move(other.connection_string_);
+    credentials_ = std::move(other.credentials_);
+  }
+  return *this;
+}
+
 couchbase::core::origin::origin(const couchbase::core::origin& other)
   : options_(other.options_)
-  , credentials_(other.credentials_)
   , nodes_(other.nodes_)
   , next_node_(nodes_.begin())
 {
+  update_credentials(other.credentials());
 }
 
 couchbase::core::origin::origin(origin other, const topology::configuration& config)
@@ -321,9 +359,9 @@ couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 std::uint16_t port,
                                 couchbase::core::cluster_options options)
   : options_(std::move(options))
-  , credentials_(std::move(auth))
   , nodes_{ { hostname, std::to_string(port) } }
   , next_node_(nodes_.begin())
+  , credentials_(std::move(auth))
 {
 }
 couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
@@ -331,16 +369,16 @@ couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 const std::string& port,
                                 couchbase::core::cluster_options options)
   : options_(std::move(options))
-  , credentials_(std::move(auth))
   , nodes_{ { hostname, port } }
   , next_node_(nodes_.begin())
+  , credentials_(std::move(auth))
 {
 }
 couchbase::core::origin::origin(couchbase::core::cluster_credentials auth,
                                 const couchbase::core::utils::connection_string& connstr)
   : options_(connstr.options)
-  , credentials_(std::move(auth))
   , connection_string_(connstr.input)
+  , credentials_(std::move(auth))
 {
   nodes_.reserve(connstr.bootstrap_nodes.size());
   for (const auto& node : connstr.bootstrap_nodes) {
@@ -358,7 +396,7 @@ couchbase::core::origin::operator=(const couchbase::core::origin& other) -> couc
 {
   if (this != &other) {
     options_ = other.options_;
-    credentials_ = other.credentials_;
+    update_credentials(other.credentials());
     nodes_ = other.nodes_;
     next_node_ = nodes_.begin();
     exhausted_ = false;
@@ -371,26 +409,36 @@ couchbase::core::origin::connection_string() const -> const std::string&
   return connection_string_;
 }
 auto
-couchbase::core::origin::username() const -> const std::string&
+couchbase::core::origin::username() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.username;
 }
 auto
-couchbase::core::origin::password() const -> const std::string&
+couchbase::core::origin::password() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.password;
 }
 auto
-couchbase::core::origin::certificate_path() const -> const std::string&
+couchbase::core::origin::certificate_path() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.certificate_path;
 }
 auto
-couchbase::core::origin::key_path() const -> const std::string&
+couchbase::core::origin::key_path() const -> std::string
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_.key_path;
 }
 auto
+couchbase::core::origin::jwt_token() const -> std::string
+{
+  const std::shared_lock lock(credentials_mutex_);
+  return credentials_.jwt_token;
+}
+auto
 couchbase::core::origin::get_hostnames() const -> std::vector<std::string>
 {
   std::vector<std::string> res;
@@ -455,6 +503,12 @@ couchbase::core::origin::set_nodes_from_config(const topology::configuration& co
   }
   next_node_ = nodes_.begin();
 }
+void
+couchbase::core::origin::update_credentials(cluster_credentials auth)
+{
+  const std::unique_lock lock(credentials_mutex_);
+  credentials_ = std::move(auth);
+}
 auto
 couchbase::core::origin::next_address() -> std::pair<std::string, std::string>
 {
@@ -490,7 +544,8 @@ couchbase::core::origin::options() -> couchbase::core::cluster_options&
   return options_;
 }
 auto
-couchbase::core::origin::credentials() const -> const couchbase::core::cluster_credentials&
+couchbase::core::origin::credentials() const -> couchbase::core::cluster_credentials
 {
+  const std::shared_lock lock(credentials_mutex_);
   return credentials_;
 }

data/ext/couchbase/core/origin.hxx

@@ -20,6 +20,7 @@
 #include "cluster_credentials.hxx"
 #include "cluster_options.hxx"
 
+#include <shared_mutex>
 #include <string>
 #include <utility>
 #include <vector>
@@ -43,7 +44,7 @@ struct origin {
   origin() = default;
   ~origin() = default;
 
-  origin(origin&& other) = default;
+  origin(origin&& other) noexcept;
   origin(const origin& other);
   origin(origin other, const topology::configuration& config);
   origin(cluster_credentials auth,
@@ -55,14 +56,15 @@ struct origin {
          const std::string& port,
          cluster_options options);
   origin(cluster_credentials auth, const utils::connection_string& connstr);
-  auto operator=(origin&& other) -> origin& = default;
+  auto operator=(origin&& other) noexcept -> origin&;
   auto operator=(const origin& other) -> origin&;
 
   [[nodiscard]] auto connection_string() const -> const std::string&;
-  [[nodiscard]] auto username() const -> const std::string&;
-  [[nodiscard]] auto password() const -> const std::string&;
-  [[nodiscard]] auto certificate_path() const -> const std::string&;
-  [[nodiscard]] auto key_path() const -> const std::string&;
+  [[nodiscard]] auto username() const -> std::string;
+  [[nodiscard]] auto password() const -> std::string;
+  [[nodiscard]] auto certificate_path() const -> std::string;
+  [[nodiscard]] auto key_path() const -> std::string;
+  [[nodiscard]] auto jwt_token() const -> std::string;
 
   [[nodiscard]] auto get_hostnames() const -> std::vector<std::string>;
   [[nodiscard]] auto get_nodes() const -> std::vector<std::string>;
@@ -71,6 +73,8 @@ struct origin {
   void set_nodes(node_list nodes);
   void set_nodes_from_config(const topology::configuration& config);
 
+  void update_credentials(cluster_credentials auth);
+
   [[nodiscard]] auto next_address() -> std::pair<std::string, std::string>;
 
   [[nodiscard]] auto exhausted() const -> bool;
@@ -79,16 +83,17 @@ struct origin {
 
   [[nodiscard]] auto options() const -> const couchbase::core::cluster_options&;
   [[nodiscard]] auto options() -> couchbase::core::cluster_options&;
-  [[nodiscard]] auto credentials() const -> const couchbase::core::cluster_credentials&;
+  [[nodiscard]] auto credentials() const -> couchbase::core::cluster_credentials;
   [[nodiscard]] auto to_json() const -> std::string;
 
 private:
   couchbase::core::cluster_options options_{};
-  cluster_credentials credentials_{};
   node_list nodes_{};
   node_list::iterator next_node_{};
   bool exhausted_{ false };
   std::string connection_string_{};
+  cluster_credentials credentials_{};
+  mutable std::shared_mutex credentials_mutex_{};
 };
 
 } // namespace couchbase::core