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/cmake/ThirdPartyDependencies.cmake CHANGED Viewed

@@ -2,6 +2,8 @@
 include(cmake/CPM.cmake)
+set(CPM_USE_LOCAL_PACKAGES OFF)
 # https://cmake.org/cmake/help/v3.28/policy/CMP0063.html
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
@@ -15,36 +17,13 @@ function(declare_system_library target)
                                              $<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>)
 endfunction()
-if(NOT TARGET fmt::fmt)
-  # https://github.com/fmtlib/fmt/releases
-  cpmaddpackage(
-    NAME
-    fmt
-    GIT_TAG
-    11.0.1
-    VERSION
-    11.0.1
-    GITHUB_REPOSITORY
-    "fmtlib/fmt"
-    EXCLUDE_FROM_ALL ON
-    OPTIONS
-    "FMT_INSTALL OFF"
-    # Unicode support for MSVC enabled in CompilerWarnings.cmake
-    "FMT_UNICODE OFF"
-    "FMT_DOC OFF"
-    "BUILD_SHARED_LIBS OFF"
-    "CMAKE_C_VISIBILITY_PRESET hidden"
-    "CMAKE_CXX_VISIBILITY_PRESET hidden"
-    "CMAKE_POSITION_INDEPENDENT_CODE ON")
-endif()
 if(NOT TARGET spdlog::spdlog)
   # https://github.com/gabime/spdlog/releases
   cpmaddpackage(
     NAME
     spdlog
     VERSION
-    1.14.1
+    1.15.0
     GITHUB_REPOSITORY
     "gabime/spdlog"
     EXCLUDE_FROM_ALL ON
@@ -54,8 +33,11 @@ if(NOT TARGET spdlog::spdlog)
     "CMAKE_C_VISIBILITY_PRESET hidden"
     "CMAKE_CXX_VISIBILITY_PRESET hidden"
     "CMAKE_POSITION_INDEPENDENT_CODE ON"
+    "NO_CMAKE_SYSTEM_PATH ON"
+    "NO_CMAKE_INSTALL_PREFIX ON"
+    "NO_CMAKE_SYSTEM_PACKAGE_REGISTRY ON"
     "SPDLOG_BUILD_SHARED OFF"
-    "SPDLOG_FMT_EXTERNAL ON")
+    "SPDLOG_FMT_EXTERNAL OFF")
 endif()
 if(NOT TARGET Microsoft.GSL::GSL)
@@ -246,6 +228,5 @@ declare_system_library(llhttp::llhttp)
 declare_system_library(hdr_histogram_static)
 declare_system_library(Microsoft.GSL::GSL)
 declare_system_library(spdlog::spdlog)
-declare_system_library(fmt::fmt)
 declare_system_library(asio)
 declare_system_library(taocpp::json)

data/ext/couchbase/cmake/VersionInfo.cmake CHANGED Viewed

@@ -58,6 +58,7 @@ string(REGEX REPLACE "T.*" "" COUCHBASE_CXX_CLIENT_BUILD_DATE "${COUCHBASE_CXX_C
 set(COUCHBASE_CXX_CLIENT_SEMVER "${couchbase_cxx_client_VERSION}")
 set(COUCHBASE_CXX_CLIENT_PACKAGE_VERSION "${couchbase_cxx_client_VERSION}")
 set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${couchbase_cxx_client_BUILD_NUMBER}")
+set(COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS 0)
 if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
    "^([0-9]+\\.[0-9]+\\.[0-9]+)(-([a-zA-Z0-9\\.]+))?(-([0-9]+)-g([a-zA-Z0-9]+))?$")
   set(COUCHBASE_CXX_CLIENT_SEMVER "${CMAKE_MATCH_1}")
@@ -67,6 +68,7 @@ if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
     set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${CMAKE_MATCH_3}.${couchbase_cxx_client_BUILD_NUMBER}")
   endif()
   if(CMAKE_MATCH_5 AND CMAKE_MATCH_5 GREATER 0) # number_of_commits.build_number.sha1
+    set(COUCHBASE_CXX_CLIENT_NUMBER_OF_COMMITS ${CMAKE_MATCH_5})
     set(COUCHBASE_CXX_CLIENT_SEMVER
         "${COUCHBASE_CXX_CLIENT_SEMVER}+${CMAKE_MATCH_5}.${couchbase_cxx_client_BUILD_NUMBER}.${CMAKE_MATCH_6}")
     if(CMAKE_MATCH_3) # pre-release
@@ -78,6 +80,8 @@ if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
   endif()
 endif()
+set(COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID "" CACHE STRING "Unified ID for wrapper SDK formatted as '<name>/<version>'")
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_version.hxx.in
                ${PROJECT_BINARY_DIR}/generated/couchbase/build_version.hxx @ONLY)
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_config.hxx.in

data/ext/couchbase/cmake/build_version.hxx.in CHANGED Viewed

@@ -32,5 +32,6 @@ constexpr auto COUCHBASE_CXX_CLIENT_VERSION_BUILD = @couchbase_cxx_client_BUILD_
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_REVISION = "@COUCHBASE_CXX_CLIENT_GIT_REVISION@";
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT = "@COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT@";
 constexpr auto COUCHBASE_CXX_CLIENT_GIT_DESCRIBE = "@COUCHBASE_CXX_CLIENT_GIT_DESCRIBE@";
+constexpr auto COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID = "@COUCHBASE_CXX_CLIENT_WRAPPER_UNIFIED_ID@";
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_STDLIB 1
 #cmakedefine COUCHBASE_CXX_CLIENT_STATIC_OPENSSL 1

data/ext/couchbase/cmake/couchbase-cxx-client.spec.in CHANGED Viewed

@@ -30,13 +30,13 @@ Source0: @COUCHBASE_CXX_CLIENT_TARBALL_NAME@.tar.gz
 This is the client and protocol library for Couchbase project.
 %package tools
-Summary: Couchbase C++ SDK - Tools
+Summary: Couchbase C++ SDK, command line tools
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description -n %{name}-tools
 CLI tools from the Couchbase C++ SDK.
 %package devel
-Summary: Couchbase C++ SDK - Header files
+Summary: Couchbase C++ SDK, development files
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 Development files for the Couchbase C++ SDK.

data/ext/couchbase/cmake/couchbase_cxx_client.pc.in CHANGED Viewed

@@ -3,8 +3,8 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
 includedir=@CMAKE_INSTALL_PREFIX@/include
 libdir=@CMAKE_INSTALL_LIBDIR@
-Name: couchbase-cxx-client @COUCHBASE_CXX_CLIENT_SEMVER@
+Name: couchbase-cxx-client @COUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION@
 Description: Couchbase C++ SDK
-Version: @COUCHBASE_CXX_CLIENT_SEMVER@
+Version: @COUCHBASE_CXX_CLIENT_PKGCONFIG_VERSION@
 Libs: -L${libdir} -lcouchbase_cxx_client
 Cflags: -I${includedir}

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

@@ -15,7 +15,7 @@
 #include "agent_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

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

@@ -15,7 +15,7 @@
 #include "agent_group_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

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

@@ -52,8 +52,8 @@
 #include <asio/io_context.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/context.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <chrono>
@@ -225,8 +225,8 @@ public:
     return {};
   }
-  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                       bool is_retry) -> std::error_code
+  auto direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+    -> std::error_code
   {
     auto handle_error = [is_retry, req](std::error_code ec) {
       // We only want to log an error on retries if the error isn't cancelled.
@@ -281,8 +281,8 @@ public:
     return {};
   }
-  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request,
-                         retry_reason reason) -> bool
+  auto backoff_and_retry(const std::shared_ptr<mcbp::queue_request>& request, retry_reason reason)
+    -> bool
   {
     auto action = retry_orchestrator::should_retry(request, reason);
     auto retried = action.need_to_retry();
@@ -314,8 +314,8 @@ public:
     return {};
   }
-  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket,
-                                       std::size_t node_index) -> std::optional<std::size_t>
+  [[nodiscard]] auto server_by_vbucket(std::uint16_t vbucket, std::size_t node_index)
+    -> std::optional<std::size_t>
   {
     const std::scoped_lock lock(config_mutex_);
     if (config_) {
@@ -356,7 +356,7 @@ public:
   void restart_sessions()
   {
     const std::scoped_lock lock(config_mutex_, sessions_mutex_);
-    if (!config_.has_value()) {
+    if (!config_) {
       return;
     }
@@ -512,37 +512,38 @@ public:
   }
   void with_configuration(
-    utils::movable_function<void(std::error_code, topology::configuration)>&& handler)
+    utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+      handler)
   {
     if (closed_) {
-      return handler(errc::network::configuration_not_available, topology::configuration{});
+      return handler(errc::network::configuration_not_available, nullptr);
     }
     if (configured_) {
-      std::optional<topology::configuration> config{};
+      std::shared_ptr<topology::configuration> config{};
       {
         const std::scoped_lock config_lock(config_mutex_);
         config = config_;
       }
       if (config) {
-        return handler({}, config.value());
+        return handler({}, config);
       }
-      return handler(errc::network::configuration_not_available, topology::configuration{});
+      return handler(errc::network::configuration_not_available, nullptr);
     }
     const std::scoped_lock lock(deferred_commands_mutex_);
     deferred_commands_.emplace([self = shared_from_this(), handler = std::move(handler)]() mutable {
       if (self->closed_ || !self->configured_) {
-        return handler(errc::network::configuration_not_available, topology::configuration{});
+        return handler(errc::network::configuration_not_available, nullptr);
       }
-      std::optional<topology::configuration> config{};
+      std::shared_ptr<topology::configuration> config{};
       {
         const std::scoped_lock config_lock(self->config_mutex_);
         config = self->config_;
       }
       if (config) {
-        return handler({}, config.value());
+        return handler({}, std::move(config));
       }
-      return handler(errc::network::configuration_not_available, topology::configuration{});
+      return handler(errc::network::configuration_not_available, nullptr);
     });
   }
@@ -715,7 +716,7 @@ public:
                      config_->rev_str(),
                      config.rev_str());
         return;
-      } else if (config_ < config) {
+      } else if (*config_ < config) {
         CB_LOG_DEBUG("{} will update the configuration old={} -> new={}",
                      log_prefix_,
                      config_->rev_str(),
@@ -742,7 +743,7 @@ public:
         added = config.nodes;
       }
       config_.reset();
-      config_ = config;
+      config_ = std::make_shared<topology::configuration>(config);
       configured_ = true;
       {
@@ -964,7 +965,7 @@ private:
   std::atomic_bool closed_{ false };
   std::atomic_bool configured_{ false };
-  std::optional<topology::configuration> config_{};
+  std::shared_ptr<topology::configuration> config_{};
   mutable std::mutex config_mutex_{};
   std::vector<std::shared_ptr<config_listener>> config_listeners_{};
@@ -1081,7 +1082,8 @@ bucket::bootstrap(utils::movable_function<void(std::error_code, topology::config
 void
 bucket::with_configuration(
-  utils::movable_function<void(std::error_code, topology::configuration)>&& handler)
+  utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+    handler)
 {
   return impl_->with_configuration(std::move(handler));
 }
@@ -1141,8 +1143,8 @@ bucket::direct_dispatch(std::shared_ptr<mcbp::queue_request> req) -> std::error_
 }
 auto
-bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req,
-                        bool is_retry) -> std::error_code
+bucket::direct_re_queue(const std::shared_ptr<mcbp::queue_request>& req, bool is_retry)
+  -> std::error_code
 {
   return impl_->direct_re_queue(req, is_retry);
 }

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

@@ -189,7 +189,8 @@ public:
   void update_config(topology::configuration config) override;
   void bootstrap(utils::movable_function<void(std::error_code, topology::configuration)>&& handler);
   void with_configuration(
-    utils::movable_function<void(std::error_code, topology::configuration)>&& handler);
+    utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+      handler);
   void on_configuration_update(std::shared_ptr<config_listener> handler);
   void close();

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

@@ -164,12 +164,10 @@
 #include <asio/executor_work_guard.hpp>
 #include <asio/post.hpp>
 #include <asio/ssl/verify_mode.hpp>
-#include <fmt/core.h>
 #include <atomic>
 #include <chrono>
 #include <cstring>
-#include <fmt/format.h>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -580,12 +578,12 @@ public:
         return self->with_bucket_configuration(
           bucket_name,
           [self, cap, request = std::move(request), handler = std::forward<Handler>(handler)](
-            std::error_code ec, const topology::configuration& config) mutable {
+            std::error_code ec, const std::shared_ptr<topology::configuration>& config) mutable {
             if (ec) {
               handler(request.make_response({ ec }, {}));
               return;
             }
-            if (!config.capabilities.has_bucket_capability(cap)) {
+            if (!config->capabilities.has_bucket_capability(cap)) {
               handler(request.make_response({ errc::common::feature_not_available }, {}));
               return;
             }
@@ -982,10 +980,11 @@ public:
   void with_bucket_configuration(
     const std::string& bucket_name,
-    utils::movable_function<void(std::error_code, topology::configuration)>&& handler)
+    utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+      handler)
   {
     if (stopped_) {
-      return handler(errc::network::cluster_closed, {});
+      return handler(errc::network::cluster_closed, nullptr);
     }
     if (auto bucket = find_bucket_by_name(bucket_name); bucket != nullptr) {
       return bucket->with_configuration(std::move(handler));
@@ -994,13 +993,13 @@ public:
       bucket_name,
       [self = shared_from_this(), bucket_name, handler = std::move(handler)](auto ec) mutable {
         if (ec) {
-          return handler(ec, {});
+          return handler(ec, nullptr);
         }
         if (auto bucket = self->find_bucket_by_name(bucket_name); bucket != nullptr) {
           return bucket->with_configuration(std::move(handler));
         }
-        return handler(errc::common::bucket_not_found, {});
+        return handler(errc::common::bucket_not_found, nullptr);
       });
   }
@@ -1328,7 +1327,8 @@ cluster::ping(std::optional<std::string> report_id,
 void
 cluster::with_bucket_configuration(
   const std::string& bucket_name,
-  utils::movable_function<void(std::error_code, topology::configuration)>&& handler) const
+  utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+    handler) const
 {
   if (impl_) {
     impl_->with_bucket_configuration(bucket_name, std::move(handler));

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

@@ -77,7 +77,8 @@ public:
   void with_bucket_configuration(
     const std::string& bucket_name,
-    utils::movable_function<void(std::error_code, topology::configuration)>&& handler) const;
+    utils::movable_function<void(std::error_code, std::shared_ptr<topology::configuration>)>&&
+      handler) const;
   void execute(o::analytics_request request, mf<void(o::analytics_response)>&& handler) const;
   void execute(o::append_request request, mf<void(o::append_response)>&& handler) const;

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

@@ -15,7 +15,7 @@
 #include "cluster_agent_config.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

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

@@ -42,7 +42,7 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tao/pegtl/parse_error.hpp>
 #include <tl/expected.hpp>

data/ext/couchbase/core/columnar/agent_config.cxx CHANGED Viewed

@@ -17,8 +17,8 @@
 #include "agent_config.hxx"
-#include <fmt/chrono.h>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

data/ext/couchbase/core/columnar/error.hxx CHANGED Viewed

@@ -18,7 +18,6 @@
 #pragma once
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <string>
 #include <system_error>

data/ext/couchbase/core/columnar/query_component.cxx CHANGED Viewed

@@ -33,9 +33,9 @@
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/chrono.h>
-#include <fmt/format.h>
 #include <gsl/util>
+#include <spdlog/fmt/bundled/chrono.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>

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

@@ -20,7 +20,7 @@
 #include "cluster_options.hxx"
 #include "core/config_profile.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <chrono>
 #include <mutex>

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

@@ -15,7 +15,7 @@
 #include "core_sdk_shim.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <string>

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

@@ -39,11 +39,11 @@
 #include <asio/error.hpp>
 #include <asio/io_context.hpp>
 #include <asio/steady_timer.hpp>
-#include <fmt/format.h>
 #include <gsl/span>
 #include <gsl/span_ext>
 #include <gsl/util>
 #include <snappy.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <tl/expected.hpp>

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

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

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

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

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

@@ -20,7 +20,7 @@
 #include "core/utils/binary.hxx"
 #include "core/utils/unsigned_leb128.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <cstddef>

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

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

data/ext/couchbase/core/error_context/analytics_json.hxx CHANGED Viewed

@@ -21,11 +21,13 @@
 #include "core/impl/retry_reason.hxx"
 #include <couchbase/error_codes.hxx>
-#include <couchbase/fmt/retry_reason.hxx>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/forward.hpp>
 #include <tao/json/value.hpp>
+#include <couchbase/fmt/retry_reason.hxx>
 namespace tao::json
 {
 template<>

data/ext/couchbase/core/error_context/key_value_json.hxx CHANGED Viewed

@@ -22,7 +22,7 @@
 #include "key_value_error_context.hxx"
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 namespace tao::json

data/ext/couchbase/core/error_context/query_public_json.hxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 namespace tao::json

data/ext/couchbase/core/error_context/subdocument_json.hxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/fmt/retry_reason.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/format.h>
 #include <tao/json/forward.hpp>
 #include "key_value_json.hxx"

data/ext/couchbase/core/fmt/key_value_error_map_attribute.hxx CHANGED Viewed

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

data/ext/couchbase/core/fmt/key_value_extended_error_info.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/error_context/key_value_extended_error_info.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 /**
  * Helper for fmtlib to format @ref couchbase::key_value_extended_error_info objects.

data/ext/couchbase/core/fmt/key_value_status_code.hxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/error_context/key_value_status_code.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 /**
  * Helper for fmtlib to format @ref couchbase::core::key_value_status_code objects.

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

@@ -25,7 +25,7 @@
 #include <couchbase/build_config.hxx>
 #include <asio/error.hpp>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <tl/expected.hpp>
 #include <memory>
@@ -269,8 +269,8 @@ public:
   ~pending_buffered_http_operation() override = default;
   pending_buffered_http_operation(const pending_buffered_http_operation&) = delete;
   pending_buffered_http_operation(pending_buffered_http_operation&&) = delete;
-  auto operator=(const pending_buffered_http_operation&) -> pending_buffered_http_operation =
-                                                              delete;
+  auto operator=(const pending_buffered_http_operation&)
+    -> pending_buffered_http_operation = delete;
   auto operator=(pending_buffered_http_operation&&) -> pending_buffered_http_operation = delete;
   void start(buffered_free_form_http_request_callback&& callback)

data/ext/couchbase/core/impl/analytics.cxx CHANGED Viewed

@@ -167,6 +167,7 @@ build_analytics_request(std::string statement,
     std::move(options.client_context_id),
     options.timeout,
   };
+  request.parent_span = options.parent_span;
   if (!options.raw.empty()) {
     for (auto& [name, value] : options.raw) {
       request.raw[name] = std::move(value);

data/ext/couchbase/core/impl/best_effort_retry_strategy.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include <couchbase/retry_reason.hxx>
 #include <couchbase/retry_request.hxx>
-#include <fmt/format.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <chrono>