couchbase 3.5.1 → 3.5.2

data/ext/couchbase/core/transactions/attempt_context_testing_hooks.cxx

@@ -22,27 +22,32 @@ namespace couchbase::core::transactions
 namespace
 {
 inline void
-noop1(attempt_context*, utils::movable_function<void(std::optional<error_class>)>&& handler)
+noop1(std::shared_ptr<attempt_context> /* ctx */,
+      utils::movable_function<void(std::optional<error_class>)>&& handler)
 {
-    return handler({});
+  return handler({});
 }
 
 inline void
-noop2(attempt_context*, const std::string&, utils::movable_function<void(std::optional<error_class>)>&& handler)
+noop2(std::shared_ptr<attempt_context> /* ctx */,
+      const std::string& /* param */,
+      utils::movable_function<void(std::optional<error_class>)>&& handler)
 {
-    return handler({});
+  return handler({});
 }
 
-inline std::optional<const std::string>
-noop3(attempt_context*)
+inline auto
+noop3(std::shared_ptr<attempt_context> /* ctx */) -> std::optional<const std::string>
 {
-    return {};
+  return {};
 }
 
-inline bool
-noop4(attempt_context*, const std::string&, std::optional<const std::string>)
+inline auto
+noop4(std::shared_ptr<attempt_context> /* ctx */,
+      const std::string& /* param1 */,
+      std::optional<const std::string> /* param2 */) -> bool
 {
-    return false;
+  return false;
 }
 } // namespace
 

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

@@ -26,9 +26,13 @@ namespace couchbase::core::transactions
 {
 class attempt_context;
 
-using error_func1 = std::function<void(attempt_context*, core::utils::movable_function<void(std::optional<error_class>)>&&)>;
+using error_func1 =
+  std::function<void(std::shared_ptr<attempt_context>,
+                     core::utils::movable_function<void(std::optional<error_class>)>&&)>;
 using error_func2 =
-  std::function<void(attempt_context*, const std::string&, core::utils::movable_function<void(std::optional<error_class>)>&&)>;
+  std::function<void(std::shared_ptr<attempt_context>,
+                     const std::string&,
+                     core::utils::movable_function<void(std::optional<error_class>)>&&)>;
 
 static const std::string STAGE_ROLLBACK = "rollback";
 static const std::string STAGE_GET = "get";
@@ -62,59 +66,64 @@ static const std::string STAGE_QUERY_KV_REMOVE = "queryKvRemove";
 static const std::string STAGE_QUERY_KV_INSERT = "queryKvInsert";
 
 /**
- * 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.
+ * 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 attempt_context_testing_hooks {
-    error_func1 before_atr_commit;
-    error_func1 before_atr_commit_ambiguity_resolution;
-    error_func1 after_atr_commit;
-    error_func2 before_doc_committed;
-    error_func2 before_removing_doc_during_staged_insert;
-    error_func2 before_rollback_delete_inserted;
-    error_func2 after_doc_committed_before_saving_cas;
-    error_func2 after_doc_committed;
-    error_func2 before_staged_insert;
-    error_func2 before_staged_remove;
-    error_func2 before_staged_replace;
-    error_func2 before_doc_removed;
-    error_func2 before_doc_rolled_back;
-    error_func2 after_doc_removed_pre_retry;
-    error_func2 after_doc_removed_post_retry;
-    error_func2 after_get_complete;
-    error_func2 after_staged_replace_complete_before_cas_saved;
-    error_func2 after_staged_replace_complete;
-    error_func2 after_staged_remove_complete;
-    error_func2 after_staged_insert_complete;
-    error_func2 after_rollback_replace_or_remove;
-    error_func2 after_rollback_delete_inserted;
-    error_func2 before_check_atr_entry_for_blocking_doc;
-    error_func2 before_doc_get;
-    error_func2 before_get_doc_in_exists_during_staged_insert;
-    error_func2 before_query;
-    error_func2 after_query;
-    error_func2 before_remove_staged_insert;
-    error_func2 after_remove_staged_insert;
+  error_func1 before_atr_commit;
+  error_func1 before_atr_commit_ambiguity_resolution;
+  error_func1 after_atr_commit;
+  error_func2 before_doc_committed;
+  error_func2 before_removing_doc_during_staged_insert;
+  error_func2 before_rollback_delete_inserted;
+  error_func2 after_doc_committed_before_saving_cas;
+  error_func2 after_doc_committed;
+  error_func2 before_staged_insert;
+  error_func2 before_staged_remove;
+  error_func2 before_staged_replace;
+  error_func2 before_doc_removed;
+  error_func2 before_doc_rolled_back;
+  error_func2 after_doc_removed_pre_retry;
+  error_func2 after_doc_removed_post_retry;
+  error_func2 after_get_complete;
+  error_func2 after_staged_replace_complete_before_cas_saved;
+  error_func2 after_staged_replace_complete;
+  error_func2 after_staged_remove_complete;
+  error_func2 after_staged_insert_complete;
+  error_func2 after_rollback_replace_or_remove;
+  error_func2 after_rollback_delete_inserted;
+  error_func2 before_check_atr_entry_for_blocking_doc;
+  error_func2 before_doc_get;
+  error_func2 before_get_doc_in_exists_during_staged_insert;
+  error_func2 before_query;
+  error_func2 after_query;
+  error_func2 before_remove_staged_insert;
+  error_func2 after_remove_staged_insert;
 
-    error_func1 after_docs_committed;
-    error_func1 after_docs_removed;
-    error_func1 after_atr_pending;
-    error_func1 before_atr_pending;
-    error_func1 before_atr_complete;
-    error_func1 before_atr_rolled_back;
-    error_func1 after_atr_complete;
-    error_func1 before_get_atr_for_abort;
-    error_func1 before_atr_aborted;
-    error_func1 after_atr_aborted;
-    error_func1 after_atr_rolled_back;
+  error_func1 after_docs_committed;
+  error_func1 after_docs_removed;
+  error_func1 after_atr_pending;
+  error_func1 before_atr_pending;
+  error_func1 before_atr_complete;
+  error_func1 before_atr_rolled_back;
+  error_func1 after_atr_complete;
+  error_func1 before_get_atr_for_abort;
+  error_func1 before_atr_aborted;
+  error_func1 after_atr_aborted;
+  error_func1 after_atr_rolled_back;
 
-    std::function<std::optional<const std::string>(attempt_context*)> random_atr_id_for_vbucket;
+  std::function<std::optional<const std::string>(std::shared_ptr<attempt_context>)>
+    random_atr_id_for_vbucket;
 
-    std::function<bool(attempt_context*, const std::string&, std::optional<const std::string>)> has_expired_client_side;
+  std::function<
+    bool(std::shared_ptr<attempt_context>, const std::string&, std::optional<const std::string>)>
+    has_expired_client_side;
 
-    attempt_context_testing_hooks();
+  attempt_context_testing_hooks();
 
-    // needed for unique_ptr<attempt_context_testing_hooks> in transaction_config, with a forward declaration.
-    ~attempt_context_testing_hooks() = default;
+  // needed for unique_ptr<attempt_context_testing_hooks> in transaction_config, with a forward
+  // declaration.
+  ~attempt_context_testing_hooks() = default;
 };
 } // namespace couchbase::core::transactions

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

@@ -24,89 +24,89 @@ namespace couchbase::core::transactions
  * The possible states for a transaction attempt.
  */
 enum class attempt_state {
-    /**
-     * The attempt finished very early.
-     */
-    NOT_STARTED = 0,
+  /**
+   * The attempt finished very early.
+   */
+  NOT_STARTED = 0,
 
-    /**
-     * Any call to one of the mutation methods - <code>insert</code>, <code>replace</code>, <code>remove</code> - will update the
-     * state to PENDING.
-     */
-    PENDING,
+  /**
+   * Any call to one of the mutation methods - <code>insert</code>, <code>replace</code>,
+   * <code>remove</code> - will update the state to PENDING.
+   */
+  PENDING,
 
-    /**
-     * Set once the Active Transaction Record entry for this transaction has been updated to mark the transaction as
-     * Aborted.
-     */
-    ABORTED,
+  /**
+   * Set once the Active Transaction Record entry for this transaction has been updated to mark the
+   * transaction as Aborted.
+   */
+  ABORTED,
 
-    /**
-     * Set once the Active Transaction Record entry for this transaction has been updated to mark the transaction as
-     * Committed.
-     */
-    COMMITTED,
+  /**
+   * Set once the Active Transaction Record entry for this transaction has been updated to mark the
+   * transaction as Committed.
+   */
+  COMMITTED,
 
-    /**
-     * Set once the commit is fully completed.
-     */
-    COMPLETED,
+  /**
+   * Set once the commit is fully completed.
+   */
+  COMPLETED,
 
-    /**
-     * Set once the commit is fully rolled back.
-     */
-    ROLLED_BACK,
+  /**
+   * Set once the commit is fully rolled back.
+   */
+  ROLLED_BACK,
 
-    /**
-     * A state this client doesn't recognise.
-     */
-    UNKNOWN
+  /**
+   * A state this client doesn't recognise.
+   */
+  UNKNOWN
 };
 
-inline const char*
-attempt_state_name(attempt_state state)
+inline auto
+attempt_state_name(attempt_state state) -> const char*
 {
-    switch (state) {
-        case attempt_state::NOT_STARTED:
-            return "NOT_STARTED";
-        case attempt_state::PENDING:
-            return "PENDING";
-        case attempt_state::ABORTED:
-            return "ABORTED";
-        case attempt_state::COMMITTED:
-            return "COMMITTED";
-        case attempt_state::COMPLETED:
-            return "COMPLETED";
-        case attempt_state::ROLLED_BACK:
-            return "ROLLED_BACK";
-        case attempt_state::UNKNOWN:
-            return "UNKNOWN";
-        default:
-            throw std::runtime_error("unknown attempt state");
-    }
+  switch (state) {
+    case attempt_state::NOT_STARTED:
+      return "NOT_STARTED";
+    case attempt_state::PENDING:
+      return "PENDING";
+    case attempt_state::ABORTED:
+      return "ABORTED";
+    case attempt_state::COMMITTED:
+      return "COMMITTED";
+    case attempt_state::COMPLETED:
+      return "COMPLETED";
+    case attempt_state::ROLLED_BACK:
+      return "ROLLED_BACK";
+    case attempt_state::UNKNOWN:
+      return "UNKNOWN";
+    default:
+      throw std::runtime_error("unknown attempt state");
+  }
 }
 
-inline attempt_state
-attempt_state_value(const std::string& str)
+inline auto
+attempt_state_value(const std::string& str) -> attempt_state
 {
-    if (str == "NOT_STARTED") {
-        return attempt_state::NOT_STARTED;
-    }
-    if (str == "PENDING") {
-        return attempt_state::PENDING;
-    }
-    if (str == "ABORTED") {
-        return attempt_state::ABORTED;
-    }
-    if (str == "COMMITTED") {
-        return attempt_state::COMMITTED;
-    }
-    if (str == "COMPLETED") {
-        return attempt_state::COMPLETED;
-    }
-    if (str == "ROLLED_BACK") {
-        return attempt_state::ROLLED_BACK;
-    }
-    return attempt_state::UNKNOWN;
+  if (str == "NOT_STARTED") {
+    return attempt_state::NOT_STARTED;
+  }
+  if (str == "PENDING") {
+    return attempt_state::PENDING;
+  }
+  if (str == "ABORTED") {
+    return attempt_state::ABORTED;
+  }
+  if (str == "COMMITTED") {
+    return attempt_state::COMMITTED;
+  }
+  if (str == "COMPLETED") {
+    return attempt_state::COMPLETED;
+  }
+  if (str == "ROLLED_BACK") {
+    return attempt_state::ROLLED_BACK;
+  }
+  return attempt_state::UNKNOWN;
 }
 } // namespace couchbase::core::transactions

data/ext/couchbase/core/transactions/binary.cxx

@@ -18,9 +18,9 @@
 
 namespace couchbase::core::transactions
 {
-std::string
-to_string(const std::vector<std::byte>& input)
+auto
+to_string(const std::vector<std::byte>& input) -> std::string
 {
-    return std::string(reinterpret_cast<const char*>(input.data()), input.size());
+  return std::string(reinterpret_cast<const char*>(input.data()), input.size());
 }
 } // namespace couchbase::core::transactions

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

@@ -23,13 +23,13 @@ namespace
 inline void
 noop1(const std::string&, utils::movable_function<void(std::optional<error_class>)>&& handler)
 {
-    return handler({});
+  return handler({});
 }
 
 inline void
 noop2(utils::movable_function<void(std::optional<error_class>)>&& handler)
 {
-    return handler({});
+  return handler({});
 }
 } // namespace
 

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

@@ -24,33 +24,37 @@
 
 namespace couchbase::core::transactions
 {
-using error_func3 = std::function<void(const std::string&, core::utils::movable_function<void(std::optional<error_class>)>&&)>;
-using error_func4 = std::function<void(core::utils::movable_function<void(std::optional<error_class>)>&&)>;
+using error_func3 =
+  std::function<void(const std::string&,
+                     core::utils::movable_function<void(std::optional<error_class>)>&&)>;
+using error_func4 =
+  std::function<void(core::utils::movable_function<void(std::optional<error_class>)>&&)>;
 
 /**
- * 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.
+ * 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;
-    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;
-
-    error_func4 on_cleanup_docs_completed;
-    error_func4 on_cleanup_completed;
-
-    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() = default;
+  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;
+
+  error_func4 on_cleanup_docs_completed;
+  error_func4 on_cleanup_completed;
+
+  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() = default;
 };
 } // namespace couchbase::core::transactions

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

@@ -28,79 +28,79 @@ namespace couchbase::core::transactions
  */
 class document_metadata
 {
-  public:
-    /**
-     *  @internal
-     *  @brief Create document metadata, given results of a kv operation
-     *
-     *  We expect this constructor to become private soon.
-     */
-    document_metadata(std::optional<std::string> cas,
-                      std::optional<std::string> revid,
-                      std::optional<std::uint32_t> exptime,
-                      std::optional<std::string> crc32)
-      : cas_(std::move(cas))
-      , revid_(std::move(revid))
-      , exptime_(exptime)
-      , crc32_(std::move(crc32))
-    {
-    }
+public:
+  /**
+   *  @internal
+   *  @brief Create document metadata, given results of a kv operation
+   *
+   *  We expect this constructor to become private soon.
+   */
+  document_metadata(std::optional<std::string> cas,
+                    std::optional<std::string> revid,
+                    std::optional<std::uint32_t> exptime,
+                    std::optional<std::string> crc32)
+    : cas_(std::move(cas))
+    , revid_(std::move(revid))
+    , exptime_(exptime)
+    , crc32_(std::move(crc32))
+  {
+  }
 
-    /** @internal
-     * @brief Create document metadata, used in responses from query server.
-     *
-     * @param cas string representation of document cas.
-     */
-    explicit document_metadata(std::string cas)
-      : cas_(std::move(cas))
-    {
-    }
+  /** @internal
+   * @brief Create document metadata, used in responses from query server.
+   *
+   * @param cas string representation of document cas.
+   */
+  explicit document_metadata(std::string cas)
+    : cas_(std::move(cas))
+  {
+  }
 
-    /**
-     * @brief Get CAS for the document
-     *
-     * @return the CAS of the document, as a string.
-     */
-    [[nodiscard]] std::optional<std::string> cas() const
-    {
-        return cas_;
-    }
+  /**
+   * @brief Get CAS for the document
+   *
+   * @return the CAS of the document, as a string.
+   */
+  [[nodiscard]] auto cas() const -> std::optional<std::string>
+  {
+    return cas_;
+  }
 
-    /**
-     * @brief Get revid for the document
-     *
-     * @return the revid of the document, as a string.
-     */
-    [[nodiscard]] std::optional<std::string> revid() const
-    {
-        return revid_;
-    }
+  /**
+   * @brief Get revid for the document
+   *
+   * @return the revid of the document, as a string.
+   */
+  [[nodiscard]] auto revid() const -> std::optional<std::string>
+  {
+    return revid_;
+  }
 
-    /**
-     * @brief Get the expiry of the document, if set
-     *
-     * @return the expiry of the document, if one was set, and the request
-     *         specified it.
-     */
-    [[nodiscard]] std::optional<std::uint32_t> exptime() const
-    {
-        return exptime_;
-    }
+  /**
+   * @brief Get the expiry of the document, if set
+   *
+   * @return the expiry of the document, if one was set, and the request
+   *         specified it.
+   */
+  [[nodiscard]] auto exptime() const -> std::optional<std::uint32_t>
+  {
+    return exptime_;
+  }
 
-    /**
-     * @brief Get the crc for the document
-     *
-     * @return the crc-32 for the document, as a string
-     */
-    [[nodiscard]] std::optional<std::string> crc32() const
-    {
-        return crc32_;
-    }
+  /**
+   * @brief Get the crc for the document
+   *
+   * @return the crc-32 for the document, as a string
+   */
+  [[nodiscard]] auto crc32() const -> std::optional<std::string>
+  {
+    return crc32_;
+  }
 
-  private:
-    const std::optional<std::string> cas_;
-    const std::optional<std::string> revid_;
-    const std::optional<std::uint32_t> exptime_;
-    const std::optional<std::string> crc32_;
+private:
+  const std::optional<std::string> cas_;
+  const std::optional<std::string> revid_;
+  const std::optional<std::uint32_t> exptime_;
+  const std::optional<std::string> crc32_;
 };
 } // namespace couchbase::core::transactions