couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/remove_options.hxx

@@ -19,8 +19,8 @@
 
 #include <couchbase/codec/encoded_value.hxx>
 #include <couchbase/common_durability_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/expiry.hxx>
-#include <couchbase/key_value_error_context.hxx>
 #include <couchbase/mutation_result.hxx>
 
 #include <chrono>
@@ -39,55 +39,59 @@ namespace couchbase
  * @committed
  */
 struct remove_options : public common_durability_options<remove_options> {
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_durability_options<remove_options>::built {
-        const couchbase::cas cas;
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_durability_options<remove_options>::built {
+    const couchbase::cas cas;
+  };
 
-    /**
-     * 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
-    {
-        auto base = build_common_durability_options();
-        return { base, cas_ };
-    }
+  /**
+   * 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
+  {
+    auto base = build_common_durability_options();
+    return { base, cas_ };
+  }
 
-    /**
-     * Specifies a CAS value that will be taken into account on the server side for optimistic concurrency.
-     *
-     * The CAS value is an opaque identifier which is associated with a specific state of the document on the server. The
-     * CAS value is received on read operations (or after mutations) and can be used during a subsequent mutation to
-     * make sure that the document has not been modified in the meantime.
-     *
-     * If document on the server has been modified in the meantime the SDK will raise a {@link errc::common::cas_mismatch}. In
-     * this case the caller is expected to re-do the whole "fetch-modify-update" cycle again. Please refer to the
-     * SDK documentation for more information on CAS mismatches and subsequent retries.
-     *
-     * @param cas the opaque CAS identifier to use for this operation.
-     * @return the {@link remove_options} for chaining purposes.
-     */
-    auto cas(couchbase::cas cas) -> remove_options&
-    {
+  /**
+   * Specifies a CAS value that will be taken into account on the server side for optimistic
+   * concurrency.
+   *
+   * The CAS value is an opaque identifier which is associated with a specific state of the document
+   * on the server. The CAS value is received on read operations (or after mutations) and can be
+   * used during a subsequent mutation to make sure that the document has not been modified in the
+   * meantime.
+   *
+   * If document on the server has been modified in the meantime the SDK will raise a {@link
+   * errc::common::cas_mismatch}. In this case the caller is expected to re-do the whole
+   * "fetch-modify-update" cycle again. Please refer to the SDK documentation for more information
+   * on CAS mismatches and subsequent retries.
+   *
+   * @param cas the opaque CAS identifier to use for this operation.
+   * @return the {@link remove_options} for chaining purposes.
+   */
+  auto cas(couchbase::cas cas) -> remove_options&
+  {
 
-        cas_ = cas;
-        return self();
-    }
+    cas_ = cas;
+    return self();
+  }
 
-  private:
-    couchbase::cas cas_{};
+private:
+  couchbase::cas cas_{};
 };
 
 /**
@@ -96,5 +100,5 @@ struct remove_options : public common_durability_options<remove_options> {
  * @since 1.0.0
  * @uncommitted
  */
-using remove_handler = std::function<void(couchbase::key_value_error_context, mutation_result)>;
+using remove_handler = std::function<void(error, mutation_result)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/replace_link_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,30 +26,31 @@ namespace couchbase
 {
 class replace_link_analytics_options : public common_options<replace_link_analytics_options>
 {
-  public:
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<replace_link_analytics_options>::built {
-    };
+public:
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<replace_link_analytics_options>::built {
+  };
 
-    /**
-     * 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() };
-    }
+  /**
+   * 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() };
+  }
 };
 
 /**
@@ -59,5 +59,5 @@ class replace_link_analytics_options : public common_options<replace_link_analyt
  * @since 1.0.0
  * @uncommitted
  */
-using replace_link_analytics_handler = std::function<void(couchbase::manager_error_context)>;
+using replace_link_analytics_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/replace_options.hxx

@@ -19,8 +19,8 @@
 
 #include <couchbase/codec/encoded_value.hxx>
 #include <couchbase/common_durability_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/expiry.hxx>
-#include <couchbase/key_value_error_context.hxx>
 #include <couchbase/mutation_result.hxx>
 
 #include <chrono>
@@ -39,115 +39,123 @@ namespace couchbase
  * @committed
  */
 struct replace_options : public common_durability_options<replace_options> {
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_durability_options<replace_options>::built {
-        const std::uint32_t expiry;
-        const bool preserve_expiry;
-        const couchbase::cas cas;
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_durability_options<replace_options>::built {
+    const std::uint32_t expiry;
+    const bool preserve_expiry;
+    const couchbase::cas cas;
+  };
 
-    /**
-     * 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
-    {
-        auto base = build_common_durability_options();
-        return { base, expiry_, preserve_expiry_, cas_ };
-    }
+  /**
+   * 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
+  {
+    auto base = build_common_durability_options();
+    return { base, expiry_, preserve_expiry_, cas_ };
+  }
 
-    /**
-     * Specifies whether an existing document's expiry should be preserved. Defaults to false.
-     *
-     * If true, and the document exists, its expiry will not be modified. Otherwise the document's expiry is determined by
-     * {@link #expiry(std::chrono::seconds)} or {@link #expiry(std::chrono::system_clock::time_point)}.
-     *
-     * Requires Couchbase Server 7.0 or later.
-     *
-     * @param preserve `true` to preserve expiry, `false` to set new expiry
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto preserve_expiry(bool preserve) -> replace_options&
-    {
-        preserve_expiry_ = preserve;
-        return self();
-    }
+  /**
+   * Specifies whether an existing document's expiry should be preserved. Defaults to false.
+   *
+   * If true, and the document exists, its expiry will not be modified. Otherwise the document's
+   * expiry is determined by
+   * {@link #expiry(std::chrono::seconds)} or {@link
+   * #expiry(std::chrono::system_clock::time_point)}.
+   *
+   * Requires Couchbase Server 7.0 or later.
+   *
+   * @param preserve `true` to preserve expiry, `false` to set new expiry
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto preserve_expiry(bool preserve) -> replace_options&
+  {
+    preserve_expiry_ = preserve;
+    return self();
+  }
 
-    /**
-     * Sets the expiry for the document. By default the document will never expire.
-     *
-     * The duration must be less than 50 years. For expiry further in the future, use
-     * {@link #expiry(std::chrono::system_clock::time_point)}.
-     *
-     * @param duration the duration after which the document will expire (zero duration means never expire).
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto expiry(std::chrono::seconds duration) -> replace_options&
-    {
-        expiry_ = core::impl::expiry_relative(duration);
-        return self();
-    }
+  /**
+   * Sets the expiry for the document. By default the document will never expire.
+   *
+   * The duration must be less than 50 years. For expiry further in the future, use
+   * {@link #expiry(std::chrono::system_clock::time_point)}.
+   *
+   * @param duration the duration after which the document will expire (zero duration means never
+   * expire).
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto expiry(std::chrono::seconds duration) -> replace_options&
+  {
+    expiry_ = core::impl::expiry_relative(duration);
+    return self();
+  }
 
-    /**
-     * Sets the expiry for the document. By default the document will never expire.
-     *
-     * @param time_point the point in time when the document will expire (epoch second zero means never expire).
-     * @return this options class for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto expiry(std::chrono::system_clock::time_point time_point) -> replace_options&
-    {
-        expiry_ = core::impl::expiry_absolute(time_point);
-        return self();
-    }
+  /**
+   * Sets the expiry for the document. By default the document will never expire.
+   *
+   * @param time_point the point in time when the document will expire (epoch second zero means
+   * never expire).
+   * @return this options class for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto expiry(std::chrono::system_clock::time_point time_point) -> replace_options&
+  {
+    expiry_ = core::impl::expiry_absolute(time_point);
+    return self();
+  }
 
-    /**
-     * Specifies a CAS value that will be taken into account on the server side for optimistic concurrency.
-     *
-     * The CAS value is an opaque identifier which is associated with a specific state of the document on the server. The
-     * CAS value is received on read operations (or after mutations) and can be used during a subsequent mutation to
-     * make sure that the document has not been modified in the meantime.
-     *
-     * If document on the server has been modified in the meantime the SDK will raise a {@link errc::common::cas_mismatch}. In
-     * this case the caller is expected to re-do the whole "fetch-modify-update" cycle again. Please refer to the
-     * SDK documentation for more information on CAS mismatches and subsequent retries.
-     *
-     * @param cas the opaque CAS identifier to use for this operation.
-     * @return the {@link replace_options} for chaining purposes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    auto cas(couchbase::cas cas) -> replace_options&
-    {
+  /**
+   * Specifies a CAS value that will be taken into account on the server side for optimistic
+   * concurrency.
+   *
+   * The CAS value is an opaque identifier which is associated with a specific state of the document
+   * on the server. The CAS value is received on read operations (or after mutations) and can be
+   * used during a subsequent mutation to make sure that the document has not been modified in the
+   * meantime.
+   *
+   * If document on the server has been modified in the meantime the SDK will raise a {@link
+   * errc::common::cas_mismatch}. In this case the caller is expected to re-do the whole
+   * "fetch-modify-update" cycle again. Please refer to the SDK documentation for more information
+   * on CAS mismatches and subsequent retries.
+   *
+   * @param cas the opaque CAS identifier to use for this operation.
+   * @return the {@link replace_options} for chaining purposes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  auto cas(couchbase::cas cas) -> replace_options&
+  {
 
-        cas_ = cas;
-        return self();
-    }
+    cas_ = cas;
+    return self();
+  }
 
-  private:
-    std::uint32_t expiry_{ 0 };
-    bool preserve_expiry_{ false };
-    couchbase::cas cas_{};
+private:
+  std::uint32_t expiry_{ 0 };
+  bool preserve_expiry_{ false };
+  couchbase::cas cas_{};
 };
 
 /**
@@ -156,5 +164,5 @@ struct replace_options : public common_durability_options<replace_options> {
  * @since 1.0.0
  * @uncommitted
  */
-using replace_handler = std::function<void(couchbase::key_value_error_context, mutation_result)>;
+using replace_handler = std::function<void(error, mutation_result)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/replicate_to.hxx

@@ -20,36 +20,36 @@
 namespace couchbase
 {
 enum class replicate_to {
-    /**
-     * Do not apply any replication requirements.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    none = 0,
+  /**
+   * Do not apply any replication requirements.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  none = 0,
 
-    /**
-     * Wait for replication to at least one node.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    one = 1,
+  /**
+   * Wait for replication to at least one node.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  one = 1,
 
-    /**
-     * Wait for replication to at least two nodes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    two = 2,
+  /**
+   * Wait for replication to at least two nodes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  two = 2,
 
-    /**
-     * Wait for replication to all three replica nodes.
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    three = 3,
+  /**
+   * Wait for replication to all three replica nodes.
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  three = 3,
 };
 } // namespace couchbase

data/ext/couchbase/couchbase/result.hxx

@@ -30,37 +30,37 @@ namespace couchbase
  */
 class result
 {
-  public:
-    /**
-     * @since 1.0.0
-     * @internal
-     */
-    result() = default;
+public:
+  /**
+   * @since 1.0.0
+   * @internal
+   */
+  result() = default;
 
-    /**
-     * @param cas
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    explicit result(couchbase::cas cas)
-      : cas_(cas)
-    {
-    }
+  /**
+   * @param cas
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  explicit result(couchbase::cas cas)
+    : cas_(cas)
+  {
+  }
 
-    /**
-     * @return
-     *
-     * @since 1.0.0
-     * @committed
-     */
-    [[nodiscard]] auto cas() const -> couchbase::cas
-    {
-        return cas_;
-    }
+  /**
+   * @return
+   *
+   * @since 1.0.0
+   * @committed
+   */
+  [[nodiscard]] auto cas() const -> couchbase::cas
+  {
+    return cas_;
+  }
 
-  private:
-    couchbase::cas cas_{ 0U };
+private:
+  couchbase::cas cas_{ 0U };
 };
 
 } // namespace couchbase

data/ext/couchbase/couchbase/resume_ingest_search_index_options.hxx

@@ -26,18 +26,19 @@
 
 namespace couchbase
 {
-struct resume_ingest_search_index_options : public common_options<resume_ingest_search_index_options> {
-  public:
-    struct built : public common_options<resume_ingest_search_index_options>::built {
-    };
+struct resume_ingest_search_index_options
+  : public common_options<resume_ingest_search_index_options> {
+public:
+  struct built : public common_options<resume_ingest_search_index_options>::built {
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 
-  private:
+private:
 };
 
-using resume_ingest_search_index_handler = std::function<void(couchbase::manager_error_context)>;
+using resume_ingest_search_index_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/retry_action.hxx

@@ -23,19 +23,19 @@ namespace couchbase
 {
 class retry_action
 {
-  public:
-    static auto do_not_retry() -> const retry_action&;
+public:
+  static auto do_not_retry() -> const retry_action&;
 
-    explicit retry_action(std::chrono::milliseconds waiting_duration);
+  explicit retry_action(std::chrono::milliseconds waiting_duration);
 
-    [[nodiscard]] auto need_to_retry() const -> bool;
+  [[nodiscard]] auto need_to_retry() const -> bool;
 
-    [[nodiscard]] auto duration() const -> std::chrono::milliseconds
-    {
-        return waiting_duration_;
-    }
+  [[nodiscard]] auto duration() const -> std::chrono::milliseconds
+  {
+    return waiting_duration_;
+  }
 
-  private:
-    std::chrono::milliseconds waiting_duration_;
+private:
+  std::chrono::milliseconds waiting_duration_;
 };
 } // namespace couchbase