couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/connect_link_analytics_options.hxx

@@ -18,8 +18,8 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 #include <optional>
@@ -29,81 +29,83 @@ namespace couchbase
 {
 class connect_link_analytics_options : public common_options<connect_link_analytics_options>
 {
-  public:
-    /**
-     * The name of the dataverse in which the link should be disconnected.
-     *
-     * defaults to `Default`
-     *
-     * @param dataverse_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto dataverse_name(std::string dataverse_name) -> connect_link_analytics_options&
-    {
-        dataverse_name_ = std::move(dataverse_name);
-        return self();
-    }
+public:
+  /**
+   * The name of the dataverse in which the link should be disconnected.
+   *
+   * defaults to `Default`
+   *
+   * @param dataverse_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto dataverse_name(std::string dataverse_name) -> connect_link_analytics_options&
+  {
+    dataverse_name_ = std::move(dataverse_name);
+    return self();
+  }
 
-    /**
-     * The name of the link
-     *
-     * defaults to `Local`
-     *
-     * @param link_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto link_name(std::string link_name) -> connect_link_analytics_options&
-    {
-        link_name_ = std::move(link_name);
-        return self();
-    }
+  /**
+   * The name of the link
+   *
+   * defaults to `Local`
+   *
+   * @param link_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto link_name(std::string link_name) -> connect_link_analytics_options&
+  {
+    link_name_ = std::move(link_name);
+    return self();
+  }
 
-    /**
-     * Whether to force link creation even if the bucket UUID changed, for example, due to the bucket being deleted and recreated.
-     */
-    auto force(bool force) -> connect_link_analytics_options&
-    {
-        force_ = force;
-        return self();
-    }
+  /**
+   * Whether to force link creation even if the bucket UUID changed, for example, due to the bucket
+   * being deleted and recreated.
+   */
+  auto force(bool force) -> connect_link_analytics_options&
+  {
+    force_ = force;
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<connect_link_analytics_options>::built {
-        std::optional<std::string> dataverse_name{};
-        std::optional<std::string> link_name{};
-        bool force{ false };
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<connect_link_analytics_options>::built {
+    std::optional<std::string> dataverse_name{};
+    std::optional<std::string> link_name{};
+    bool force{ false };
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), dataverse_name_, link_name_, force_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), dataverse_name_, link_name_, force_ };
+  }
 
-  private:
-    bool force_{ false };
-    std::optional<std::string> dataverse_name_{};
-    std::optional<std::string> link_name_{};
+private:
+  bool force_{ false };
+  std::optional<std::string> dataverse_name_{};
+  std::optional<std::string> link_name_{};
 };
 
 /**
@@ -112,5 +114,5 @@ class connect_link_analytics_options : public common_options<connect_link_analyt
  * @since 1.0.0
  * @uncommitted
  */
-using connect_link_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using connect_link_analytics_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/counter_result.hxx

@@ -33,41 +33,41 @@ namespace couchbase
  */
 class counter_result : public mutation_result
 {
-  public:
-    /**
-     * @since 1.0.0
-     * @internal
-     */
-    counter_result() = default;
+public:
+  /**
+   * @since 1.0.0
+   * @internal
+   */
+  counter_result() = default;
 
-    /**
-     * Constructs result for get_any_replica operation, or an entry for get_all_replicas operation.
-     *
-     * @param cas
-     * @param token counter token returned by the server
-     * @param content current value of the counter
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    counter_result(couchbase::cas cas, couchbase::mutation_token token, std::uint64_t content)
-      : mutation_result{ cas, std::move(token) }
-      , content_{ content }
-    {
-    }
+  /**
+   * Constructs result for get_any_replica operation, or an entry for get_all_replicas operation.
+   *
+   * @param cas
+   * @param token counter token returned by the server
+   * @param content current value of the counter
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  counter_result(couchbase::cas cas, couchbase::mutation_token token, std::uint64_t content)
+    : mutation_result{ cas, std::move(token) }
+    , content_{ content }
+  {
+  }
 
-    /**
-     * Current value of the counter.
-     *
-     * @return unsigned value of the counter
-     */
-    [[nodiscard]] auto content() const -> std::uint64_t
-    {
-        return content_;
-    }
+  /**
+   * Current value of the counter.
+   *
+   * @return unsigned value of the counter
+   */
+  [[nodiscard]] auto content() const -> std::uint64_t
+  {
+    return content_;
+  }
 
-  private:
-    std::uint64_t content_{};
+private:
+  std::uint64_t content_{};
 };
 
 } // namespace couchbase

data/ext/couchbase/couchbase/create_bucket_options.hxx

@@ -18,24 +18,23 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 
 namespace couchbase
 {
 struct create_bucket_options : public common_options<create_bucket_options> {
-  public:
-    struct built : public common_options<create_bucket_options>::built {
-    };
+public:
+  struct built : public common_options<create_bucket_options>::built {
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 
-  private:
+private:
 };
 
-using create_bucket_handler = std::function<void(couchbase::manager_error_context)>;
+using create_bucket_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_collection_options.hxx

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <cstdint>
 #include <functional>
@@ -27,47 +26,49 @@
 namespace couchbase
 {
 struct create_collection_options : public common_options<create_collection_options> {
-  public:
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_collection_options>::built {
-    };
+public:
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_collection_options>::built {
+  };
 
-    /**
-     * Validates the options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  /**
+   * Validates the options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 };
 
 /**
  * The settings to use when creating the collection
  */
 struct create_collection_settings {
-    /**
-     * The maximum expiry, in seconds, for documents in this collection. Values greater than or equal to -1 are valid.
-     * Value of 0 sets max_expiry to the bucket-level setting and value of -1 to set it as no-expiry.
-     */
-    std::int32_t max_expiry{ 0 };
+  /**
+   * The maximum expiry, in seconds, for documents in this collection. Values greater than or equal
+   * to -1 are valid. Value of 0 sets max_expiry to the bucket-level setting and value of -1 to set
+   * it as no-expiry.
+   */
+  std::optional<std::int32_t> max_expiry{};
 
-    /**
-     * Whether history retention should be enabled. If unset, the bucket-level setting is used.
-     */
-    std::optional<bool> history{};
+  /**
+   * Whether history retention should be enabled. If unset, the bucket-level setting is used.
+   */
+  std::optional<bool> history{};
 };
 
-using create_collection_handler = std::function<void(couchbase::manager_error_context)>;
+using create_collection_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_dataset_analytics_options.hxx

@@ -19,7 +19,6 @@
 
 #include <couchbase/common_options.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 #include <optional>
@@ -29,85 +28,86 @@ namespace couchbase
 {
 class create_dataset_analytics_options : public common_options<create_dataset_analytics_options>
 {
-  public:
-    /**
-     * Ignore error if the dataset already exists.
-     *
-     * defaults to `false`
-     *
-     * @param ignore_if_exists
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto ignore_if_exists(bool ignore_if_exists) -> create_dataset_analytics_options&
-    {
-        ignore_if_exists_ = ignore_if_exists;
-        return self();
-    }
+public:
+  /**
+   * Ignore error if the dataset already exists.
+   *
+   * defaults to `false`
+   *
+   * @param ignore_if_exists
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto ignore_if_exists(bool ignore_if_exists) -> create_dataset_analytics_options&
+  {
+    ignore_if_exists_ = ignore_if_exists;
+    return self();
+  }
 
-    /**
-     * WHERE clause to use for creating the dataset
-     *
-     * @param condition
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto condition(std::string condition) -> create_dataset_analytics_options&
-    {
-        condition_ = std::move(condition);
-        return self();
-    }
+  /**
+   * WHERE clause to use for creating the dataset
+   *
+   * @param condition
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto condition(std::string condition) -> create_dataset_analytics_options&
+  {
+    condition_ = std::move(condition);
+    return self();
+  }
 
-    /**
-     * The name of the dataverse the dataset should be created into
-     *
-     * @param dataverse_name
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto dataverse_name(std::string dataverse_name) -> create_dataset_analytics_options&
-    {
-        dataverse_name_ = std::move(dataverse_name);
-        return self();
-    }
+  /**
+   * The name of the dataverse the dataset should be created into
+   *
+   * @param dataverse_name
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto dataverse_name(std::string dataverse_name) -> create_dataset_analytics_options&
+  {
+    dataverse_name_ = std::move(dataverse_name);
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_dataset_analytics_options>::built {
-        bool ignore_if_exists{};
-        std::optional<std::string> condition{};
-        std::optional<std::string> dataverse_name{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_dataset_analytics_options>::built {
+    bool ignore_if_exists{};
+    std::optional<std::string> condition{};
+    std::optional<std::string> dataverse_name{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), ignore_if_exists_, condition_, dataverse_name_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), ignore_if_exists_, condition_, dataverse_name_ };
+  }
 
-  private:
-    bool ignore_if_exists_{ false };
-    std::optional<std::string> condition_{};
-    std::optional<std::string> dataverse_name_{};
+private:
+  bool ignore_if_exists_{ false };
+  std::optional<std::string> condition_{};
+  std::optional<std::string> dataverse_name_{};
 };
 
 /**
@@ -116,5 +116,5 @@ class create_dataset_analytics_options : public common_options<create_dataset_an
  * @since 1.0.0
  * @uncommitted
  */
-using create_dataset_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using create_dataset_analytics_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/create_dataverse_analytics_options.hxx

@@ -19,7 +19,6 @@
 
 #include <couchbase/common_options.hxx>
 #include <couchbase/error_codes.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <functional>
 
@@ -27,51 +26,52 @@ namespace couchbase
 {
 class create_dataverse_analytics_options : public common_options<create_dataverse_analytics_options>
 {
-  public:
-    /**
-     * Ignore error if the dataverse already exists.
-     *
-     * defaults to `false`
-     *
-     * @param ignore_if_exists
-     * @return reference to this object, for use in chaining
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto ignore_if_exists(bool ignore_if_exists) -> create_dataverse_analytics_options&
-    {
-        ignore_if_exists_ = ignore_if_exists;
-        return self();
-    }
+public:
+  /**
+   * Ignore error if the dataverse already exists.
+   *
+   * defaults to `false`
+   *
+   * @param ignore_if_exists
+   * @return reference to this object, for use in chaining
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto ignore_if_exists(bool ignore_if_exists) -> create_dataverse_analytics_options&
+  {
+    ignore_if_exists_ = ignore_if_exists;
+    return self();
+  }
 
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<create_dataverse_analytics_options>::built {
-        bool ignore_if_exists{};
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<create_dataverse_analytics_options>::built {
+    bool ignore_if_exists{};
+  };
 
-    /**
-     * Validates options and returns them as an immutable value.
-     *
-     * @return consistent options as an immutable value
-     *
-     * @exception std::system_error with code errc::common::invalid_argument if the options are not valid
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options(), ignore_if_exists_ };
-    }
+  /**
+   * Validates options and returns them as an immutable value.
+   *
+   * @return consistent options as an immutable value
+   *
+   * @exception std::system_error with code errc::common::invalid_argument if the options are not
+   * valid
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options(), ignore_if_exists_ };
+  }
 
-  private:
-    bool ignore_if_exists_{ false };
+private:
+  bool ignore_if_exists_{ false };
 };
 
 /**
@@ -81,5 +81,5 @@ class create_dataverse_analytics_options : public common_options<create_datavers
  * @uncommitted
  */
 
-using create_dataverse_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using create_dataverse_analytics_handler = std::function<void(error)>;
 } // namespace couchbase