couchbase 3.5.4 → 3.5.6

data/ext/couchbase/core/transactions/attempt_context.cxx

@@ -18,7 +18,7 @@
 #include <couchbase/scope.hxx>
 #include <couchbase/transactions/attempt_context.hxx>
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 namespace couchbase::transactions
 {

data/ext/couchbase/core/transactions/attempt_context.hxx

@@ -101,19 +101,8 @@ public:
    * @throws transaction_operation_failed which either should not be caught by
    * the lambda, or rethrown if it is caught.
    */
-  template<typename Transcoder = codec::default_json_transcoder, typename Content>
-  auto replace(const transaction_get_result& document,
-               const Content& content) -> transaction_get_result
-  {
-    codec::encoded_value data;
-    try {
-      data = Transcoder::encode(content);
-    } catch (std::runtime_error& e) {
-      throw transaction_operation_failed(
-        FAIL_OTHER, std::string("failed to encode content as JSON: ") + e.what());
-    }
-    return replace_raw(document, data);
-  }
+  virtual auto replace(const transaction_get_result& document,
+                       codec::encoded_value content) -> transaction_get_result = 0;
 
   /**
    * Inserts a new document into the specified Couchbase collection.
@@ -135,18 +124,9 @@ public:
    * @throws transaction_operation_failed which either should not be caught by
    * the lambda, or rethrown if it is caught.
    */
-  template<typename Transcoder = codec::default_json_transcoder, typename Content>
-  auto insert(const core::document_id& id, const Content& content) -> transaction_get_result
-  {
-    codec::encoded_value data;
-    try {
-      data = Transcoder::encode(content);
-    } catch (std::runtime_error& e) {
-      throw transaction_operation_failed(
-        FAIL_OTHER, std::string("failed to encode content as JSON: ") + e.what());
-    }
-    return insert_raw(id, data);
-  }
+  virtual auto insert(const core::document_id& id,
+                      codec::encoded_value content) -> transaction_get_result = 0;
+
   /**
    * Removes the specified document, using the document's last
    * TransactionDocument#cas
@@ -179,6 +159,7 @@ public:
   {
     return do_core_query(statement, opts, query_context);
   };
+
   /**
    * Performs a Query, within the current transaction.
    *
@@ -218,14 +199,6 @@ public:
   virtual void rollback() = 0;
 
 protected:
-  /** @internal */
-  virtual auto insert_raw(const core::document_id& id,
-                          codec::encoded_value content) -> transaction_get_result = 0;
-
-  /** @internal */
-  virtual auto replace_raw(const transaction_get_result& document,
-                           codec::encoded_value content) -> transaction_get_result = 0;
-
   virtual auto do_core_query(const std::string&,
                              const couchbase::transactions::transaction_query_options& opts,
                              std::optional<std::string> query_context)

data/ext/couchbase/core/transactions/attempt_context_impl.cxx

@@ -587,9 +587,9 @@ attempt_context_impl::create_document_metadata(
 }
 
 void
-attempt_context_impl::replace_raw(const transaction_get_result& document,
-                                  codec::encoded_value content,
-                                  Callback&& cb)
+attempt_context_impl::replace(const transaction_get_result& document,
+                              codec::encoded_value content,
+                              Callback&& cb)
 {
 
   if (op_list_.get_mode().is_query()) {
@@ -852,19 +852,19 @@ attempt_context_impl::create_staged_replace(const transaction_get_result& docume
 }
 
 auto
-attempt_context_impl::replace_raw(const transaction_get_result& document,
-                                  codec::encoded_value content) -> transaction_get_result
+attempt_context_impl::replace(const transaction_get_result& document,
+                              codec::encoded_value content) -> transaction_get_result
 {
   auto barrier = std::make_shared<std::promise<transaction_get_result>>();
   auto f = barrier->get_future();
-  replace_raw(document,
-              std::move(content),
-              [barrier](const std::exception_ptr& err, std::optional<transaction_get_result> res) {
-                if (err) {
-                  return barrier->set_exception(err);
-                }
-                barrier->set_value(std::move(*res));
-              });
+  replace(document,
+          std::move(content),
+          [barrier](const std::exception_ptr& err, std::optional<transaction_get_result> res) {
+            if (err) {
+              return barrier->set_exception(err);
+            }
+            barrier->set_value(std::move(*res));
+          });
   return f.get();
 }
 
@@ -873,12 +873,12 @@ attempt_context_impl::replace_raw(couchbase::transactions::transaction_get_resul
                                   codec::encoded_value content,
                                   couchbase::transactions::async_result_handler&& handler)
 {
-  replace_raw(core::transactions::transaction_get_result(doc),
-              std::move(content),
-              [handler = std::move(handler)](const std::exception_ptr& err,
-                                             std::optional<transaction_get_result> res) mutable {
-                wrap_callback_for_async_public_api(err, std::move(res), std::move(handler));
-              });
+  replace(core::transactions::transaction_get_result(doc),
+          std::move(content),
+          [handler = std::move(handler)](const std::exception_ptr& err,
+                                         std::optional<transaction_get_result> res) mutable {
+            wrap_callback_for_async_public_api(err, std::move(res), std::move(handler));
+          });
 }
 
 auto
@@ -888,7 +888,7 @@ attempt_context_impl::replace_raw(const couchbase::transactions::transaction_get
 {
   return wrap_call_for_public_api(
     [self = shared_from_this(), doc, content = std::move(content)]() -> transaction_get_result {
-      return self->replace_raw(transaction_get_result(doc), content);
+      return self->replace(transaction_get_result(doc), content);
     });
 }
 
@@ -900,8 +900,8 @@ attempt_context_impl::insert_raw(const collection& coll,
 {
   return wrap_call_for_public_api(
     [self = shared_from_this(), coll, &id, content = std::move(content)]() mutable {
-      return self->insert_raw({ coll.bucket_name(), coll.scope_name(), coll.name(), id },
-                              std::move(content));
+      return self->insert({ coll.bucket_name(), coll.scope_name(), coll.name(), id },
+                          std::move(content));
     });
 }
 
@@ -911,35 +911,35 @@ attempt_context_impl::insert_raw(const collection& coll,
                                  codec::encoded_value content,
                                  couchbase::transactions::async_result_handler&& handler)
 {
-  insert_raw({ coll.bucket_name(), coll.scope_name(), coll.name(), std::move(id) },
-             std::move(content),
-             [handler = std::move(handler)](const std::exception_ptr& err,
-                                            std::optional<transaction_get_result> res) mutable {
-               wrap_callback_for_async_public_api(err, std::move(res), std::move(handler));
-             });
+  insert({ coll.bucket_name(), coll.scope_name(), coll.name(), std::move(id) },
+         std::move(content),
+         [handler = std::move(handler)](const std::exception_ptr& err,
+                                        std::optional<transaction_get_result> res) mutable {
+           wrap_callback_for_async_public_api(err, std::move(res), std::move(handler));
+         });
 }
 
 auto
-attempt_context_impl::insert_raw(const core::document_id& id,
-                                 codec::encoded_value content) -> transaction_get_result
+attempt_context_impl::insert(const core::document_id& id,
+                             codec::encoded_value content) -> transaction_get_result
 {
   auto barrier = std::make_shared<std::promise<transaction_get_result>>();
   auto f = barrier->get_future();
-  insert_raw(id,
-             std::move(content),
-             [barrier](const std::exception_ptr& err, std::optional<transaction_get_result> res) {
-               if (err) {
-                 return barrier->set_exception(err);
-               }
-               barrier->set_value(std::move(*res));
-             });
+  insert(id,
+         std::move(content),
+         [barrier](const std::exception_ptr& err, std::optional<transaction_get_result> res) {
+           if (err) {
+             return barrier->set_exception(err);
+           }
+           barrier->set_value(std::move(*res));
+         });
   return f.get();
 }
 
 void
-attempt_context_impl::insert_raw(const core::document_id& id,
-                                 codec::encoded_value content,
-                                 Callback&& cb)
+attempt_context_impl::insert(const core::document_id& id,
+                             codec::encoded_value content,
+                             Callback&& cb)
 {
   if (op_list_.get_mode().is_query()) {
     return insert_raw_with_query(id, std::move(content), std::move(cb));

data/ext/couchbase/core/transactions/attempt_context_impl.hxx

@@ -92,37 +92,36 @@ private:
   // transaction_context needs access to the two functions below
   friend class transaction_context;
 
+  void insert(const core::document_id& id,
+              codec::encoded_value content,
+              core::transactions::async_attempt_context::Callback&& cb) override;
+
+  auto insert(const core::document_id& id,
+              codec::encoded_value content) -> core::transactions::transaction_get_result override;
+
+  void replace(const transaction_get_result& document,
+               codec::encoded_value content,
+               core::transactions::async_attempt_context::Callback&& cb) override;
+
+  auto replace(const transaction_get_result& document,
+               codec::encoded_value content) -> transaction_get_result override;
+
   auto insert_raw(const collection& coll, const std::string& id, codec::encoded_value content)
     -> std::pair<couchbase::error, couchbase::transactions::transaction_get_result> override;
-  auto insert_raw(const core::document_id& id, codec::encoded_value content)
-    -> core::transactions::transaction_get_result override;
 
   void insert_raw(const collection& coll,
                   std::string id,
                   codec::encoded_value content,
                   couchbase::transactions::async_result_handler&& handler) override;
 
-  void insert_raw(
-    const core::document_id& id,
-    codec::encoded_value content,
-    std::function<void(std::exception_ptr, std::optional<transaction_get_result>)>&& cb) override;
-
   auto replace_raw(const couchbase::transactions::transaction_get_result& doc,
                    codec::encoded_value content)
     -> std::pair<couchbase::error, couchbase::transactions::transaction_get_result> override;
 
-  auto replace_raw(const transaction_get_result& document,
-                   codec::encoded_value content) -> transaction_get_result override;
-
   void replace_raw(couchbase::transactions::transaction_get_result doc,
                    codec::encoded_value content,
                    couchbase::transactions::async_result_handler&& handler) override;
 
-  void replace_raw(
-    const transaction_get_result& document,
-    codec::encoded_value content,
-    std::function<void(std::exception_ptr, std::optional<transaction_get_result>)>&& cb) override;
-
   void remove_staged_insert(const core::document_id& id, VoidCallback&& cb);
 
   void get_with_query(
@@ -200,7 +199,7 @@ private:
                                std::exception_ptr&& err)
   {
     try {
-      std::rethrow_exception(std::move(err));
+      std::rethrow_exception(err);
     } catch (const transaction_operation_failed& e) {
       // if this is a transaction_operation_failed, we need to cache it before
       // moving on...

data/ext/couchbase/core/transactions/exceptions_fmt.hxx

@@ -18,7 +18,7 @@
 
 #include "exceptions.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::transactions::external_exception> {

data/ext/couchbase/core/transactions/internal/atr_cleanup_entry.hxx

@@ -21,7 +21,7 @@
 #include "core/transactions/transaction_get_result.hxx"
 #include "logging.hxx"
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <chrono>
 #include <memory>

data/ext/couchbase/core/transactions/internal/client_record.hxx

@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
+
 #include <string>
 #include <vector>
 
@@ -38,7 +39,7 @@ struct client_record_details {
   std::uint64_t cas_now_nanos;
 
   template<typename OStream>
-  friend OStream& operator<<(OStream& os, const client_record_details& details)
+  friend auto operator<<(OStream& os, const client_record_details& details) -> OStream&
   {
     os << "client_record_details{";
     os << "client_uuid: " << details.client_uuid;
@@ -50,7 +51,7 @@ struct client_record_details {
     os << ", override_expires: " << details.override_expires;
     os << ", cas_now_nanos: " << details.cas_now_nanos;
     os << ", expired_client_ids: [";
-    for (auto& id : details.expired_client_ids) {
+    for (const auto& id : details.expired_client_ids) {
       os << id << ",";
     }
     os << "]}";

data/ext/couchbase/core/transactions/internal/doc_record_fmt.hxx

@@ -17,7 +17,7 @@
 
 #include "doc_record.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::transactions::doc_record> {

data/ext/couchbase/core/transactions/internal/exceptions_internal.hxx

@@ -22,8 +22,6 @@
 
 #include "core/error_context/transaction_op_error_context.hxx"
 
-#include <spdlog/spdlog.h>
-
 #include <algorithm>
 #include <list>
 

data/ext/couchbase/core/transactions/internal/exceptions_internal_fmt.hxx

@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::transactions::error_class> {

data/ext/couchbase/core/transactions/internal/logging.hxx

@@ -17,6 +17,8 @@
 
 #include <core/logger/logger.hxx>
 
+#include <spdlog/fmt/bundled/format.h>
+
 namespace couchbase::core::transactions
 {
 #define CB_ORIGINAL_FMT(fmt, ...) fmt

data/ext/couchbase/core/transactions/internal/transaction_context.hxx

@@ -98,6 +98,9 @@ public:
   // These functions just delegate to the current_attempt_context_
   void get(const core::document_id& id, async_attempt_context::Callback&& cb);
 
+  void get_replica_from_preferred_server_group(const core::document_id& id,
+                                               async_attempt_context::Callback&& cb);
+
   void get_optional(const core::document_id& id, async_attempt_context::Callback&& cb);
 
   void insert(const core::document_id& id,

data/ext/couchbase/core/transactions/result_fmt.hxx

@@ -18,7 +18,7 @@
 
 #include "result.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 template<>
 struct fmt::formatter<couchbase::core::transactions::result> {

data/ext/couchbase/core/transactions/transaction_context.cxx

@@ -165,6 +165,16 @@ transaction_context::get(const core::document_id& id, async_attempt_context::Cal
   throw transaction_operation_failed(FAIL_OTHER, "no current attempt context");
 }
 
+void
+transaction_context::get_replica_from_preferred_server_group(const core::document_id& id,
+                                                             async_attempt_context::Callback&& cb)
+{
+  if (current_attempt_context_) {
+    return current_attempt_context_->get_replica_from_preferred_server_group(id, std::move(cb));
+  }
+  throw transaction_operation_failed(FAIL_OTHER, "no current attempt context");
+}
+
 void
 transaction_context::get_optional(const core::document_id& id, async_attempt_context::Callback&& cb)
 {
@@ -180,7 +190,7 @@ transaction_context::insert(const core::document_id& id,
                             async_attempt_context::Callback&& cb)
 {
   if (current_attempt_context_) {
-    return current_attempt_context_->insert_raw(id, std::move(content), std::move(cb));
+    return current_attempt_context_->insert(id, std::move(content), std::move(cb));
   }
   throw transaction_operation_failed(FAIL_OTHER, "no current attempt context");
 }
@@ -191,7 +201,7 @@ transaction_context::replace(const transaction_get_result& doc,
                              async_attempt_context::Callback&& cb)
 {
   if (current_attempt_context_) {
-    return current_attempt_context_->replace_raw(doc, std::move(content), std::move(cb));
+    return current_attempt_context_->replace(doc, std::move(content), std::move(cb));
   }
   throw transaction_operation_failed(FAIL_OTHER, "no current attempt context");
 }

data/ext/couchbase/core/transactions/transaction_get_result.hxx

@@ -199,26 +199,6 @@ public:
     return os;
   }
 
-  /**
-   * Content of the document.
-   *
-   * @return content of the document.
-   */
-  template<typename Document,
-           typename Transcoder = codec::default_json_transcoder,
-           std::enable_if_t<!codec::is_transcoder_v<Document>, bool> = true,
-           std::enable_if_t<codec::is_transcoder_v<Transcoder>, bool> = true>
-  [[nodiscard]] auto content() const -> Document
-  {
-    return Transcoder::template decode<Document>(content_);
-  }
-
-  template<typename Transcoder, std::enable_if_t<codec::is_transcoder_v<Transcoder>, bool> = true>
-  [[nodiscard]] auto content() const -> typename Transcoder::document_type
-  {
-    return Transcoder::decode(content_);
-  }
-
   /**
    * Content of the document as raw byte vector
    *

data/ext/couchbase/core/transactions/transaction_links.hxx

@@ -18,7 +18,7 @@
 
 #include <couchbase/codec/encoded_value.hxx>
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 
 #include <optional>

data/ext/couchbase/core/utils/join_strings.hxx

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
+
 #include <sstream>
 
 namespace couchbase::core::utils
@@ -46,7 +47,6 @@ join_strings(const Range& values, const std::string& sep) -> std::string
  * Joins a list of objects together using fmt:: for formatting.
  */
 template<typename Range>
-
 auto
 join_strings_fmt(const Range& values, const std::string& sep) -> std::string
 {

data/ext/couchbase/core/utils/keyspace.hxx

@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
+
 #include <string>
 
 namespace couchbase::core::utils

data/ext/couchbase/core/utils/url_codec.cxx

@@ -17,7 +17,7 @@
 
 #include "url_codec.hxx"
 
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 
 #include <cctype>
 #include <climits>

data/ext/couchbase/couchbase/common_options.hxx

@@ -18,6 +18,7 @@
 #pragma once
 
 #include <couchbase/retry_strategy.hxx>
+#include <couchbase/tracing/request_span.hxx>
 
 #include <chrono>
 #include <memory>
@@ -69,6 +70,18 @@ public:
     return self();
   }
 
+  /**
+   * @param span
+   *
+   * @since 1.0.4
+   * @volatile
+   */
+  auto parent_span(std::shared_ptr<tracing::request_span> span) -> derived_class&
+  {
+    parent_span_ = std::move(span);
+    return self();
+  }
+
   /**
    * Immutable value object representing consistent options.
    *
@@ -78,6 +91,7 @@ public:
   struct built {
     const std::optional<std::chrono::milliseconds> timeout;
     const std::shared_ptr<couchbase::retry_strategy> retry_strategy;
+    const std::shared_ptr<tracing::request_span> parent_span;
   };
 
 protected:
@@ -88,7 +102,7 @@ protected:
    */
   [[nodiscard]] auto build_common_options() const -> built
   {
-    return { timeout_, retry_strategy_ };
+    return { timeout_, retry_strategy_, parent_span_ };
   }
 
   /**
@@ -107,6 +121,7 @@ protected:
 private:
   std::optional<std::chrono::milliseconds> timeout_{};
   std::shared_ptr<couchbase::retry_strategy> retry_strategy_{ nullptr };
+  std::shared_ptr<tracing::request_span> parent_span_{ nullptr };
 };
 
 } // namespace couchbase

data/ext/couchbase/couchbase/fmt/analytics_scan_consistency.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/analytics_scan_consistency.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::analytics_scan_consistency objects.
  *

data/ext/couchbase/couchbase/fmt/analytics_status.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/analytics_status.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::analytics_status objects.
  *

data/ext/couchbase/couchbase/fmt/cas.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/cas.hxx>
 
-#include <fmt/core.h>
-
 #ifdef COUCHBASE_CXX_CLIENT_DOXYGEN
 namespace fmt
 {

data/ext/couchbase/couchbase/fmt/durability_level.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/durability_level.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::durability_level objects.
  *

data/ext/couchbase/couchbase/fmt/error.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/error.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::error objects.
  *

data/ext/couchbase/couchbase/fmt/error_context.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/error_context.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::error_context objects.
  *

data/ext/couchbase/couchbase/fmt/mutation_token.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/mutation_token.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::mutation_token objects.
  *

data/ext/couchbase/couchbase/fmt/query_profile.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/query_profile.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::query_profile objects.
  *

data/ext/couchbase/couchbase/fmt/query_scan_consistency.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/query_scan_consistency.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::query_scan_consistency objects.
  *

data/ext/couchbase/couchbase/fmt/query_status.hxx

@@ -19,8 +19,6 @@
 
 #include <couchbase/query_status.hxx>
 
-#include <fmt/core.h>
-
 /**
  * Helper for fmtlib to format @ref couchbase::query_status objects.
  *

data/ext/couchbase/couchbase/fmt/retry_reason.hxx

@@ -19,7 +19,11 @@
 
 #include <couchbase/retry_reason.hxx>
 
-#include <fmt/core.h>
+#ifdef COUCHBASE_CXX_CLIENT_DOXYGEN
+namespace fmt
+{
+}
+#endif
 
 /**
  * Helper for fmtlib to format @ref couchbase::retry_reason objects.