npm - couchbase - Versions diffs - 4.4.4 → 4.4.5 - Mend

couchbase 4.4.4 → 4.4.5

Files changed (313) hide show

package/deps/couchbase-cxx-client/core/operations/management/query_index_drop.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/keyspace.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/value.hpp>
 #include <regex>

package/deps/couchbase-cxx-client/core/operations/management/scope_create.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>
 #include <regex>

package/deps/couchbase-cxx-client/core/operations/management/scope_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>
 #include <regex>

package/deps/couchbase-cxx-client/core/operations/management/scope_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

package/deps/couchbase-cxx-client/core/operations/management/search_index_analyze_document.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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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
       },
     },

package/deps/couchbase-cxx-client/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

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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>

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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_;
   }

package/deps/couchbase-cxx-client/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
 {

package/deps/couchbase-cxx-client/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)

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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
 {

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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<>

package/deps/couchbase-cxx-client/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> {

package/deps/couchbase-cxx-client/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
 {

package/deps/couchbase-cxx-client/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>

package/deps/couchbase-cxx-client/core/transactions/attempt_context.cxx CHANGED Viewed

@@ -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
 {

package/deps/couchbase-cxx-client/core/transactions/exceptions_fmt.hxx CHANGED Viewed

@@ -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> {

package/deps/couchbase-cxx-client/core/transactions/internal/atr_cleanup_entry.hxx CHANGED Viewed

@@ -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>

package/deps/couchbase-cxx-client/core/transactions/internal/client_record.hxx CHANGED Viewed

@@ -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 << "]}";

package/deps/couchbase-cxx-client/core/transactions/internal/doc_record_fmt.hxx CHANGED Viewed

@@ -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> {

package/deps/couchbase-cxx-client/core/transactions/internal/exceptions_internal.hxx CHANGED Viewed

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

package/deps/couchbase-cxx-client/core/transactions/internal/exceptions_internal_fmt.hxx CHANGED Viewed

@@ -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> {

package/deps/couchbase-cxx-client/core/transactions/internal/logging.hxx CHANGED Viewed

@@ -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

package/deps/couchbase-cxx-client/core/transactions/internal/transaction_context.hxx CHANGED Viewed

@@ -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,

package/deps/couchbase-cxx-client/core/transactions/result_fmt.hxx CHANGED Viewed

@@ -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> {

package/deps/couchbase-cxx-client/core/transactions/transaction_context.cxx CHANGED Viewed

@@ -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)
 {

package/deps/couchbase-cxx-client/core/transactions/transaction_links.hxx CHANGED Viewed

@@ -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>

package/deps/couchbase-cxx-client/core/utils/join_strings.hxx CHANGED Viewed

@@ -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
 {

package/deps/couchbase-cxx-client/core/utils/keyspace.hxx CHANGED Viewed

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

package/deps/couchbase-cxx-client/core/utils/url_codec.cxx CHANGED Viewed

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