couchbase 3.4.2 → 3.4.4

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

@@ -18,52 +18,38 @@
 #include "core/transactions/error_class.hxx"
 
 #include <functional>
+#include <optional>
 #include <string>
 
 namespace couchbase::core::transactions
 {
 using error_func3 = std::function<std::optional<error_class>(const std::string&)>;
 using error_func4 = std::function<std::optional<error_class>(void)>;
-namespace
-{
-std::optional<couchbase::core::transactions::error_class>
-noop1(const std::string&)
-{
-    return {};
-}
-std::optional<couchbase::core::transactions::error_class>
-noop2()
-{
-    return {};
-}
-
-} // namespace
 
 /**
  * Hooks purely for testing purposes.  If you're an end-user looking at these for any reason, then please contact us first
  * about your use-case: we are always open to adding good ideas into the transactions library.
  */
 struct cleanup_testing_hooks {
-    error_func3 before_commit_doc = noop1;
-    error_func3 before_doc_get = noop1;
-    error_func3 before_remove_doc_staged_for_removal = noop1;
-    error_func3 before_remove_doc = noop1;
-    error_func3 before_atr_get = noop1;
-    error_func3 before_remove_links = noop1;
+    error_func3 before_commit_doc;
+    error_func3 before_doc_get;
+    error_func3 before_remove_doc_staged_for_removal;
+    error_func3 before_remove_doc;
+    error_func3 before_atr_get;
+    error_func3 before_remove_links;
 
-    error_func4 before_atr_remove = noop2;
+    error_func4 before_atr_remove;
 
-    error_func4 on_cleanup_docs_completed = noop2;
-    error_func4 on_cleanup_completed = noop2;
+    error_func4 on_cleanup_docs_completed;
+    error_func4 on_cleanup_completed;
 
-    error_func3 client_record_before_create = noop1;
-    error_func3 client_record_before_get = noop1;
-    error_func3 client_record_before_update = noop1;
-    error_func3 client_record_before_remove_client = noop1;
+    error_func3 client_record_before_create;
+    error_func3 client_record_before_get;
+    error_func3 client_record_before_update;
+    error_func3 client_record_before_remove_client;
 
+    cleanup_testing_hooks();
     // needed for unique_ptr<cleanup_testing_hooks> in transaction_config, with a forward declaration.
-    ~cleanup_testing_hooks()
-    {
-    }
+    ~cleanup_testing_hooks() = default;
 };
-} // namespace couchbase::core::transactions
+} // namespace couchbase::core::transactions

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

@@ -16,11 +16,14 @@
 
 #pragma once
 
-#include <core/error_context/query.hxx>
+#include "core/error_context/query.hxx"
+#include "error_class.hxx"
+
 #include <couchbase/error_codes.hxx>
 #include <couchbase/transactions/transaction_result.hxx>
-#include <optional>
+
 #include <stdexcept>
+#include <utility>
 
 namespace couchbase::core::transactions
 {
@@ -135,7 +138,7 @@ class op_exception : public std::runtime_error
     transaction_op_error_context ctx_;
 
   public:
-    op_exception(transaction_op_error_context ctx, external_exception cause = COUCHBASE_EXCEPTION)
+    explicit op_exception(transaction_op_error_context ctx, external_exception cause = COUCHBASE_EXCEPTION)
       : std::runtime_error(ctx.ec().message())
       , cause_(cause)
       , ctx_(std::move(ctx))
@@ -157,7 +160,7 @@ class document_not_found : public op_exception
 {
   public:
     explicit document_not_found(transaction_op_error_context ctx)
-      : op_exception(ctx, DOCUMENT_NOT_FOUND_EXCEPTION)
+      : op_exception(std::move(ctx), DOCUMENT_NOT_FOUND_EXCEPTION)
     {
     }
 };
@@ -166,7 +169,7 @@ class document_exists : public op_exception
 {
   public:
     explicit document_exists(transaction_op_error_context ctx)
-      : op_exception(ctx, DOCUMENT_EXISTS_EXCEPTION)
+      : op_exception(std::move(ctx), DOCUMENT_EXISTS_EXCEPTION)
     {
     }
 };
@@ -175,7 +178,7 @@ class query_attempt_not_found : public op_exception
 {
   public:
     query_attempt_not_found(transaction_op_error_context ctx)
-      : op_exception(ctx)
+      : op_exception(std::move(ctx))
     {
     }
 };
@@ -184,7 +187,7 @@ class query_cas_mismatch : public op_exception
 {
   public:
     query_cas_mismatch(transaction_op_error_context ctx)
-      : op_exception(ctx)
+      : op_exception(std::move(ctx))
     {
     }
 };
@@ -193,7 +196,7 @@ class query_attempt_expired : public op_exception
 {
   public:
     query_attempt_expired(transaction_op_error_context ctx)
-      : op_exception(ctx)
+      : op_exception(std::move(ctx))
     {
     }
 };
@@ -202,7 +205,7 @@ class query_parsing_failure : public op_exception
 {
   public:
     query_parsing_failure(transaction_op_error_context ctx)
-      : op_exception(ctx, PARSING_FAILURE)
+      : op_exception(std::move(ctx), PARSING_FAILURE)
     {
     }
 };

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

@@ -182,33 +182,39 @@ struct action<bucket_name> {
 } // namespace priv
 
 void
-parse_option(std::string& receiver, const std::string& /* name */, const std::string& value)
+parse_option(std::string& receiver, const std::string& /* name */, const std::string& value, std::vector<std::string>& /* warnings */)
 {
     receiver = string_codec::url_decode(value);
 }
 
 void
-parse_option(bool& receiver, const std::string& /* name */, const std::string& value)
+parse_option(bool& receiver, const std::string& name, const std::string& value, std::vector<std::string>& warnings)
 {
     if (value == "true" || value == "yes" || value == "on") {
         receiver = true;
     } else if (value == "false" || value == "no" || value == "off") {
         receiver = false;
+    } else {
+        warnings.push_back(fmt::format(
+          R"(unable to parse "{}" parameter in connection string (value "{}" cannot be interpreted as a boolean))", name, value));
     }
 }
 
 void
-parse_option(tls_verify_mode& receiver, const std::string& /* name */, const std::string& value)
+parse_option(tls_verify_mode& receiver, const std::string& name, const std::string& value, std::vector<std::string>& warnings)
 {
     if (value == "none") {
         receiver = tls_verify_mode::none;
     } else if (value == "peer") {
         receiver = tls_verify_mode::peer;
+    } else {
+        warnings.push_back(fmt::format(
+          R"(unable to parse "{}" parameter in connection string (value "{}" is not a valid TLS verification mode))", name, value));
     }
 }
 
 void
-parse_option(io::ip_protocol& receiver, const std::string& /* name */, const std::string& value)
+parse_option(io::ip_protocol& receiver, const std::string& name, const std::string& value, std::vector<std::string>& warnings)
 {
     if (value == "any") {
         receiver = io::ip_protocol::any;
@@ -216,23 +222,28 @@ parse_option(io::ip_protocol& receiver, const std::string& /* name */, const std
         receiver = io::ip_protocol::force_ipv4;
     } else if (value == "force_ipv6") {
         receiver = io::ip_protocol::force_ipv6;
+    } else {
+        warnings.push_back(fmt::format(
+          R"(unable to parse "{}" parameter in connection string (value "{}" is not a valid IP protocol preference))", name, value));
     }
 }
 
 void
-parse_option(std::size_t& receiver, const std::string& name, const std::string& value)
+parse_option(std::size_t& receiver, const std::string& name, const std::string& value, std::vector<std::string>& warnings)
 {
     try {
         receiver = std::stoull(value, nullptr, 10);
     } catch (const std::invalid_argument& ex1) {
-        CB_LOG_WARNING(R"(unable to parse "{}" parameter in connection string (value "{}" is not a number): {})", name, value, ex1.what());
+        warnings.push_back(
+          fmt::format(R"(unable to parse "{}" parameter in connection string (value "{}" is not a number): {})", name, value, ex1.what()));
     } catch (const std::out_of_range& ex2) {
-        CB_LOG_WARNING(R"(unable to parse "{}" parameter in connection string (value "{}" is out of range): {})", name, value, ex2.what());
+        warnings.push_back(
+          fmt::format(R"(unable to parse "{}" parameter in connection string (value "{}" is out of range): {})", name, value, ex2.what()));
     }
 }
 
 void
-parse_option(std::chrono::milliseconds& receiver, const std::string& name, const std::string& value)
+parse_option(std::chrono::milliseconds& receiver, const std::string& name, const std::string& value, std::vector<std::string>& warnings)
 {
     try {
         receiver = std::chrono::duration_cast<std::chrono::milliseconds>(parse_duration(value));
@@ -240,11 +251,11 @@ parse_option(std::chrono::milliseconds& receiver, const std::string& name, const
         try {
             receiver = std::chrono::milliseconds(std::stoull(value, nullptr, 10));
         } catch (const std::invalid_argument& ex1) {
-            CB_LOG_WARNING(
-              R"(unable to parse "{}" parameter in connection string (value "{}" is not a number): {})", name, value, ex1.what());
+            warnings.push_back(fmt::format(
+              R"(unable to parse "{}" parameter in connection string (value "{}" is not a number): {})", name, value, ex1.what()));
         } catch (const std::out_of_range& ex2) {
-            CB_LOG_WARNING(
-              R"(unable to parse "{}" parameter in connection string (value "{}" is out of range): {})", name, value, ex2.what());
+            warnings.push_back(fmt::format(
+              R"(unable to parse "{}" parameter in connection string (value "{}" is out of range): {})", name, value, ex2.what()));
         }
     }
 }
@@ -262,68 +273,68 @@ extract_options(connection_string& connstr)
              * Number of seconds the client should wait while attempting to connect to a node’s KV service via a socket.  Initial
              * connection, reconnecting, node added, etc.
              */
-            parse_option(connstr.options.connect_timeout, name, value);
+            parse_option(connstr.options.connect_timeout, name, value, connstr.warnings);
         } else if (name == "kv_timeout" || name == "key_value_timeout") {
             /**
              * Number of milliseconds to wait before timing out a KV operation by the client.
              */
-            parse_option(connstr.options.key_value_timeout, name, value);
+            parse_option(connstr.options.key_value_timeout, name, value, connstr.warnings);
         } else if (name == "kv_durable_timeout" || name == "key_value_durable_timeout") {
             /**
              * Number of milliseconds to wait before timing out a KV operation that is either using synchronous durability or
              * observe-based durability.
              */
-            parse_option(connstr.options.key_value_durable_timeout, name, value);
+            parse_option(connstr.options.key_value_durable_timeout, name, value, connstr.warnings);
         } else if (name == "view_timeout") {
             /**
              * Number of seconds to wait before timing out a View request  by the client..
              */
-            parse_option(connstr.options.view_timeout, name, value);
+            parse_option(connstr.options.view_timeout, name, value, connstr.warnings);
         } else if (name == "query_timeout") {
             /**
              * Number of seconds to wait before timing out a Query or N1QL request by the client.
              */
-            parse_option(connstr.options.query_timeout, name, value);
+            parse_option(connstr.options.query_timeout, name, value, connstr.warnings);
         } else if (name == "analytics_timeout") {
             /**
              * Number of seconds to wait before timing out an Analytics request by the client.
              */
-            parse_option(connstr.options.analytics_timeout, name, value);
+            parse_option(connstr.options.analytics_timeout, name, value, connstr.warnings);
         } else if (name == "search_timeout") {
             /**
              * Number of seconds to wait before timing out a Search request by the client.
              */
-            parse_option(connstr.options.search_timeout, name, value);
+            parse_option(connstr.options.search_timeout, name, value, connstr.warnings);
         } else if (name == "management_timeout") {
             /**
              * Number of seconds to wait before timing out a Management API request by the client.
              */
-            parse_option(connstr.options.management_timeout, name, value);
+            parse_option(connstr.options.management_timeout, name, value, connstr.warnings);
         } else if (name == "trust_certificate") {
-            parse_option(connstr.options.trust_certificate, name, value);
+            parse_option(connstr.options.trust_certificate, name, value, connstr.warnings);
         } else if (name == "enable_mutation_tokens") {
             /**
              * Request mutation tokens at connection negotiation time. Turning this off will save 16 bytes per operation response.
              */
-            parse_option(connstr.options.enable_mutation_tokens, name, value);
+            parse_option(connstr.options.enable_mutation_tokens, name, value, connstr.warnings);
         } else if (name == "enable_tcp_keep_alive") {
             /**
              * Gets or sets a value indicating whether enable TCP keep-alive.
              */
-            parse_option(connstr.options.enable_tcp_keep_alive, name, value);
+            parse_option(connstr.options.enable_tcp_keep_alive, name, value, connstr.warnings);
         } else if (name == "tcp_keep_alive_interval") {
             /**
              * Specifies the timeout, in milliseconds, with no activity until the first keep-alive packet is sent. This applies to all
              * services, but is advisory: if the underlying platform does not support this on all connections, it will be applied only
              * on those it can be.
              */
-            parse_option(connstr.options.tcp_keep_alive_interval, name, value);
+            parse_option(connstr.options.tcp_keep_alive_interval, name, value, connstr.warnings);
         } else if (name == "force_ipv4") {
             /**
              * Sets the SDK configuration to do IPv4 Name Resolution
              */
             bool force_ipv4 = false;
-            parse_option(force_ipv4, name, value);
+            parse_option(force_ipv4, name, value, connstr.warnings);
             if (force_ipv4) {
                 connstr.options.use_ip_protocol = io::ip_protocol::force_ipv4;
             }
@@ -331,30 +342,40 @@ extract_options(connection_string& connstr)
             /**
              * Controls preference of IP protocol for name resolution
              */
-            parse_option(connstr.options.use_ip_protocol, name, value);
+            parse_option(connstr.options.use_ip_protocol, name, value, connstr.warnings);
         } else if (name == "config_poll_interval") {
-            parse_option(connstr.options.config_poll_interval, name, value);
+            parse_option(connstr.options.config_poll_interval, name, value, connstr.warnings);
         } else if (name == "config_poll_floor") {
-            parse_option(connstr.options.config_poll_floor, name, value);
+            parse_option(connstr.options.config_poll_floor, name, value, connstr.warnings);
         } else if (name == "max_http_connections") {
             /**
              * The maximum number of HTTP connections allowed on a per-host and per-port basis.  0 indicates an unlimited number of
              * connections are permitted.
              */
-            parse_option(connstr.options.max_http_connections, name, value);
+            parse_option(connstr.options.max_http_connections, name, value, connstr.warnings);
         } else if (name == "idle_http_connection_timeout") {
             /**
              * The period of time an HTTP connection can be idle before it is forcefully disconnected.
              */
-            parse_option(connstr.options.idle_http_connection_timeout, name, value);
+            parse_option(connstr.options.idle_http_connection_timeout, name, value, connstr.warnings);
+        } else if (name == "bootstrap_timeout") {
+            /**
+             * The period of time allocated to complete bootstrap
+             */
+            parse_option(connstr.options.bootstrap_timeout, name, value, connstr.warnings);
+        } else if (name == "resolve_timeout") {
+            /**
+             * The period of time to resolve DNS name of the node to IP address
+             */
+            parse_option(connstr.options.resolve_timeout, name, value, connstr.warnings);
         } else if (name == "enable_dns_srv") {
             if (connstr.bootstrap_nodes.size() == 1) {
-                parse_option(connstr.options.enable_dns_srv, name, value);
+                parse_option(connstr.options.enable_dns_srv, name, value, connstr.warnings);
             } else {
-                CB_LOG_WARNING(
-                  R"(parameter "{}" require single entry in bootstrap nodes list of the connection string, ignoring (value "{}"))",
+                connstr.warnings.push_back(fmt::format(
+                  R"(parameter "{}" requires single entry in bootstrap nodes list of the connection string, ignoring (value "{}"))",
                   name,
-                  value);
+                  value));
             }
         } else if (name == "network") {
             connstr.options.network = value; /* current known values are "auto", "default" and "external" */
@@ -362,44 +383,55 @@ extract_options(connection_string& connstr)
             /**
              * Whether to display N1QL, Analytics, Search queries on info level (default false)
              */
-            parse_option(connstr.options.show_queries, name, value);
+            parse_option(connstr.options.show_queries, name, value, connstr.warnings);
         } else if (name == "enable_clustermap_notification") {
             /**
              * Allow the server to push configuration updates asynchronously.
              */
-            parse_option(connstr.options.enable_clustermap_notification, name, value);
+            parse_option(connstr.options.enable_clustermap_notification, name, value, connstr.warnings);
         } else if (name == "enable_unordered_execution") {
             /**
              * Allow the server to reorder commands
              */
-            parse_option(connstr.options.enable_unordered_execution, name, value);
+            parse_option(connstr.options.enable_unordered_execution, name, value, connstr.warnings);
         } else if (name == "enable_compression") {
             /**
              * Announce support of compression (snappy) to server
              */
-            parse_option(connstr.options.enable_compression, name, value);
+            parse_option(connstr.options.enable_compression, name, value, connstr.warnings);
         } else if (name == "enable_tracing") {
             /**
              * true - use threshold_logging_tracer
              * false - use noop_tracer
              */
-            parse_option(connstr.options.enable_tracing, name, value);
+            parse_option(connstr.options.enable_tracing, name, value, connstr.warnings);
         } else if (name == "enable_metrics") {
             /**
              * true - use logging_meter
              * false - use noop_meter
              */
-            parse_option(connstr.options.enable_metrics, name, value);
+            parse_option(connstr.options.enable_metrics, name, value, connstr.warnings);
         } else if (name == "tls_verify") {
-            parse_option(connstr.options.tls_verify, name, value);
+            parse_option(connstr.options.tls_verify, name, value, connstr.warnings);
+        } else if (name == "disable_mozilla_ca_certificates") {
+            parse_option(connstr.options.disable_mozilla_ca_certificates, name, value, connstr.warnings);
+        } else if (name == "tls_disable_deprecated_protocols") {
+            parse_option(connstr.options.tls_disable_deprecated_protocols, name, value, connstr.warnings);
+        } else if (name == "tls_disable_v1_2") {
+            parse_option(connstr.options.tls_disable_v1_2, name, value, connstr.warnings);
         } else if (name == "user_agent_extra") {
             /**
              * string, that will be appended to identification fields of the server protocols (key in HELO packet for MCBP, "user-agent"
              * header for HTTP)
              */
-            parse_option(connstr.options.user_agent_extra, name, value);
+            parse_option(connstr.options.user_agent_extra, name, value, connstr.warnings);
+        } else if (name == "dump_configuration") {
+            /**
+             * Whether to dump every new configuration on TRACE level
+             */
+            parse_option(connstr.options.dump_configuration, name, value, connstr.warnings);
         } else {
-            CB_LOG_WARNING(R"(unknown parameter "{}" in connection string (value "{}"))", name, value);
+            connstr.warnings.push_back(fmt::format(R"(unknown parameter "{}" in connection string (value "{}"))", name, value));
         }
     }
 }

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

@@ -68,6 +68,7 @@ struct connection_string {
     bootstrap_mode default_mode{ connection_string::bootstrap_mode::gcccp };
     std::uint16_t default_port{ 11210 };
 
+    std::vector<std::string> warnings{};
     std::optional<std::string> error{};
 };
 

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

@@ -20,6 +20,8 @@
 #include <tao/json.hpp>
 #include <tao/json/contrib/traits.hpp>
 
+#include <gsl/span>
+
 namespace couchbase::core::utils::json
 {
 /**
@@ -102,7 +104,8 @@ class to_byte_vector
     void write(std::string_view data)
     {
         buffer_.reserve(buffer_.size() + data.size());
-        buffer_.insert(buffer_.end(), reinterpret_cast<const std::byte*>(&data[0]), reinterpret_cast<const std::byte*>(&data[data.size()]));
+        const auto* begin = reinterpret_cast<const std::byte*>(data.data());
+        buffer_.insert(buffer_.end(), begin, begin + data.size());
     }
 
     inline void escape(const std::string_view s)

data/ext/couchbase/couchbase/analytics_error_context.hxx

@@ -57,7 +57,7 @@ class analytics_error_context : public error_context
                             std::string http_body,
                             std::string hostname,
                             std::uint16_t port)
-      : error_context{ ec, std::move(last_dispatched_to), std::move(last_dispatched_from), retry_attempts, std::move(retry_reasons) }
+      : error_context{ {}, ec, std::move(last_dispatched_to), std::move(last_dispatched_from), retry_attempts, std::move(retry_reasons) }
       , first_error_code_{ first_error_code }
       , first_error_message_{ std::move(first_error_message) }
       , client_context_id_{ std::move(client_context_id) }

data/ext/couchbase/couchbase/behavior_options.hxx

@@ -54,18 +54,42 @@ class behavior_options
         return *this;
     }
 
+    auto dump_configuration(bool enable) -> behavior_options&
+    {
+        dump_configuration_ = enable;
+        return *this;
+    }
+
+    /**
+     * Selects network to use.
+     *
+     * @param name network name as it is exposed in the configuration.
+     * @return this object for chaining purposes.
+     *
+     * @see https://docs.couchbase.com/server/current/learn/clusters-and-availability/connectivity.html#alternate-addresses
+     * @see https://docs.couchbase.com/server/current/rest-api/rest-set-up-alternate-address.html
+     */
+    auto network(std::string name) -> behavior_options&
+    {
+        network_ = std::move(name);
+        return *this;
+    }
+
     struct built {
         std::string user_agent_extra;
         bool show_queries;
         bool enable_clustermap_notification;
         bool enable_mutation_tokens;
         bool enable_unordered_execution;
+        bool dump_configuration;
+        std::string network;
     };
 
     [[nodiscard]] auto build() const -> built
     {
         return {
-            user_agent_extra_, show_queries_, enable_clustermap_notification_, enable_mutation_tokens_, enable_unordered_execution_,
+            user_agent_extra_,   show_queries_, enable_clustermap_notification_, enable_mutation_tokens_, enable_unordered_execution_,
+            dump_configuration_, network_,
         };
     }
 
@@ -75,5 +99,7 @@ class behavior_options
     bool enable_clustermap_notification_{ false };
     bool enable_mutation_tokens_{ true };
     bool enable_unordered_execution_{ true };
+    bool dump_configuration_{ false };
+    std::string network_{ "auto" };
 };
 } // namespace couchbase

data/ext/couchbase/couchbase/boolean_field_query.hxx

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <couchbase/search_query.hxx>
+
+#include <optional>
+#include <string>
+
+namespace couchbase
+{
+/**
+ * Allow to match `true`/`false` in a field mapped as boolean.
+ *
+ * @since 1.0.0
+ * @committed
+ */
+class boolean_field_query : public search_query
+{
+  public:
+    /**
+     * Create a new boolean field query.
+     *
+     * @param value the input string to be matched against
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    explicit boolean_field_query(bool value)
+      : bool_{ value }
+    {
+    }
+
+    /**
+     * If a field is specified, only terms in that field will be matched.
+     *
+     * @param field_name name of the field to be matched
+     *
+     * @return this query for chaining purposes.
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    auto field(std::string field_name) -> boolean_field_query&
+    {
+        field_ = std::move(field_name);
+        return *this;
+    }
+
+    /**
+     * @return encoded representation of the query.
+     *
+     * @since 1.0.0
+     * @internal
+     */
+    [[nodiscard]] auto encode() const -> encoded_search_query override;
+
+  private:
+    bool bool_;
+    std::optional<std::string> field_{};
+};
+} // namespace couchbase