couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/cluster_options.hxx

@@ -22,6 +22,7 @@
 #include <couchbase/compression_options.hxx>
 #include <couchbase/configuration_profiles_registry.hxx>
 #include <couchbase/dns_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/metrics_options.hxx>
 #include <couchbase/network_options.hxx>
 #include <couchbase/password_authenticator.hxx>
@@ -37,269 +38,262 @@
 #include <system_error>
 #include <vector>
 
-#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace asio
-{
-class io_context;
-} // namespace asio
-#endif
-
 namespace couchbase
 {
 class cluster_options
 {
-  public:
-    /**
-     *
-     * @param username
-     * @param password
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    cluster_options(std::string username, std::string password)
-      : username_{ std::move(username) }
-      , password_{ std::move(password) }
-    {
-    }
+public:
+  /**
+   *
+   * @param username
+   * @param password
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  cluster_options(std::string username, std::string password)
+    : username_{ std::move(username) }
+    , password_{ std::move(password) }
+  {
+  }
 
-    /**
-     *
-     * @param authenticator
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    explicit cluster_options(password_authenticator authenticator)
-      : username_{ std::move(authenticator.username_) }
-      , password_{ std::move(authenticator.password_) }
-    {
-        if (authenticator.ldap_compatible_) {
-            sasl_mechanisms_ = { { "PLAIN" } };
-        }
+  /**
+   *
+   * @param authenticator
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  explicit cluster_options(password_authenticator authenticator)
+    : username_{ std::move(authenticator.username_) }
+    , password_{ std::move(authenticator.password_) }
+  {
+    if (authenticator.ldap_compatible_) {
+      sasl_mechanisms_ = { { "PLAIN" } };
     }
+  }
 
-    /**
-     *
-     * @param authenticator
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    explicit cluster_options(certificate_authenticator authenticator)
-      : certificate_path_{ std::move(authenticator.certificate_path_) }
-      , key_path_{ std::move(authenticator.key_path_) }
-    {
-    }
+  /**
+   *
+   * @param authenticator
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  explicit cluster_options(certificate_authenticator authenticator)
+    : certificate_path_{ std::move(authenticator.certificate_path_) }
+    , key_path_{ std::move(authenticator.key_path_) }
+  {
+  }
 
-    /**
-     * Apply settings profile by name.
-     *
-     * At the moment the only one profile is defined: "wan_development".
-     *
-     * @param profile_name  name of the registered profile
-     *
-     * @see configuration_profile_registry
-     * @see wan_development_configuration_profile
-     *
-     * @since 1.0.0
-     * @volatile
-     */
-    void apply_profile(const std::string& profile_name)
-    {
-        configuration_profiles_registry::apply_profile(profile_name, *this);
-    }
+  /**
+   * Apply settings profile by name.
+   *
+   * At the moment the only one profile is defined: "wan_development".
+   *
+   * @param profile_name  name of the registered profile
+   *
+   * @see configuration_profile_registry
+   * @see wan_development_configuration_profile
+   *
+   * @since 1.0.0
+   * @volatile
+   */
+  void apply_profile(const std::string& profile_name)
+  {
+    configuration_profiles_registry::apply_profile(profile_name, *this);
+  }
 
-    /**
-     * Returns compression options.
-     *
-     * @return compression options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto compression() -> compression_options&
-    {
-        return compression_;
-    }
+  /**
+   * Returns compression options.
+   *
+   * @return compression options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto compression() -> compression_options&
+  {
+    return compression_;
+  }
 
-    /**
-     * Returns various timeout options.
-     *
-     * @return timeout options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto timeouts() -> timeout_options&
-    {
-        return timeouts_;
-    }
+  /**
+   * Returns various timeout options.
+   *
+   * @return timeout options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto timeouts() -> timeout_options&
+  {
+    return timeouts_;
+  }
 
-    /**
-     * Returns options for DNS-SRV bootstrap.
-     *
-     * @return DNS options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto dns() -> dns_options&
-    {
-        return dns_;
-    }
+  /**
+   * Returns options for DNS-SRV bootstrap.
+   *
+   * @return DNS options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto dns() -> dns_options&
+  {
+    return dns_;
+  }
 
-    /**
-     * Returns security options (including TLS)
-     *
-     * @return security options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto security() -> security_options&
-    {
-        return security_;
-    }
+  /**
+   * Returns security options (including TLS)
+   *
+   * @return security options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto security() -> security_options&
+  {
+    return security_;
+  }
 
-    /**
-     * Returns network options
-     *
-     * @return network options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto network() -> network_options&
-    {
-        return network_;
-    }
+  /**
+   * Returns network options
+   *
+   * @return network options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto network() -> network_options&
+  {
+    return network_;
+  }
 
-    /**
-     * Returns metrics and observability options
-     *
-     * @return metrics options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto metrics() -> metrics_options&
-    {
-        return metrics_;
-    }
+  /**
+   * Returns metrics and observability options
+   *
+   * @return metrics options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto metrics() -> metrics_options&
+  {
+    return metrics_;
+  }
 
-    /**
-     * Returns tracing options
-     *
-     * @return tracing options
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto tracing() -> tracing_options&
-    {
-        return tracing_;
-    }
+  /**
+   * Returns tracing options
+   *
+   * @return tracing options
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto tracing() -> tracing_options&
+  {
+    return tracing_;
+  }
 
-    /**
-     * Returns misc options that affects cluster behavior.
-     *
-     * @return misc options.
-     *
-     * @since 1.0.0
-     * @volatile
-     */
-    [[nodiscard]] auto behavior() -> behavior_options&
-    {
-        return behavior_;
-    }
+  /**
+   * Returns misc options that affects cluster behavior.
+   *
+   * @return misc options.
+   *
+   * @since 1.0.0
+   * @volatile
+   */
+  [[nodiscard]] auto behavior() -> behavior_options&
+  {
+    return behavior_;
+  }
 
-    /**
-     * Returns the transactions options which effect the transactions behavior.
-     *
-     * @return  transactions configuration.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto transactions() -> transactions::transactions_config&
-    {
-        return transactions_;
-    }
+  /**
+   * Returns the transactions options which effect the transactions behavior.
+   *
+   * @return  transactions configuration.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto transactions() -> transactions::transactions_config&
+  {
+    return transactions_;
+  }
 
-    /**
-     * Override default retry strategy
-     *
-     * @return cluster options object for chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto default_retry_strategy(std::shared_ptr<retry_strategy> strategy) -> cluster_options&
-    {
-        if (strategy == nullptr) {
-            throw std::invalid_argument("retry strategy cannot be null");
-        }
-        default_retry_strategy_ = std::move(strategy);
-        return *this;
+  /**
+   * Override default retry strategy
+   *
+   * @return cluster options object for chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto default_retry_strategy(std::shared_ptr<retry_strategy> strategy) -> cluster_options&
+  {
+    if (strategy == nullptr) {
+      throw std::invalid_argument("retry strategy cannot be null");
     }
+    default_retry_strategy_ = std::move(strategy);
+    return *this;
+  }
 
-    struct built {
-        std::string username;
-        std::string password;
-        std::string certificate_path;
-        std::string key_path;
-        std::optional<std::vector<std::string>> allowed_sasl_mechanisms;
-        compression_options::built compression;
-        timeout_options::built timeouts;
-        dns_options::built dns;
-        security_options::built security;
-        network_options::built network;
-        metrics_options::built metrics;
-        tracing_options::built tracing;
-        behavior_options::built behavior;
-        transactions::transactions_config::built transactions;
-        std::shared_ptr<retry_strategy> default_retry_strategy;
-    };
+  struct built {
+    std::string username;
+    std::string password;
+    std::string certificate_path;
+    std::string key_path;
+    std::optional<std::vector<std::string>> allowed_sasl_mechanisms;
+    compression_options::built compression;
+    timeout_options::built timeouts;
+    dns_options::built dns;
+    security_options::built security;
+    network_options::built network;
+    metrics_options::built metrics;
+    tracing_options::built tracing;
+    behavior_options::built behavior;
+    transactions::transactions_config::built transactions;
+    std::shared_ptr<retry_strategy> default_retry_strategy;
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return {
-            username_,
-            password_,
-            certificate_path_,
-            key_path_,
-            sasl_mechanisms_,
-            compression_.build(),
-            timeouts_.build(),
-            dns_.build(),
-            security_.build(),
-            network_.build(),
-            metrics_.build(),
-            tracing_.build(),
-            behavior_.build(),
-            transactions_.build(),
-            default_retry_strategy_,
-        };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return {
+      username_,
+      password_,
+      certificate_path_,
+      key_path_,
+      sasl_mechanisms_,
+      compression_.build(),
+      timeouts_.build(),
+      dns_.build(),
+      security_.build(),
+      network_.build(),
+      metrics_.build(),
+      tracing_.build(),
+      behavior_.build(),
+      transactions_.build(),
+      default_retry_strategy_,
+    };
+  }
 
-  private:
-    std::string username_{};
-    std::string password_{};
-    std::string certificate_path_{};
-    std::string key_path_{};
-    std::optional<std::vector<std::string>> sasl_mechanisms_{};
+private:
+  std::string username_{};
+  std::string password_{};
+  std::string certificate_path_{};
+  std::string key_path_{};
+  std::optional<std::vector<std::string>> sasl_mechanisms_{};
 
-    compression_options compression_{};
-    timeout_options timeouts_{};
-    dns_options dns_{};
-    security_options security_{};
-    network_options network_{};
-    metrics_options metrics_{};
-    tracing_options tracing_{};
-    behavior_options behavior_{};
-    transactions::transactions_config transactions_{};
-    std::shared_ptr<retry_strategy> default_retry_strategy_{ nullptr };
+  compression_options compression_{};
+  timeout_options timeouts_{};
+  dns_options dns_{};
+  security_options security_{};
+  network_options network_{};
+  metrics_options metrics_{};
+  tracing_options tracing_{};
+  behavior_options behavior_{};
+  transactions::transactions_config transactions_{};
+  std::shared_ptr<retry_strategy> default_retry_strategy_{ nullptr };
 };
 
 #ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
@@ -312,5 +306,5 @@ class cluster;
  * @since 1.0.0
  * @uncommitted
  */
-using cluster_connect_handler = std::function<void(cluster, std::error_code)>;
+using cluster_connect_handler = std::function<void(error, cluster)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/codec/binary_noop_serializer.hxx

@@ -24,19 +24,19 @@ namespace couchbase::codec
 {
 class binary_noop_serializer
 {
-  public:
-    using document_type = binary;
+public:
+  using document_type = binary;
 
-    static auto serialize(binary document) -> binary
-    {
-        return document;
-    }
+  static auto serialize(binary document) -> binary
+  {
+    return document;
+  }
 
-    template<typename Document>
-    static auto deserialize(binary data) -> binary
-    {
-        return data;
-    }
+  template<typename Document>
+  static auto deserialize(binary data) -> binary
+  {
+    return data;
+  }
 };
 
 #ifndef COUCHBASE_CXX_CLIENT_DOXYGEN

data/ext/couchbase/couchbase/codec/codec_flags.hxx

@@ -41,11 +41,11 @@ namespace couchbase::codec::codec_flags
 constexpr std::uint32_t common_format_mask = 0x0F000000;
 
 enum class common_flags : std::uint32_t {
-    reserved = 0x00,
-    client_specific = 0x01, // called PRIVATE in RFC and other SDKs
-    json = 0x02,
-    binary = 0x03,
-    string = 0x04
+  reserved = 0x00,
+  client_specific = 0x01, // called PRIVATE in RFC and other SDKs
+  json = 0x02,
+  binary = 0x03,
+  string = 0x04
 };
 
 /**
@@ -54,10 +54,10 @@ enum class common_flags : std::uint32_t {
  * @param flags the flags to shift.
  * @return an integer having the common flags set.
  */
-constexpr std::uint32_t
-create_common_flags(common_flags flags)
+constexpr auto
+create_common_flags(common_flags flags) -> std::uint32_t
 {
-    return static_cast<std::uint32_t>(flags) << 24U;
+  return static_cast<std::uint32_t>(flags) << 24U;
 }
 
 /**
@@ -68,19 +68,19 @@ create_common_flags(common_flags flags)
  * @param flags the flags to check.
  * @return only the common flags simple representation (8 bits).
  */
-constexpr common_flags
-extract_common_flags(std::uint32_t flags)
+constexpr auto
+extract_common_flags(std::uint32_t flags) -> common_flags
 {
-    switch (auto value = static_cast<common_flags>(flags >> 24U)) {
-        case common_flags::client_specific:
-        case common_flags::json:
-        case common_flags::binary:
-        case common_flags::string:
-            return value;
-        default:
-            break;
-    }
-    return common_flags::reserved;
+  switch (auto value = static_cast<common_flags>(flags >> 24U)) {
+    case common_flags::client_specific:
+    case common_flags::json:
+    case common_flags::binary:
+    case common_flags::string:
+      return value;
+    default:
+      break;
+  }
+  return common_flags::reserved;
 }
 
 /**
@@ -92,50 +92,54 @@ extract_common_flags(std::uint32_t flags)
  * @param flags the flags to check.
  * @return true if set, false otherwise.
  */
-constexpr bool
-has_common_flags(std::uint32_t flags)
+constexpr auto
+has_common_flags(std::uint32_t flags) -> bool
 {
-    return extract_common_flags(flags) != common_flags::reserved;
+  return extract_common_flags(flags) != common_flags::reserved;
 }
 
 /**
- * Checks that flags has common flags bits set and that they correspond to expected common flags format.
+ * Checks that flags has common flags bits set and that they correspond to expected common flags
+ * format.
  *
  * @param flags the 32 bits flags to check
  * @param expected_common_flag the expected common flags format bits
  * @return true if common flags bits are set and correspond to expected_common_flag format
  */
-constexpr bool
-has_common_flags(std::uint32_t flags, std::uint32_t expected_common_flag)
+constexpr auto
+has_common_flags(std::uint32_t flags, std::uint32_t expected_common_flag) -> bool
 {
-    return has_common_flags(flags) && (flags & common_format_mask) == expected_common_flag;
+  return has_common_flags(flags) && (flags & common_format_mask) == expected_common_flag;
 }
 
 /**
- * Checks that flags has common flags bits set and that they correspond to expected common flags value.
+ * Checks that flags has common flags bits set and that they correspond to expected common flags
+ * value.
  *
  * @param flags the 32 bits flags to check
  * @param expected_common_flag the expected common flags enum value
  * @return true if common flags bits are set and correspond to expected_common_flag format
  */
-constexpr bool
-has_common_flags(std::uint32_t flags, common_flags expected_common_flag)
+constexpr auto
+has_common_flags(std::uint32_t flags, common_flags expected_common_flag) -> bool
 {
-    return has_common_flags(flags) && (flags & common_format_mask) == create_common_flags(expected_common_flag);
+  return has_common_flags(flags) &&
+         (flags & common_format_mask) == create_common_flags(expected_common_flag);
 }
 
 /**
  * Checks whether the upper 3 bits are set, indicating compression presence.
  *
- * It does this by shifting bits to the right until only the most significant bits are remaining and then checks if one of them is set.
+ * It does this by shifting bits to the right until only the most significant bits are remaining and
+ * then checks if one of them is set.
  *
  * @param flags the flags to check.
  * @return true if compression set, false otherwise.
  */
-constexpr bool
-has_compression_flags(std::uint32_t flags)
+constexpr auto
+has_compression_flags(std::uint32_t flags) -> bool
 {
-    return (flags >> 29U) > 0;
+  return (flags >> 29U) > 0;
 }
 
 constexpr std::uint32_t private_common_flags = create_common_flags(common_flags::client_specific);