RubyGems - couchbase - Versions diffs - 3.5.4 → 3.5.6 - Mend

couchbase 3.5.4 → 3.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (466) hide show

data/ext/couchbase/core/operations/management/search_index_analyze_document.hxx CHANGED Viewed

@@ -39,6 +39,7 @@ struct search_index_analyze_document_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_analyze_document";
   std::string index_name;
   std::string encoded_document;

data/ext/couchbase/core/operations/management/search_index_control_ingest.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

data/ext/couchbase/core/operations/management/search_index_control_ingest.hxx CHANGED Viewed

@@ -38,6 +38,7 @@ struct search_index_control_ingest_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_ingest";
   std::string index_name;
   bool pause;

data/ext/couchbase/core/operations/management/search_index_control_plan_freeze.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

data/ext/couchbase/core/operations/management/search_index_control_plan_freeze.hxx CHANGED Viewed

@@ -40,6 +40,7 @@ struct search_index_control_plan_freeze_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_plan_freeze";
   std::string index_name;
   bool freeze;

data/ext/couchbase/core/operations/management/search_index_control_query.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

data/ext/couchbase/core/operations/management/search_index_control_query.hxx CHANGED Viewed

@@ -38,6 +38,7 @@ struct search_index_control_query_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_control_querying";
   std::string index_name;
   bool allow;

data/ext/couchbase/core/operations/management/search_index_drop.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -38,6 +38,7 @@ struct search_index_drop_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_drop_index";
   std::string index_name;

data/ext/couchbase/core/operations/management/search_index_get.cxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -40,6 +40,7 @@ struct search_index_get_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_index";
   std::string index_name;
   std::optional<std::string> bucket_name;

data/ext/couchbase/core/operations/management/search_index_get_all.cxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -40,6 +40,7 @@ struct search_index_get_all_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_all_indexes";
   std::optional<std::string> bucket_name;
   std::optional<std::string> scope_name;

data/ext/couchbase/core/operations/management/search_index_get_documents_count.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -39,6 +39,8 @@ struct search_index_get_documents_count_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier =
+    "manager_search_get_indexed_documents_count";
   std::string index_name;

data/ext/couchbase/core/operations/management/search_index_get_stats.cxx CHANGED Viewed

@@ -20,7 +20,7 @@
 #include "core/utils/json.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -39,6 +39,7 @@ struct search_index_get_stats_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_get_stats";
   std::string index_name;

data/ext/couchbase/core/operations/management/search_index_upsert.cxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -41,6 +41,7 @@ struct search_index_upsert_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::search;
+  static const inline std::string observability_identifier = "manager_search_upsert_index";
   couchbase::core::management::search::index index;

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

@@ -36,6 +36,7 @@ struct user_drop_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
+  static const inline std::string observability_identifier = "manager_users_drop_user";
   static const inline service_type type = service_type::management;
   std::string username{};

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

@@ -37,6 +37,7 @@ struct user_get_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
+  static const inline std::string observability_identifier = "manager_users_get_user";
   static const inline service_type type = service_type::management;
   std::string username{};

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

@@ -37,6 +37,7 @@ struct user_get_all_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
+  static const inline std::string observability_identifier = "manager_users_get_all_users";
   static const inline service_type type = service_type::management;
   couchbase::core::management::rbac::auth_domain domain{

data/ext/couchbase/core/operations/management/user_upsert.cxx CHANGED Viewed

@@ -51,11 +51,11 @@ user_upsert_request::encode_to(encoded_request_type& encoded,
   for (const auto& role : user.roles) {
     std::string spec = role.name;
     if (role.bucket) {
-      spec += fmt::format("[{}", role.bucket.value());
+      spec += fmt::format("[{}", utils::string_codec::v2::path_escape(role.bucket.value()));
       if (role.scope) {
-        spec += fmt::format(":{}", role.scope.value());
+        spec += fmt::format(":{}", utils::string_codec::v2::path_escape(role.scope.value()));
         if (role.collection) {
-          spec += fmt::format(":{}", role.collection.value());
+          spec += fmt::format(":{}", utils::string_codec::v2::path_escape(role.collection.value()));
         }
       }
       spec += "]";

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

@@ -37,6 +37,7 @@ struct user_upsert_request {
   using encoded_response_type = io::http_response;
   using error_context_type = error_context::http;
+  static const inline std::string observability_identifier = "manager_users_upsert_user";
   static const inline service_type type = service_type::management;
   couchbase::core::management::rbac::auth_domain domain{

data/ext/couchbase/core/operations/management/view_index_drop.cxx CHANGED Viewed

@@ -20,7 +20,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -37,6 +37,7 @@ struct view_index_drop_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::view;
+  static const inline std::string observability_identifier = "manager_views_drop_design_document";
   std::string bucket_name;
   std::string document_name;

data/ext/couchbase/core/operations/management/view_index_get.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -38,6 +38,7 @@ struct view_index_get_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::view;
+  static const inline std::string observability_identifier = "manager_views_get_design_document";
   std::string bucket_name;
   std::string document_name;

data/ext/couchbase/core/operations/management/view_index_get_all.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -38,6 +38,8 @@ struct view_index_get_all_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::management;
+  static const inline std::string observability_identifier =
+    "manager_views_get_all_design_documents";
   std::string bucket_name;
   design_document_namespace ns;

data/ext/couchbase/core/operations/management/view_index_upsert.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 namespace couchbase::core::operations::management

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

@@ -37,6 +37,7 @@ struct view_index_upsert_request {
   using error_context_type = error_context::http;
   static const inline service_type type = service_type::view;
+  static const inline std::string observability_identifier = "manager_views_upsert_design_document";
   std::string bucket_name;
   couchbase::core::management::views::design_document document;

data/ext/couchbase/core/origin.cxx CHANGED Viewed

@@ -21,8 +21,8 @@
 #include "core/utils/connection_string.hxx"
 #include "topology/configuration.hxx"
-#include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json.hpp>
 #include <utility>
@@ -280,6 +280,7 @@ origin::to_json() const -> std::string
         { "metrics_options", options_.metrics_options },
         { "tracing_options", options_.tracing_options },
         { "transactions_options", options_.transactions },
+        { "server_group", options_.server_group },
 #endif
       },
     },

data/ext/couchbase/core/platform/base64.h CHANGED Viewed

@@ -30,11 +30,11 @@ namespace couchbase::core::base64
  * @param source the string to encode
  * @return the base64 encoded value
  */
-std::string
-encode(gsl::span<const std::byte> blob, bool pretty_print = false);
+auto
+encode(gsl::span<const std::byte> blob, bool pretty_print = false) -> std::string;
-std::string
-encode(std::string_view blob, bool pretty_print = false);
+auto
+encode(std::string_view blob, bool pretty_print = false) -> std::string;
 /**
  * Decode a base64 encoded blob (which may be pretty-printed to avoid
@@ -43,10 +43,10 @@ encode(std::string_view blob, bool pretty_print = false);
  * @param source string to decode
  * @return the decoded data
  */
-std::vector<std::byte>
-decode(std::string_view blob);
+auto
+decode(std::string_view blob) -> std::vector<std::byte>;
-std::string
-decode_to_string(std::string_view blob);
+auto
+decode_to_string(std::string_view blob) -> std::string;
 } // namespace couchbase::core::base64

data/ext/couchbase/core/protocol/client_opcode_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/protocol/client_response.hxx CHANGED Viewed

@@ -33,8 +33,8 @@
 #include "status.hxx"
 #include <couchbase/cas.hxx>
-#include <fmt/core.h>
 #include <gsl/assert>
+#include <spdlog/fmt/bundled/core.h>
 #include <cmath>
 #include <cstring>

data/ext/couchbase/core/protocol/frame_info_id_fmt.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "frame_info_id.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::protocol::request_frame_info_id> {

data/ext/couchbase/core/protocol/hello_feature_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/protocol/magic_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/protocol/server_opcode_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/query_context.hxx CHANGED Viewed

@@ -16,7 +16,8 @@
  */
 #pragma once
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <optional>
 #include <string>
@@ -41,13 +42,13 @@ public:
   {
   }
-  bool has_value() const
+  [[nodiscard]] auto has_value() const -> bool
   {
     return bucket_name_.has_value() && !bucket_name_->empty() && scope_name_.has_value() &&
            !scope_name_->empty();
   }
-  std::string value() const
+  [[nodiscard]] auto value() const -> std::string
   {
     if (has_value()) {
       return fmt::format("{}:`{}`.`{}`", namespace_id_, bucket_name_.value(), scope_name_.value());
@@ -55,7 +56,7 @@ public:
     return {};
   }
-  std::string bucket_name() const
+  [[nodiscard]] auto bucket_name() const -> std::string
   {
     if (has_value()) {
       return bucket_name_.value();
@@ -63,7 +64,7 @@ public:
     return "";
   }
-  std::string scope_name() const
+  [[nodiscard]] auto scope_name() const -> std::string
   {
     if (has_value()) {
       return scope_name_.value();
@@ -71,7 +72,7 @@ public:
     return "";
   }
-  std::string namespace_id() const
+  [[nodiscard]] auto namespace_id() const -> std::string
   {
     return namespace_id_;
   }

data/ext/couchbase/core/retry_orchestrator.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 namespace couchbase::core
 {

data/ext/couchbase/core/sasl/CMakeLists.txt CHANGED Viewed

@@ -12,6 +12,5 @@ target_link_libraries(
   couchbase_sasl
   PRIVATE project_options
           project_warnings
-          fmt::fmt
           Microsoft.GSL::GSL
           spdlog::spdlog)

data/ext/couchbase/core/sasl/error_fmt.h CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "error.h"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::sasl::error> {

data/ext/couchbase/core/seed_config.cxx CHANGED Viewed

@@ -15,8 +15,8 @@
 #include "seed_config.hxx"
-#include <fmt/core.h>
-#include <fmt/ranges.h>
+#include <spdlog/fmt/bundled/core.h>
+#include <spdlog/fmt/bundled/ranges.h>
 namespace couchbase::core
 {

data/ext/couchbase/core/service_type_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/topology/capabilities_fmt.hxx CHANGED Viewed

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

data/ext/couchbase/core/topology/collections_manifest_fmt.hxx CHANGED Viewed

@@ -21,7 +21,8 @@
 #include "core/utils/join_strings.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <vector>
 template<>

data/ext/couchbase/core/topology/configuration_fmt.hxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "core/service_type_fmt.hxx"
 #include "core/utils/join_strings.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 template<>
 struct fmt::formatter<couchbase::core::topology::configuration::node> {

data/ext/couchbase/core/transactions/async_attempt_context.cxx CHANGED Viewed

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

data/ext/couchbase/core/transactions/async_attempt_context.hxx CHANGED Viewed

@@ -22,7 +22,6 @@
 #include <couchbase/transactions/transaction_query_options.hxx>
-#include <future>
 #include <optional>
 #include <string>
@@ -42,7 +41,9 @@ public:
   using VoidCallback = std::function<void(std::exception_ptr)>;
   using QueryCallback =
     std::function<void(std::exception_ptr, std::optional<core::operations::query_response>)>;
   virtual ~async_attempt_context() = default;
   /**
    * Gets a document from the specified Couchbase collection matching the
    * specified id.
@@ -91,6 +92,7 @@ public:
    *
    * If the mutation fails, the transaction will automatically rollback this
    * attempt, then retry.
+   *
    * @param document the doc to be updated
    * @param content the content to replace the doc with.
    * @param cb callback function called with the updated @ref
@@ -98,11 +100,10 @@ public:
    * transaction_operation_failed
    *
    */
-  template<typename Transcoder = codec::default_json_transcoder, typename Content>
-  void replace(const transaction_get_result& document, const Content& content, Callback&& cb)
-  {
-    return replace_raw(document, Transcoder::encode(content), std::move(cb));
-  }
+  virtual void replace(const transaction_get_result& document,
+                       codec::encoded_value content,
+                       Callback&& cb) = 0;
   /**
    * Inserts a new document into the specified Couchbase collection.
    *
@@ -119,11 +120,8 @@ public:
    * @param cb callback function called with a @ref transaction_get_result with
    * the new CAS value when successful, or @ref transaction_operation_failed
    */
-  template<typename Transcoder = codec::default_json_transcoder, typename Content>
-  void insert(const core::document_id& id, const Content& content, Callback&& cb)
-  {
-    return insert_raw(id, Transcoder::encode(content), std::move(cb));
-  }
+  virtual void insert(const core::document_id& id, codec::encoded_value content, Callback&& cb) = 0;
   /**
    * Removes the specified document, using the document's last
    * TransactionDocument#cas
@@ -195,17 +193,6 @@ public:
    * @param cb callback which is called when the rollback succeeds
    */
   virtual void rollback(VoidCallback&& cb) = 0;
-protected:
-  /** @internal */
-  virtual void insert_raw(const core::document_id& id,
-                          codec::encoded_value content,
-                          Callback&& cb) = 0;
-  /** @internal */
-  virtual void replace_raw(const transaction_get_result& document,
-                           codec::encoded_value content,
-                           Callback&& cb) = 0;
 };
 } // namespace couchbase::core::transactions