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/impl/query_error_context.cxx CHANGED Viewed

@@ -15,12 +15,13 @@
  *   limitations under the License.
  */
-#include <couchbase/fmt/retry_reason.hxx>
 #include "core/error_context/query_error_context.hxx"
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/to_string.hpp>
+#include <couchbase/fmt/retry_reason.hxx>
 namespace couchbase::core
 {
 auto

package/deps/couchbase-cxx-client/core/impl/scope.cxx CHANGED Viewed

@@ -31,7 +31,7 @@
 #include <couchbase/collection.hxx>
 #include <couchbase/scope.hxx>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <memory>
 #include <utility>
@@ -136,8 +136,8 @@ scope::query(std::string statement, const query_options& options, query_handler&
 }
 auto
-scope::query(std::string statement,
-             const query_options& options) const -> std::future<std::pair<error, query_result>>
+scope::query(std::string statement, const query_options& options) const
+  -> std::future<std::pair<error, query_result>>
 {
   auto barrier = std::make_shared<std::promise<std::pair<error, query_result>>>();
   auto future = barrier->get_future();
@@ -178,9 +178,8 @@ scope::search(std::string index_name,
 }
 auto
-scope::search(std::string index_name,
-              search_request request,
-              const search_options& options) const -> std::future<std::pair<error, search_result>>
+scope::search(std::string index_name, search_request request, const search_options& options) const
+  -> std::future<std::pair<error, search_result>>
 {
   auto barrier = std::make_shared<std::promise<std::pair<error, search_result>>>();
   auto future = barrier->get_future();

package/deps/couchbase-cxx-client/core/impl/search.cxx CHANGED Viewed

@@ -29,7 +29,7 @@
 #include <couchbase/match_none_query.hxx>
 #include <utility>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 namespace couchbase::core::impl
 {

package/deps/couchbase-cxx-client/core/io/config_tracker.cxx CHANGED Viewed

@@ -29,7 +29,7 @@
 #include "mcbp_session.hxx"
 #include <asio/steady_timer.hpp>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 namespace couchbase::core::io
 {

package/deps/couchbase-cxx-client/core/io/dns_client.cxx CHANGED Viewed

@@ -27,10 +27,8 @@
 #include <asio/ip/tcp.hpp>
 #include <asio/read.hpp>
 #include <asio/write.hpp>
-#include <fmt/chrono.h>
 #include <spdlog/fmt/bin_to_hex.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <chrono>
 #include <memory>
@@ -98,6 +96,9 @@ public:
                         bytes_transferred1);
         if (ec1) {
           self->udp_deadline_.cancel();
+          if (ec1 == asio::error::operation_aborted) {
+            return;
+          }
           CB_LOG_DEBUG(
             "DNS UDP write operation has got error, retrying with TCP, address=\"{}:{}\", ec={}",
             self->address_.to_string(),
@@ -121,6 +122,9 @@ public:
             self->udp_deadline_.cancel();
             if (ec2) {
+              if (ec2 == asio::error::operation_aborted) {
+                return;
+              }
               CB_LOG_DEBUG(
                 "DNS UDP read operation has got error, retrying with TCP, address=\"{}:{}\", ec={}",
                 self->address_.to_string(),
@@ -151,11 +155,12 @@ public:
       if (ec == asio::error::operation_aborted) {
         return;
       }
+      self->udp_.cancel();
       CB_LOG_DEBUG("DNS UDP deadline has been reached, cancelling UDP operation and fall back to "
                    "TCP, address=\"{}:{}\"",
                    self->address_.to_string(),
                    self->port_);
-      self->udp_.cancel();
+      return self->retry_with_tcp();
     });
     deadline_.expires_after(total_timeout);
@@ -172,6 +177,7 @@ public:
       if (self->tcp_.is_open()) {
         self->tcp_.cancel();
       }
+      return self->handler_({ errc::common::unambiguous_timeout });
     });
   }
@@ -195,6 +201,9 @@ private:
     const asio::ip::tcp::endpoint endpoint(address_, port_);
     tcp_.async_connect(endpoint, [self = shared_from_this()](std::error_code ec1) mutable {
       if (ec1) {
+        if (ec1 == asio::error::operation_aborted) {
+          return;
+        }
         self->deadline_.cancel();
         CB_LOG_DEBUG("DNS TCP connection has been aborted, address=\"{}:{}\", ec={}",
                      self->address_.to_string(),
@@ -220,14 +229,14 @@ private:
                           ec2 ? ec2.message() : "ok",
                           bytes_transferred2);
           if (ec2) {
+            if (ec2 == asio::error::operation_aborted) {
+              return;
+            }
             CB_LOG_DEBUG("DNS TCP write operation has been aborted, address=\"{}:{}\", ec={}",
                          self->address_.to_string(),
                          self->port_,
                          ec2.message());
             self->deadline_.cancel();
-            if (ec2 == asio::error::operation_aborted) {
-              ec2 = errc::common::unambiguous_timeout;
-            }
             return self->handler_({ ec2 });
           }
           asio::async_read(
@@ -244,6 +253,9 @@ private:
                                reinterpret_cast<std::uint8_t*>(&self->recv_buf_size_) +
                                  bytes_transferred3));
               if (ec3) {
+                if (ec3 == asio::error::operation_aborted) {
+                  return;
+                }
                 CB_LOG_DEBUG(
                   "DNS TCP buf size read operation has been aborted, address=\"{}:{}\", ec={}",
                   self->address_.to_string(),
@@ -259,7 +271,6 @@ private:
                 self->tcp_,
                 asio::buffer(self->recv_buf_),
                 [self](std::error_code ec4, std::size_t bytes_transferred4) mutable {
-                  self->deadline_.cancel();
                   CB_LOG_PROTOCOL(
                     "[DNS, TCP, IN] host=\"{}\", port={}, rc={}, bytes_received={}{:a}",
                     self->address_.to_string(),
@@ -269,6 +280,10 @@ private:
                     spdlog::to_hex(self->recv_buf_.data(),
                                    self->recv_buf_.data() + bytes_transferred4));
+                  if (ec4 == asio::error::operation_aborted) {
+                    return;
+                  }
+                  self->deadline_.cancel();
                   if (ec4) {
                     CB_LOG_DEBUG(
                       "DNS TCP read operation has been aborted, address=\"{}:{}\", ec={}",

package/deps/couchbase-cxx-client/core/io/http_parser.cxx CHANGED Viewed

@@ -17,8 +17,8 @@
 #include "http_parser.hxx"
-#include <fmt/core.h>
 #include <llhttp.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>

package/deps/couchbase-cxx-client/core/io/http_session.cxx CHANGED Viewed

@@ -19,10 +19,14 @@
 #include "core/logger/logger.hxx"
 #include "core/meta/version.hxx"
+#include "core/platform/base64.h"
 #include "core/platform/uuid.h"
 #include "core/service_type_fmt.hxx"
 #include <couchbase/error_codes.hxx>
+#include <spdlog/fmt/bin_to_hex.h>
 #include <utility>
 namespace couchbase::core::io

package/deps/couchbase-cxx-client/core/io/http_session.hxx CHANGED Viewed

@@ -20,7 +20,6 @@
 #include <couchbase/build_config.hxx>
 #include "core/diagnostics.hxx"
-#include "core/impl/bootstrap_error.hxx"
 #include "core/origin.hxx"
 #include "core/platform/base64.h"
 #include "core/utils/movable_function.hxx"
@@ -30,9 +29,12 @@
 #include "http_streaming_parser.hxx"
 #include "http_streaming_response.hxx"
 #include "streams.hxx"
+#ifdef COUCHBASE_CXX_CLIENT_COLUMNAR
+#include "core/impl/bootstrap_error.hxx"
+#endif
 #include <asio.hpp>
-#include <spdlog/fmt/bin_to_hex.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <memory>
 #include <optional>

package/deps/couchbase-cxx-client/core/io/mcbp_command.hxx CHANGED Viewed

@@ -36,7 +36,7 @@
 #include <couchbase/error_codes.hxx>
 #include <asio/steady_timer.hpp>
-#include <fmt/chrono.h>
+#include <spdlog/fmt/bundled/chrono.h>
 #include <functional>
 #include <utility>

package/deps/couchbase-cxx-client/core/key_value_config.cxx CHANGED Viewed

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

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

@@ -27,7 +27,7 @@
 #include "level.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <spdlog/fwd.h>
 #include <memory>

package/deps/couchbase-cxx-client/core/management/rbac_fmt.hxx CHANGED Viewed

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

package/deps/couchbase-cxx-client/core/mcbp/operation_queue.cxx CHANGED Viewed

@@ -23,7 +23,7 @@
 #include <couchbase/error_codes.hxx>
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
 #include <iterator>

package/deps/couchbase-cxx-client/core/mcbp/packet.cxx CHANGED Viewed

@@ -22,8 +22,8 @@
 #include "core/fmt/key_value_status_code.hxx"
-#include <fmt/core.h>
 #include <spdlog/fmt/bin_to_hex.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <iterator>

package/deps/couchbase-cxx-client/core/meta/version.cxx CHANGED Viewed

@@ -27,12 +27,12 @@
 #include <couchbase/build_version.hxx>
 #include <asio/version.hpp>
-#include <fmt/core.h>
 #include <hdr/hdr_histogram_version.h>
 #include <llhttp.h>
 #include <openssl/crypto.h>
 #include <openssl/x509.h>
 #include <snappy-stubs-public.h>
+#include <spdlog/fmt/bundled/core.h>
 #include <spdlog/version.h>
 #include <regex>

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

@@ -76,6 +76,5 @@ target_link_libraries(
   couchbase_operations_management
   PRIVATE project_options
           project_warnings
-          fmt::fmt
           spdlog::spdlog)
 target_include_directories(couchbase_operations_management PRIVATE ../../..)

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

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_dataset_drop.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_dataverse_create.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_dataverse_drop.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_get_pending_mutations.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/analytics_index_drop.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_link_connect.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_link_disconnect.cxx CHANGED Viewed

@@ -21,7 +21,7 @@
 #include "core/utils/name_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/analytics_link_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/analytics_link_get_all.cxx CHANGED Viewed

@@ -24,7 +24,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/analytics_link_utils.hxx CHANGED Viewed

@@ -19,15 +19,16 @@
 #include "core/utils/url_codec.hxx"
+#include <spdlog/fmt/bundled/core.h>
 #include <algorithm>
-#include <fmt/core.h>
 #include <string>
 namespace couchbase::core::operations::management
 {
 template<typename analytics_link_type>
-std::string
-endpoint_from_analytics_link(const analytics_link_type& link)
+auto
+endpoint_from_analytics_link(const analytics_link_type& link) -> std::string
 {
   if (std::count(link.dataverse.begin(), link.dataverse.end(), '/') > 0) {
     return fmt::format("/analytics/link/{}/{}",

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

package/deps/couchbase-cxx-client/core/operations/management/bucket_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>
 namespace couchbase::core::operations::management
 {

package/deps/couchbase-cxx-client/core/operations/management/bucket_flush.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>
 namespace couchbase::core::operations::management
 {

package/deps/couchbase-cxx-client/core/operations/management/bucket_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/change_password.cxx CHANGED Viewed

@@ -19,7 +19,7 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 namespace couchbase::core::operations::management
 {

package/deps/couchbase-cxx-client/core/operations/management/collection_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/collection_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/collection_update.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/eventing_deploy_function.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/eventing_drop_function.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/eventing_get_function.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/eventing_pause_function.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/eventing_resume_function.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/eventing_undeploy_function.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/eventing_upsert_function.cxx CHANGED Viewed

@@ -21,10 +21,9 @@
 #include "core/utils/url_codec.hxx"
 #include "error_utils.hxx"
+#include <spdlog/fmt/bundled/core.h>
 #include <tao/json/contrib/traits.hpp>
-#include <fmt/core.h>
 namespace couchbase::core::operations::management
 {
 auto

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

@@ -19,7 +19,7 @@
 #include "error_utils.hxx"
-#include <fmt/core.h>
+#include <spdlog/fmt/bundled/core.h>
 namespace couchbase::core::operations::management
 {

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

@@ -21,7 +21,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/query_index_build.hxx CHANGED Viewed

@@ -56,12 +56,12 @@ struct query_index_build_request {
   std::optional<std::string> client_context_id{};
   std::optional<std::chrono::milliseconds> timeout{};
-  [[nodiscard]] std::error_code encode_to(encoded_request_type& encoded,
-                                          http_context& context) const;
+  [[nodiscard]] auto encode_to(encoded_request_type& encoded, http_context& context) const
+    -> std::error_code;
-  [[nodiscard]] query_index_build_response make_response(
-    error_context::http&& ctx,
-    const encoded_response_type& encoded) const;
+  [[nodiscard]] auto make_response(error_context::http&& ctx,
+                                   const encoded_response_type& encoded) const
+    -> query_index_build_response;
 };
 } // namespace couchbase::core::operations::management

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