couchbase 3.4.0 → 3.4.1

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

@@ -25,6 +25,7 @@ transaction_get_result::create_from(const core::operations::lookup_in_response&
     std::optional<std::string> atr_id;
     std::optional<std::string> transaction_id;
     std::optional<std::string> attempt_id;
+    std::optional<std::string> operation_id;
     std::optional<std::vector<std::byte>> staged_content;
     std::optional<std::string> atr_bucket_name;
     std::optional<std::string> atr_scope_name;
@@ -56,46 +57,49 @@ transaction_get_result::create_from(const core::operations::lookup_in_response&
         attempt_id = codec::tao_json_serializer::deserialize<std::string>(resp.fields[2].value);
     }
     if (resp.fields[3].status == key_value_status_code::success) {
-        staged_content = resp.fields[3].value;
+        operation_id = codec::tao_json_serializer::deserialize<std::string>(resp.fields[3].value);
     }
     if (resp.fields[4].status == key_value_status_code::success) {
-        atr_bucket_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[4].value);
+        staged_content = resp.fields[4].value;
     }
     if (resp.fields[5].status == key_value_status_code::success) {
-        atr_scope_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[5].value);
+        atr_bucket_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[5].value);
     }
     if (resp.fields[6].status == key_value_status_code::success) {
-        atr_collection_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[6].value);
+        atr_scope_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[6].value);
     }
-
     if (resp.fields[7].status == key_value_status_code::success) {
-        auto restore = core::utils::json::parse_binary(resp.fields[7].value);
+        atr_collection_name = codec::tao_json_serializer::deserialize<std::string>(resp.fields[7].value);
+    }
+
+    if (resp.fields[8].status == key_value_status_code::success) {
+        auto restore = core::utils::json::parse_binary(resp.fields[8].value);
         cas_pre_txn = restore["CAS"].as<std::string>();
         // only present in 6.5+
         revid_pre_txn = restore["revid"].as<std::string>();
         exptime_pre_txn = restore["exptime"].as<std::uint32_t>();
     }
-    if (resp.fields[8].status == key_value_status_code::success) {
-        op = codec::tao_json_serializer::deserialize<std::string>(resp.fields[8].value);
-    }
     if (resp.fields[9].status == key_value_status_code::success) {
-        auto doc = core::utils::json::parse_binary(resp.fields[9].value);
+        op = codec::tao_json_serializer::deserialize<std::string>(resp.fields[9].value);
+    }
+    if (resp.fields[10].status == key_value_status_code::success) {
+        auto doc = core::utils::json::parse_binary(resp.fields[10].value);
         cas_from_doc = doc["CAS"].as<std::string>();
         // only present in 6.5+
         revid_from_doc = doc["revid"].as<std::string>();
         exptime_from_doc = doc["exptime"].as<std::uint32_t>();
         crc32_from_doc = doc["value_crc32c"].as<std::string>();
     }
-    if (resp.fields[10].status == key_value_status_code::success) {
-        crc32_of_staging = codec::tao_json_serializer::deserialize<std::string>(resp.fields[10].value);
-    }
     if (resp.fields[11].status == key_value_status_code::success) {
-        forward_compat = core::utils::json::parse_binary(resp.fields[11].value);
+        crc32_of_staging = codec::tao_json_serializer::deserialize<std::string>(resp.fields[11].value);
+    }
+    if (resp.fields[12].status == key_value_status_code::success) {
+        forward_compat = core::utils::json::parse_binary(resp.fields[12].value);
     } else {
         forward_compat = tao::json::empty_object;
     }
-    if (resp.fields[12].status == key_value_status_code::success) {
-        content = resp.fields[12].value;
+    if (resp.fields[13].status == key_value_status_code::success) {
+        content = resp.fields[13].value;
     }
 
     transaction_links links(atr_id,
@@ -104,6 +108,7 @@ transaction_get_result::create_from(const core::operations::lookup_in_response&
                             atr_collection_name,
                             transaction_id,
                             attempt_id,
+                            operation_id,
                             staged_content,
                             cas_pre_txn,
                             revid_pre_txn,
@@ -126,6 +131,7 @@ transaction_get_result::create_from(const core::document_id& id, const result& r
     std::optional<std::string> atr_id;
     std::optional<std::string> transaction_id;
     std::optional<std::string> attempt_id;
+    std::optional<std::string> operation_id;
     std::optional<std::vector<std::byte>> staged_content;
     std::optional<std::string> atr_bucket_name;
     std::optional<std::string> atr_scope_name;
@@ -157,45 +163,48 @@ transaction_get_result::create_from(const core::document_id& id, const result& r
         attempt_id = res.values[2].content_as<std::string>();
     }
     if (res.values[3].has_value()) {
-        staged_content = res.values[3].raw_value;
+        operation_id = res.values[3].content_as<std::string>();
     }
     if (res.values[4].has_value()) {
-        atr_bucket_name = res.values[4].content_as<std::string>();
+        staged_content = res.values[4].raw_value;
     }
     if (res.values[5].has_value()) {
-        atr_scope_name = res.values[5].content_as<std::string>();
+        atr_bucket_name = res.values[5].content_as<std::string>();
     }
     if (res.values[6].has_value()) {
-        atr_collection_name = res.values[6].content_as<std::string>();
+        atr_scope_name = res.values[6].content_as<std::string>();
     }
     if (res.values[7].has_value()) {
-        auto restore = res.values[7].content_as();
+        atr_collection_name = res.values[7].content_as<std::string>();
+    }
+    if (res.values[8].has_value()) {
+        auto restore = res.values[8].content_as();
         cas_pre_txn = restore["CAS"].as<std::string>();
         // only present in 6.5+
         revid_pre_txn = restore["revid"].as<std::string>();
         exptime_pre_txn = restore["exptime"].as<std::uint32_t>();
     }
-    if (res.values[8].has_value()) {
-        op = res.values[8].content_as<std::string>();
-    }
     if (res.values[9].has_value()) {
-        auto doc = res.values[9].content_as();
+        op = res.values[9].content_as<std::string>();
+    }
+    if (res.values[10].has_value()) {
+        auto doc = res.values[10].content_as();
         cas_from_doc = doc["CAS"].as<std::string>();
         // only present in 6.5+
         revid_from_doc = doc["revid"].as<std::string>();
         exptime_from_doc = doc["exptime"].as<std::uint32_t>();
         crc32_from_doc = doc["value_crc32c"].as<std::string>();
     }
-    if (res.values[10].has_value()) {
-        crc32_of_staging = res.values[10].content_as<std::string>();
-    }
     if (res.values[11].has_value()) {
-        forward_compat = res.values[11].content_as();
+        crc32_of_staging = res.values[11].content_as<std::string>();
+    }
+    if (res.values[12].has_value()) {
+        forward_compat = res.values[12].content_as();
     } else {
         forward_compat = tao::json::empty_object;
     }
-    if (res.values[12].has_value()) {
-        content = res.values[12].raw_value;
+    if (res.values[13].has_value()) {
+        content = res.values[13].raw_value;
     }
 
     transaction_links links(atr_id,
@@ -204,6 +213,7 @@ transaction_get_result::create_from(const core::document_id& id, const result& r
                             atr_collection_name,
                             transaction_id,
                             attempt_id,
+                            operation_id,
                             staged_content,
                             cas_pre_txn,
                             revid_pre_txn,

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

@@ -77,16 +77,19 @@ class transaction_get_result
     {
     }
 
-    transaction_get_result(const couchbase::transactions::transaction_get_result& res)
+    explicit transaction_get_result(const couchbase::transactions::transaction_get_result& res)
       : cas_(res.cas())
       , document_id_(res.bucket(), res.scope(), res.collection(), res.key())
-      , content_(res.content())
+      , links_(res.base_->links())
+      , content_(std::move(res.content()))
+      , metadata_(res.base_->metadata_)
     {
     }
 
     couchbase::transactions::transaction_get_result to_public_result()
     {
-        return { document_id_.bucket(), document_id_.scope(), document_id_.collection(), document_id_.key(), cas_, std::move(content_) };
+        return couchbase::transactions::transaction_get_result(
+          std::make_shared<transaction_get_result>(document_id_, std::move(content_), cas_.value(), links_, metadata_));
     }
 
     transaction_get_result(core::document_id id, const tao::json::value& json)
@@ -126,6 +129,7 @@ class transaction_get_result
                                 document.links().atr_collection_name(),
                                 document.links().staged_transaction_id(),
                                 document.links().staged_attempt_id(),
+                                document.links().staged_operation_id(),
                                 document.links().staged_content(),
                                 document.links().cas_pre_txn(),
                                 document.links().revid_pre_txn(),

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

@@ -35,6 +35,7 @@ class transaction_links
     // id of the transaction that has staged content
     std::optional<std::string> staged_transaction_id_;
     std::optional<std::string> staged_attempt_id_;
+    std::optional<std::string> staged_operation_id_;
     std::optional<std::vector<std::byte>> staged_content_;
 
     // for {BACKUP_FIELDS}
@@ -54,6 +55,7 @@ class transaction_links
                       std::optional<std::string> atr_collection_name,
                       std::optional<std::string> staged_transaction_id,
                       std::optional<std::string> staged_attempt_id,
+                      std::optional<std::string> staged_operation_id,
                       std::optional<std::vector<std::byte>> staged_content,
                       std::optional<std::string> cas_pre_txn,
                       std::optional<std::string> revid_pre_txn,
@@ -68,6 +70,7 @@ class transaction_links
       , atr_collection_name_(std::move(atr_collection_name))
       , staged_transaction_id_(std::move(staged_transaction_id))
       , staged_attempt_id_(std::move(staged_attempt_id))
+      , staged_operation_id_(std::move(staged_operation_id))
       , staged_content_(std::move(staged_content))
       , cas_pre_txn_(std::move(cas_pre_txn))
       , revid_pre_txn_(std::move(revid_pre_txn))
@@ -111,6 +114,9 @@ class transaction_links
         if (staged_transaction_id_) {
             obj["txnMeta"]["txn"] = staged_transaction_id_.value();
         }
+        if (staged_operation_id_) {
+            obj["txnMeta"]["txn"] = staged_operation_id_.value();
+        }
         if (atr_id_) {
             obj["txnMeta"]["atr"]["key"] = atr_id_.value();
         }
@@ -181,6 +187,11 @@ class transaction_links
         return staged_attempt_id_;
     }
 
+    [[nodiscard]] std::optional<std::string> staged_operation_id() const
+    {
+        return staged_operation_id_;
+    }
+
     [[nodiscard]] std::optional<std::string> cas_pre_txn() const
     {
         return cas_pre_txn_;
@@ -241,12 +252,13 @@ struct fmt::formatter<couchbase::core::transactions::transaction_links> {
     constexpr auto format(const couchbase::core::transactions::transaction_links& r, FormatContext& ctx) const
     {
         return format_to(ctx.out(),
-                         "transaction_links:{{ atr: {}.{}.{}.{}, txn_id: {}, attempt_id: {}, crc32_of_staging: {} }}",
+                         "transaction_links:{{ atr: {}.{}.{}.{}, txn_id: {}, attempt_id: {}, operation_id: {}, crc32_of_staging: {} }}",
                          r.atr_bucket_name().value_or("none"),
                          r.atr_scope_name().value_or("none"),
                          r.atr_collection_name().value_or("none"),
                          r.atr_id().value_or("none"),
                          r.staged_attempt_id().value_or("none"),
+                         r.staged_operation_id().value_or("none"),
                          r.crc32_of_staging().value_or("none"));
     }
 };

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

@@ -119,6 +119,7 @@ class waitable_op_list
         // calling the callback).  So wait for that.
         CB_TXN_LOG_TRACE("set_query_mode: mode already query, waiting for node to be set...");
         cv_query_.wait(lock, [this]() { return !mode_.query_node.empty(); });
+        cv_in_flight_.wait(lock, [this]() { return 0 == in_flight_; });
         in_flight_++;
         CB_TXN_LOG_TRACE("set_query_mode: node set, continuing...");
         lock.unlock();

data/ext/couchbase/couchbase/cluster.hxx

@@ -59,7 +59,7 @@ class cluster
      * @param handler the handler that implements @ref cluster_connect_handler
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     template<typename Handler>
     static void connect(asio::io_context& io, const std::string& connection_string, const cluster_options& options, Handler&& handler)
@@ -77,7 +77,7 @@ class cluster
      * @return future object that carries cluster object and operation status
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] static auto connect(asio::io_context& io, const std::string& connection_string, const cluster_options& options)
       -> std::future<std::pair<cluster, std::error_code>>

data/ext/couchbase/couchbase/cluster_options.hxx

@@ -54,7 +54,7 @@ class cluster_options
      * @param password
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     cluster_options(std::string username, std::string password)
       : username_{ std::move(username) }
@@ -67,7 +67,7 @@ class cluster_options
      * @param authenticator
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     explicit cluster_options(password_authenticator authenticator)
       : username_{ std::move(authenticator.username_) }
@@ -83,7 +83,7 @@ class cluster_options
      * @param authenticator
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     explicit cluster_options(certificate_authenticator authenticator)
       : certificate_path_{ std::move(authenticator.certificate_path_) }
@@ -115,7 +115,7 @@ class cluster_options
      * @return compression options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto compression() -> compression_options&
     {
@@ -128,7 +128,7 @@ class cluster_options
      * @return timeout options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto timeouts() -> timeout_options&
     {
@@ -141,7 +141,7 @@ class cluster_options
      * @return DNS options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto dns() -> dns_options&
     {
@@ -154,7 +154,7 @@ class cluster_options
      * @return security options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto security() -> security_options&
     {
@@ -167,7 +167,7 @@ class cluster_options
      * @return network options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto network() -> network_options&
     {
@@ -180,7 +180,7 @@ class cluster_options
      * @return metrics options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto metrics() -> metrics_options&
     {
@@ -193,7 +193,7 @@ class cluster_options
      * @return tracing options
      *
      * @since 1.0.0
-     * @comitted
+     * @committed
      */
     [[nodiscard]] auto tracing() -> tracing_options&
     {

data/ext/couchbase/couchbase/collection.hxx

@@ -161,7 +161,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto get(std::string document_id, const get_options& options) const
+    [[nodiscard]] auto get(std::string document_id, const get_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_result>>>();
@@ -220,7 +220,9 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto get_and_touch(std::string document_id, std::chrono::seconds duration, const get_and_touch_options& options) const
+    [[nodiscard]] auto get_and_touch(std::string document_id,
+                                     std::chrono::seconds duration,
+                                     const get_and_touch_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_result>>>();
@@ -281,7 +283,7 @@ class collection
      */
     [[nodiscard]] auto get_and_touch(std::string document_id,
                                      std::chrono::system_clock::time_point time_point,
-                                     const get_and_touch_options& options) const
+                                     const get_and_touch_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_result>>>();
@@ -337,7 +339,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto touch(std::string document_id, std::chrono::seconds duration, const touch_options& options) const
+    [[nodiscard]] auto touch(std::string document_id, std::chrono::seconds duration, const touch_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, result>>>();
@@ -396,8 +398,9 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto touch(std::string document_id, std::chrono::system_clock::time_point time_point, const touch_options& options) const
-      -> std::future<std::pair<key_value_error_context, result>>
+    [[nodiscard]] auto touch(std::string document_id,
+                             std::chrono::system_clock::time_point time_point,
+                             const touch_options& options = {}) const -> std::future<std::pair<key_value_error_context, result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, result>>>();
         auto future = barrier->get_future();
@@ -450,7 +453,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto get_any_replica(std::string document_id, const get_any_replica_options& options) const
+    [[nodiscard]] auto get_any_replica(std::string document_id, const get_any_replica_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_replica_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_replica_result>>>();
@@ -502,7 +505,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto get_all_replicas(std::string document_id, const get_all_replicas_options& options) const
+    [[nodiscard]] auto get_all_replicas(std::string document_id, const get_all_replicas_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_all_replicas_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_all_replicas_result>>>();
@@ -562,7 +565,7 @@ class collection
      * @committed
      */
     template<typename Transcoder = codec::default_json_transcoder, typename Document>
-    [[nodiscard]] auto upsert(std::string document_id, const Document& document, const upsert_options& options) const
+    [[nodiscard]] auto upsert(std::string document_id, const Document& document, const upsert_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, mutation_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, mutation_result>>>();
@@ -624,7 +627,7 @@ class collection
      * @committed
      */
     template<typename Transcoder = codec::default_json_transcoder, typename Document>
-    [[nodiscard]] auto insert(std::string document_id, const Document& document, const insert_options& options) const
+    [[nodiscard]] auto insert(std::string document_id, const Document& document, const insert_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, mutation_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, mutation_result>>>();
@@ -688,7 +691,7 @@ class collection
      * @committed
      */
     template<typename Transcoder = codec::default_json_transcoder, typename Document>
-    [[nodiscard]] auto replace(std::string document_id, const Document& document, const replace_options& options) const
+    [[nodiscard]] auto replace(std::string document_id, const Document& document, const replace_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, mutation_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, mutation_result>>>();
@@ -738,7 +741,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto remove(std::string document_id, const remove_options& options) const
+    [[nodiscard]] auto remove(std::string document_id, const remove_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, mutation_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, mutation_result>>>();
@@ -792,7 +795,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto mutate_in(std::string document_id, mutate_in_specs specs, const mutate_in_options& options) const
+    [[nodiscard]] auto mutate_in(std::string document_id, mutate_in_specs specs, const mutate_in_options& options = {}) const
       -> std::future<std::pair<subdocument_error_context, mutate_in_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<subdocument_error_context, mutate_in_result>>>();
@@ -842,7 +845,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto lookup_in(std::string document_id, lookup_in_specs specs, const lookup_in_options& options) const
+    [[nodiscard]] auto lookup_in(std::string document_id, lookup_in_specs specs, const lookup_in_options& options = {}) const
       -> std::future<std::pair<subdocument_error_context, lookup_in_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<subdocument_error_context, lookup_in_result>>>();
@@ -887,7 +890,9 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto get_and_lock(std::string document_id, std::chrono::seconds lock_duration, const get_and_lock_options& options) const
+    [[nodiscard]] auto get_and_lock(std::string document_id,
+                                    std::chrono::seconds lock_duration,
+                                    const get_and_lock_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, get_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, get_result>>>();
@@ -939,7 +944,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto unlock(std::string document_id, couchbase::cas cas, const unlock_options& options) const
+    [[nodiscard]] auto unlock(std::string document_id, couchbase::cas cas, const unlock_options& options = {}) const
       -> std::future<key_value_error_context>
     {
         auto barrier = std::make_shared<std::promise<key_value_error_context>>();
@@ -983,7 +988,7 @@ class collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto exists(std::string document_id, const exists_options& options) const
+    [[nodiscard]] auto exists(std::string document_id, const exists_options& options = {}) const
       -> std::future<std::pair<key_value_error_context, exists_result>>
     {
         auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, exists_result>>>();

data/ext/couchbase/couchbase/collection_query_index_manager.hxx

@@ -61,7 +61,7 @@ class collection_query_index_manager
      * @since 1.0.0
      * @committed
      */
-    void get_all_indexes(const get_all_query_indexes_options& options, get_all_indexes_handler&& handler) const;
+    void get_all_indexes(const get_all_query_indexes_options& options, get_all_query_indexes_handler&& handler) const;
 
     [[nodiscard]] auto get_all_indexes(const get_all_query_indexes_options& options) const
       -> std::future<std::pair<manager_error_context, std::vector<couchbase::management::query::index>>>

data/ext/couchbase/couchbase/common_options.hxx

@@ -55,7 +55,7 @@ class common_options
     }
 
     /**
-     * Specifies a custom {@link retry_strategy} for this operation.
+     * Specifies a custom {@link couchbase::retry_strategy} for this operation.
      *
      * @param strategy the retry strategy to use for this operation.
      * @return this options builder for chaining purposes.

data/ext/couchbase/couchbase/configuration_profile.hxx

@@ -25,7 +25,7 @@ class cluster_options;
 /**
  * Base class for all defined configuration profiles
  *
- * Just implement the apply function, and register it.  See @ref configuration_profiles_registry#register()
+ * Just implement the apply function, and register it.  See @ref configuration_profiles_registry#register_profile()
  */
 class configuration_profile
 {

data/ext/couchbase/couchbase/configuration_profiles_registry.hxx

@@ -30,7 +30,6 @@ class cluster_options;
 /**
  *  Registry for defining configuration profiles.
  */
-
 class configuration_profiles_registry
 {
   public:

data/ext/couchbase/couchbase/create_primary_query_index_options.hxx

@@ -32,7 +32,7 @@ class create_primary_query_index_options : public common_options<create_primary_
     /**
      * Give the primary index a name
      *
-     * defaults to #primary
+     * defaults to `#primary`
      *
      * @param index_name
      * @return reference to this object, for use in chaining.

data/ext/couchbase/couchbase/drop_primary_query_index_options.hxx

@@ -46,7 +46,7 @@ class drop_primary_query_index_options : public common_options<drop_primary_quer
      *
      * The default is to not ignore the error.
      *
-     * @param ignore_if_exists  if true, we don't return an error if the index already exists
+     * @param ignore_if_not_exists  if true, we don't return an error if the index already exists
      * @return reference to this object, for use in chaining.
      *
      * @since 1.0.0

data/ext/couchbase/couchbase/drop_query_index_options.hxx

@@ -34,7 +34,7 @@ class drop_query_index_options : public common_options<drop_query_index_options>
      *
      * The default is to not ignore the error.
      *
-     * @param ignore_if_exists  if true, we don't return an error if the index already exists
+     * @param ignore_if_not_exists  if true, we don't return an error if the index already exists
      * @return reference to this object, for use in chaining.
      *
      * @since 1.0.0

data/ext/couchbase/couchbase/fmt/cas.hxx

@@ -21,6 +21,18 @@
 
 #include <fmt/core.h>
 
+#ifdef COUCHBASE_CXX_CLIENT_DOXYGEN
+namespace fmt
+{
+}
+#endif
+
+/**
+ * Helper for fmtlib to format @ref couchbase::cas objects.
+ *
+ * @since 1.0.0
+ * @committed
+ */
 template<>
 struct fmt::formatter<couchbase::cas> {
     template<typename ParseContext>

data/ext/couchbase/couchbase/fmt/durability_level.hxx

@@ -21,6 +21,12 @@
 
 #include <fmt/core.h>
 
+/**
+ * Helper for fmtlib to format @ref couchbase::durability_level objects.
+ *
+ * @since 1.0.0
+ * @committed
+ */
 template<>
 struct fmt::formatter<couchbase::durability_level> {
     template<typename ParseContext>

data/ext/couchbase/couchbase/fmt/key_value_extended_error_info.hxx

@@ -21,6 +21,12 @@
 
 #include <fmt/core.h>
 
+/**
+ * Helper for fmtlib to format @ref couchbase::key_value_extended_error_info objects.
+ *
+ * @since 1.0.0
+ * @committed
+ */
 template<>
 struct fmt::formatter<couchbase::key_value_extended_error_info> {
     template<typename ParseContext>

data/ext/couchbase/couchbase/fmt/key_value_status_code.hxx

@@ -21,6 +21,12 @@
 
 #include <fmt/core.h>
 
+/**
+ * Helper for fmtlib to format @ref couchbase::key_value_status_code objects.
+ *
+ * @since 1.0.0
+ * @committed
+ */
 template<>
 struct fmt::formatter<couchbase::key_value_status_code> {
     template<typename ParseContext>

data/ext/couchbase/couchbase/fmt/mutation_token.hxx

@@ -21,6 +21,12 @@
 
 #include <fmt/core.h>
 
+/**
+ * Helper for fmtlib to format @ref couchbase::mutation_token objects.
+ *
+ * @since 1.0.0
+ * @committed
+ */
 template<>
 struct fmt::formatter<couchbase::mutation_token> {
     template<typename ParseContext>