couchbase 3.5.1 → 3.5.2

data/ext/couchbase/couchbase/transactions/transactions_query_config.hxx

@@ -24,41 +24,41 @@ namespace couchbase::transactions
  */
 class transactions_query_config
 {
-  public:
-    /**
-     * Set scan consistency for transactions.  @see query_options::scan_consistency for details.
-     *
-     * @param consistency the query_scan_consistency to use.
-     * @return reference to this, so calls can be chained.
-     */
-    transactions_query_config& scan_consistency(query_scan_consistency consistency)
-    {
-        scan_consistency_ = consistency;
-        return *this;
-    }
+public:
+  /**
+   * Set scan consistency for transactions.  @see query_options::scan_consistency for details.
+   *
+   * @param consistency the query_scan_consistency to use.
+   * @return reference to this, so calls can be chained.
+   */
+  auto scan_consistency(query_scan_consistency consistency) -> transactions_query_config&
+  {
+    scan_consistency_ = consistency;
+    return *this;
+  }
 
-    /**
-     * Get the scan consistency
-     *
-     * @return the query_scan_consistency
-     */
-    [[nodiscard]] query_scan_consistency scan_consistency() const
-    {
-        return scan_consistency_;
-    }
+  /**
+   * Get the scan consistency
+   *
+   * @return the query_scan_consistency
+   */
+  [[nodiscard]] auto scan_consistency() const -> query_scan_consistency
+  {
+    return scan_consistency_;
+  }
 
-    /** @private */
-    struct built {
-        query_scan_consistency scan_consistency;
-    };
+  /** @private */
+  struct built {
+    query_scan_consistency scan_consistency;
+  };
 
-    /** @private */
-    [[nodiscard]] auto build() const -> built
-    {
-        return { scan_consistency_ };
-    }
+  /** @private */
+  [[nodiscard]] auto build() const -> built
+  {
+    return { scan_consistency_ };
+  }
 
-  private:
-    query_scan_consistency scan_consistency_{ query_scan_consistency::request_plus };
+private:
+  query_scan_consistency scan_consistency_{ query_scan_consistency::request_plus };
 };
 } // namespace couchbase::transactions

data/ext/couchbase/couchbase/transactions.hxx

@@ -26,9 +26,9 @@
 
 namespace couchbase::transactions
 {
-using txn_logic = std::function<void(attempt_context&)>;
-using async_txn_logic = std::function<void(async_attempt_context&)>;
-using async_txn_complete_logic = std::function<void(couchbase::transaction_error_context, transaction_result)>;
+using txn_logic = std::function<error(std::shared_ptr<attempt_context>)>;
+using async_txn_logic = std::function<error(std::shared_ptr<async_attempt_context>)>;
+using async_txn_complete_logic = std::function<void(error, transaction_result)>;
 
 /**
  * The transactions object is used to initiate a transaction.
@@ -37,40 +37,59 @@ using async_txn_complete_logic = std::function<void(couchbase::transaction_error
  */
 class transactions
 {
-  public:
-    virtual ~transactions() = default;
+public:
+  virtual ~transactions() = default;
 
-    /**
-     * Run a blocking transaction.
-     *
-     * You can supply a lambda or function which uses a yielded {@link attempt_context} to perform a transaction, where each transaction
-     * operation is blocking.  A simple usage would be to get a document and replace the contents:
-     *
-     * @snippet{trimleft} test/test_transaction_examples.cxx simple-blocking-txn
-     *
-     * @param logic a lambda or function which uses the yielded {@link attempt_context} to perform the desired transactional operations.
-     * @param cfg if passed in, these options override the defaults, or those set in the {@link cluster_options}.
-     * @return an {@link transaction_error_context}, and a {@link transaction_result} representing the results of the transaction.
-     */
-    virtual std::pair<transaction_error_context, transaction_result> run(txn_logic&& logic,
-                                                                         const transaction_options& cfg = transaction_options()) = 0;
-    /**
-     * Run an asynchronous transaction.
-     *
-     * You can supply a lambda or function which uses a yielded {@link async_attempt_context} to perform a transaction, where each
-     * transaction operation is asynchronous.  A simple usage would be to get 3 document and replace the contents of each.   In the example
-     * below, we get the 3 documents in parallel, and update each when the get returns the document.   This can be significantly faster than
-     * getting each document in serial, and updating it using the blocking api:
-     *
-     * @snippet{trimleft} test/test_transaction_examples.cxx simple-async-txn
-     *
-     * @param logic a lambda or function which uses the yielded {@link async_attempt_context} to perform the desired transactional
-     * operations.
-     * @param complete_callback a lambda or function to which is yielded a {transaction_error_context} and {transaction_result}.
-     * @param cfg if passed in, these options override the defaults, or those set in the {@link cluster_options}.
-     */
-    virtual void run(async_txn_logic&& logic,
-                     async_txn_complete_logic&& complete_callback,
-                     const transaction_options& cfg = transaction_options()) = 0;
+  /**
+   * Run a blocking transaction.
+   *
+   * You can supply a lambda or function which uses a yielded {@link attempt_context} to perform a
+   * transaction, where each transaction operation is blocking.  A simple usage would be to get a
+   * document and replace the contents:
+   *
+   * @snippet{trimleft} test/test_transaction_examples.cxx simple-blocking-txn
+   *
+   * @param logic a lambda or function which uses the yielded {@link attempt_context} to perform the
+   * desired transactional operations.
+   * @param cfg if passed in, these options override the defaults, or those set in the {@link
+   * cluster_options}.
+   * @return an {@link error}, and a {@link transaction_result} representing the results of the
+   * transaction.
+   */
+  virtual auto run(txn_logic&& logic,
+                   const transaction_options& cfg) -> std::pair<error, transaction_result> = 0;
+
+  auto run(txn_logic&& logic) -> std::pair<error, transaction_result>
+  {
+    return run(std::move(logic), {});
+  }
+
+  /**
+   * Run an asynchronous transaction.
+   *
+   * You can supply a lambda or function which uses a yielded {@link async_attempt_context} to
+   * perform a transaction, where each transaction operation is asynchronous.  A simple usage would
+   * be to get 3 document and replace the contents of each.   In the example below, we get the 3
+   * documents in parallel, and update each when the get returns the document.   This can be
+   * significantly faster than getting each document in serial, and updating it using the blocking
+   * api:
+   *
+   * @snippet{trimleft} test/test_transaction_examples.cxx simple-async-txn
+   *
+   * @param logic a lambda or function which uses the yielded {@link async_attempt_context} to
+   * perform the desired transactional operations.
+   * @param complete_callback a lambda or function to which is yielded a {transaction_error_context}
+   * and {transaction_result}.
+   * @param cfg if passed in, these options override the defaults, or those set in the {@link
+   * cluster_options}.
+   */
+  virtual void run(async_txn_logic&& logic,
+                   async_txn_complete_logic&& complete_callback,
+                   const transaction_options& cfg) = 0;
+
+  void run(async_txn_logic&& logic, async_txn_complete_logic&& complete_callback)
+  {
+    return run(std::move(logic), std::move(complete_callback), {});
+  }
 };
 } // namespace couchbase::transactions

data/ext/couchbase/couchbase/unfreeze_plan_search_index_options.hxx

@@ -26,18 +26,19 @@
 
 namespace couchbase
 {
-struct unfreeze_plan_search_index_options : public common_options<unfreeze_plan_search_index_options> {
-  public:
-    struct built : public common_options<unfreeze_plan_search_index_options>::built {
-    };
+struct unfreeze_plan_search_index_options
+  : public common_options<unfreeze_plan_search_index_options> {
+public:
+  struct built : public common_options<unfreeze_plan_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 unfreeze_plan_search_index_handler = std::function<void(couchbase::manager_error_context)>;
+using unfreeze_plan_search_index_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/unlock_options.hxx

@@ -19,8 +19,8 @@
 
 #include <couchbase/codec/encoded_value.hxx>
 #include <couchbase/common_options.hxx>
+#include <couchbase/error.hxx>
 #include <couchbase/expiry.hxx>
-#include <couchbase/key_value_error_context.hxx>
 
 #include <chrono>
 #include <functional>
@@ -38,29 +38,30 @@ namespace couchbase
  * @committed
  */
 struct unlock_options : public common_options<unlock_options> {
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<unlock_options>::built {
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<unlock_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() };
+  }
 };
 
 /**
@@ -69,5 +70,5 @@ struct unlock_options : public common_options<unlock_options> {
  * @since 1.0.0
  * @uncommitted
  */
-using unlock_handler = std::function<void(couchbase::key_value_error_context)>;
+using unlock_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/update_bucket_options.hxx

@@ -25,17 +25,17 @@
 namespace couchbase
 {
 struct update_bucket_options : public common_options<update_bucket_options> {
-  public:
-    struct built : public common_options<update_bucket_options>::built {
-    };
+public:
+  struct built : public common_options<update_bucket_options>::built {
+  };
 
-    [[nodiscard]] auto build() const -> built
-    {
-        return { build_common_options() };
-    }
+  [[nodiscard]] auto build() const -> built
+  {
+    return { build_common_options() };
+  }
 
-  private:
+private:
 };
 
-using update_bucket_handler = std::function<void(couchbase::manager_error_context)>;
+using update_bucket_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/update_collection_options.hxx

@@ -18,7 +18,6 @@
 #pragma once
 
 #include <couchbase/common_options.hxx>
-#include <couchbase/manager_error_context.hxx>
 
 #include <cstdint>
 #include <memory>
@@ -27,47 +26,49 @@
 namespace couchbase
 {
 struct update_collection_options : public common_options<update_collection_options> {
-  public:
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_options<update_collection_options>::built {
-    };
+public:
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_options<update_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 that should be updated for the collection
  */
 struct update_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::optional<std::int32_t> max_expiry{};
+  /**
+   * 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.
-     */
-    std::optional<bool> history{};
+  /**
+   * Whether history retention should be enabled.
+   */
+  std::optional<bool> history{};
 };
 
-using update_collection_handler = std::function<void(couchbase::manager_error_context)>;
+using update_collection_handler = std::function<void(error)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/upsert_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,89 +39,94 @@ namespace couchbase
  * @committed
  */
 struct upsert_options : public common_durability_options<upsert_options> {
-    /**
-     * Immutable value object representing consistent options.
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    struct built : public common_durability_options<upsert_options>::built {
-        const std::uint32_t expiry;
-        const bool preserve_expiry;
-    };
+  /**
+   * Immutable value object representing consistent options.
+   *
+   * @since 1.0.0
+   * @internal
+   */
+  struct built : public common_durability_options<upsert_options>::built {
+    const std::uint32_t expiry;
+    const bool preserve_expiry;
+  };
 
-    /**
-     * 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_ };
-    }
+  /**
+   * 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_ };
+  }
 
-    /**
-     * 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) -> upsert_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) -> upsert_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) -> upsert_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) -> upsert_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) -> upsert_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) -> upsert_options&
+  {
+    expiry_ = core::impl::expiry_absolute(time_point);
+    return self();
+  }
 
-  private:
-    std::uint32_t expiry_{ 0 };
-    bool preserve_expiry_{ false };
+private:
+  std::uint32_t expiry_{ 0 };
+  bool preserve_expiry_{ false };
 };
 
 /**
@@ -130,5 +135,5 @@ struct upsert_options : public common_durability_options<upsert_options> {
  * @since 1.0.0
  * @uncommitted
  */
-using upsert_handler = std::function<void(couchbase::key_value_error_context, mutation_result)>;
+using upsert_handler = std::function<void(error, mutation_result)>;
 } // namespace couchbase

data/ext/couchbase/couchbase/upsert_search_index_options.hxx

@@ -25,17 +25,17 @@
 namespace couchbase
 {
 struct upsert_search_index_options : public common_options<upsert_search_index_options> {
-  public:
-    struct built : public common_options<upsert_search_index_options>::built {
-    };
+public:
+  struct built : public common_options<upsert_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 upsert_search_index_handler = std::function<void(couchbase::manager_error_context)>;
+using upsert_search_index_handler = std::function<void(error)>;
 } // namespace couchbase