couchbase 4.2.6-dev.1 → 4.2.7

package/deps/couchbase-cxx-client/core/range_scan_orchestrator.cxx

@@ -412,13 +412,33 @@ class range_scan_orchestrator_impl
             return tl::unexpected(errc::common::invalid_argument);
         }
 
+        // Get the collection ID before starting any of the streams
+        {
+            auto barrier = std::make_shared<std::promise<tl::expected<get_collection_id_result, std::error_code>>>();
+            auto f = barrier->get_future();
+            get_collection_id_options const get_cid_options{ options_.retry_strategy, options_.timeout, options_.parent_span };
+            agent_.get_collection_id(scope_name_, collection_name_, get_cid_options, [barrier](auto result, auto ec) {
+                if (ec) {
+                    return barrier->set_value(tl::unexpected(ec));
+                }
+                barrier->set_value(result);
+            });
+            auto get_cid_res = f.get();
+            if (!get_cid_res.has_value()) {
+                return tl::unexpected(get_cid_res.error());
+            }
+            collection_id_ = get_cid_res->collection_id;
+        }
+
         auto batch_time_limit = std::chrono::duration_cast<std::chrono::milliseconds>(0.9 * options_.timeout);
         range_scan_continue_options const continue_options{
             options_.batch_item_limit, options_.batch_byte_limit, batch_time_limit, options_.timeout, options_.retry_strategy,
         };
         for (std::uint16_t vbucket = 0; vbucket < gsl::narrow_cast<std::uint16_t>(vbucket_map_.size()); ++vbucket) {
             const range_scan_create_options create_options{
-                scope_name_,       collection_name_,        scan_type_, options_.timeout, {}, vbucket_to_snapshot_requirements_[vbucket],
+                scope_name_,       {},
+                scan_type_,        options_.timeout,
+                collection_id_,    vbucket_to_snapshot_requirements_[vbucket],
                 options_.ids_only, options_.retry_strategy,
             };
 
@@ -653,6 +673,7 @@ class range_scan_orchestrator_impl
     topology::configuration::vbucket_map vbucket_map_;
     std::string scope_name_;
     std::string collection_name_;
+    std::uint32_t collection_id_;
     std::variant<std::monostate, range_scan, prefix_scan, sampling_scan> scan_type_;
     range_scan_orchestrator_options options_;
     std::map<std::size_t, std::optional<range_snapshot_requirements>> vbucket_to_snapshot_requirements_;

package/deps/couchbase-cxx-client/core/topology/capabilities.hxx

@@ -31,6 +31,8 @@ enum class bucket_capability {
     collections,
     durable_write,
     tombstoned_user_xattrs,
+    range_scan,
+    replica_read,
 };
 
 enum class cluster_capability {

package/deps/couchbase-cxx-client/core/topology/capabilities_fmt.hxx

@@ -67,6 +67,12 @@ struct fmt::formatter<couchbase::core::bucket_capability> {
             case couchbase::core::bucket_capability::tombstoned_user_xattrs:
                 name = "tombstoned_user_xattrs";
                 break;
+            case couchbase::core::bucket_capability::range_scan:
+                name = "range_scan";
+                break;
+            case couchbase::core::bucket_capability::replica_read:
+                name = "replica_read";
+                break;
         }
         return format_to(ctx.out(), "{}", name);
     }

package/deps/couchbase-cxx-client/core/topology/configuration.hxx

@@ -117,6 +117,11 @@ struct configuration {
         return cluster_capabilities.find(cluster_capability::n1ql_read_from_replica) != cluster_capabilities.end();
     }
 
+    [[nodiscard]] bool supports_range_scan() const
+    {
+        return bucket_capabilities.find(bucket_capability::range_scan) != bucket_capabilities.end();
+    }
+
     [[nodiscard]] bool ephemeral() const
     {
         // Use bucket capabilities to identify if couchapi is missing (then its ephemeral). If its null then
@@ -124,6 +129,11 @@ struct configuration {
         return bucket_capabilities.count(couchbase::core::bucket_capability::couchapi) == 0;
     }
 
+    [[nodiscard]] bool supports_subdoc_read_replica() const
+    {
+        return bucket_capabilities.find(bucket_capability::replica_read) != bucket_capabilities.end();
+    }
+
     [[nodiscard]] std::size_t index_for_this_node() const;
     [[nodiscard]] bool has_node(const std::string& network,
                                 service_type type,

package/deps/couchbase-cxx-client/core/topology/configuration_json.hxx

@@ -52,7 +52,6 @@ struct traits<couchbase::core::topology::configuration> {
                 }
                 if (const auto& hostname = o.find("hostname"); hostname != o.end()) {
                     n.hostname = hostname->second.get_string();
-                    n.hostname = n.hostname.substr(0, n.hostname.rfind(':'));
                 }
                 const auto& s = o.at("services");
                 n.services_plain.key_value = s.template optional<std::uint16_t>("kv");
@@ -233,6 +232,10 @@ struct traits<couchbase::core::topology::configuration> {
                     result.bucket_capabilities.insert(couchbase::core::bucket_capability::nodes_ext);
                 } else if (name == "xattr") {
                     result.bucket_capabilities.insert(couchbase::core::bucket_capability::xattr);
+                } else if (name == "rangeScan") {
+                    result.bucket_capabilities.insert(couchbase::core::bucket_capability::range_scan);
+                } else if (name == "subdoc.ReplicaRead") {
+                    result.bucket_capabilities.insert(couchbase::core::bucket_capability::replica_read);
                 }
             }
         }

package/deps/couchbase-cxx-client/couchbase/collection.hxx

@@ -28,6 +28,8 @@
 #include <couchbase/get_any_replica_options.hxx>
 #include <couchbase/get_options.hxx>
 #include <couchbase/insert_options.hxx>
+#include <couchbase/lookup_in_all_replicas_options.hxx>
+#include <couchbase/lookup_in_any_replica_options.hxx>
 #include <couchbase/lookup_in_options.hxx>
 #include <couchbase/lookup_in_specs.hxx>
 #include <couchbase/mutate_in_options.hxx>
@@ -856,6 +858,115 @@ class collection
         return future;
     }
 
+    /**
+     * Performs lookups to document fragments with default options from all replicas and the active node and returns the result as a vector.
+     *
+     * @tparam Handler type of the handler that implements @ref lookup_in_all_replicas_handler
+     *
+     * @param document_id the outer document ID
+     * @param specs an object that specifies the types of lookups to perform
+     * @param options custom options to modify the lookup options
+     * @param handler callable that implements @ref lookup_in_all_replicas_handler
+     *
+     * @exception errc::key_value::document_not_found the given document id is not found in the collection.
+     * @exception errc::common::ambiguous_timeout
+     * @exception errc::common::unambiguous_timeout
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    template<typename Handler>
+    void lookup_in_all_replicas(std::string document_id,
+                                lookup_in_specs specs,
+                                const lookup_in_all_replicas_options& options,
+                                Handler&& handler) const
+    {
+        return core::impl::initiate_lookup_in_all_replicas_operation(
+          core_, bucket_name_, scope_name_, name_, std::move(document_id), specs.specs(), options.build(), std::forward<Handler>(handler));
+    }
+
+    /**
+     * Performs lookups to document fragments with default options from all replicas and the active node and returns the result as a vector.
+     *
+     * @param document_id the outer document ID
+     * @param specs an object that specifies the types of lookups to perform
+     * @param options custom options to modify the lookup options
+     * @return future object that carries result of the operation
+     *
+     * @exception errc::key_value::document_not_found the given document id is not found in the collection.
+     * @exception errc::common::ambiguous_timeout
+     * @exception errc::common::unambiguous_timeout
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    [[nodiscard]] auto lookup_in_all_replicas(std::string document_id,
+                                              lookup_in_specs specs,
+                                              const lookup_in_all_replicas_options& options = {}) const
+      -> std::future<std::pair<subdocument_error_context, lookup_in_all_replicas_result>>
+    {
+        auto barrier = std::make_shared<std::promise<std::pair<subdocument_error_context, lookup_in_all_replicas_result>>>();
+        auto future = barrier->get_future();
+        lookup_in_all_replicas(std::move(document_id), std::move(specs), options, [barrier](auto ctx, auto result) {
+            barrier->set_value({ std::move(ctx), std::move(result) });
+        });
+        return future;
+    }
+
+    /**
+     * Performs lookups to document fragments with default options from all replicas and returns the first found.
+     *
+     * @tparam Handler type of the handler that implements @ref lookup_in_any_replica_handler
+     *
+     * @param document_id the outer document ID
+     * @param specs an object that specifies the types of lookups to perform
+     * @param options custom options to modify the lookup options
+     *
+     * @exception errc::key_value::document_not_found the given document id is not found in the collection.
+     * @exception errc::common::ambiguous_timeout
+     * @exception errc::common::unambiguous_timeout
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    template<typename Handler>
+    void lookup_in_any_replica(std::string document_id,
+                               lookup_in_specs specs,
+                               const lookup_in_any_replica_options& options,
+                               Handler&& handler) const
+    {
+        return core::impl::initiate_lookup_in_any_replica_operation(
+          core_, bucket_name_, scope_name_, name_, std::move(document_id), specs.specs(), options.build(), std::forward<Handler>(handler));
+    }
+
+    /**
+     * Performs lookups to document fragments with default options from all replicas and returns the first found.
+     *
+     * @param document_id the outer document ID
+     * @param specs an object that specifies the types of lookups to perform
+     * @param options custom options to modify the lookup options
+     * @return future object that carries result of the operation
+     *
+     * @exception errc::key_value::document_not_found the given document id is not found in the collection.
+     * @exception errc::common::ambiguous_timeout
+     * @exception errc::common::unambiguous_timeout
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    [[nodiscard]] auto lookup_in_any_replica(std::string document_id,
+                                             lookup_in_specs specs,
+                                             const lookup_in_any_replica_options& options = {}) const
+      -> std::future<std::pair<subdocument_error_context, lookup_in_replica_result>>
+    {
+        auto barrier = std::make_shared<std::promise<std::pair<subdocument_error_context, lookup_in_replica_result>>>();
+        auto future = barrier->get_future();
+        lookup_in_any_replica(std::move(document_id), std::move(specs), options, [barrier](auto ctx, auto result) {
+            barrier->set_value({ std::move(ctx), std::move(result) });
+        });
+        return future;
+    }
+
     /**
      * Gets a document for a given id and places a pessimistic lock on it for mutations
      *

package/deps/couchbase-cxx-client/couchbase/get_and_lock_options.hxx

@@ -86,8 +86,8 @@ initiate_get_and_lock_operation(std::shared_ptr<couchbase::core::cluster> core,
                                 std::string collection_name,
                                 std::string document_key,
                                 std::chrono::seconds lock_duration,
-                                get_and_lock_options::built options,
-                                get_and_lock_handler&& handler);
+                                couchbase::get_and_lock_options::built options,
+                                couchbase::get_and_lock_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

package/deps/couchbase-cxx-client/couchbase/get_and_touch_options.hxx

@@ -86,8 +86,8 @@ initiate_get_and_touch_operation(std::shared_ptr<couchbase::core::cluster> core,
                                  std::string collection_name,
                                  std::string document_key,
                                  std::uint32_t expiry,
-                                 get_and_touch_options::built options,
-                                 get_and_touch_handler&& handler);
+                                 couchbase::get_and_touch_options::built options,
+                                 couchbase::get_and_touch_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

package/deps/couchbase-cxx-client/couchbase/get_options.hxx

@@ -129,8 +129,8 @@ initiate_get_operation(std::shared_ptr<couchbase::core::cluster> core,
                        std::string scope_name,
                        std::string collection_name,
                        std::string document_key,
-                       get_options::built options,
-                       get_handler&& handler);
+                       couchbase::get_options::built options,
+                       couchbase::get_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

package/deps/couchbase-cxx-client/couchbase/insert_options.hxx

@@ -127,9 +127,9 @@ initiate_insert_operation(std::shared_ptr<couchbase::core::cluster> core,
                           std::string scope_name,
                           std::string collection_name,
                           std::string document_key,
-                          codec::encoded_value encoded,
-                          insert_options::built options,
-                          insert_handler&& handler);
+                          couchbase::codec::encoded_value encoded,
+                          couchbase::insert_options::built options,
+                          couchbase::insert_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

package/deps/couchbase-cxx-client/couchbase/lookup_in_all_replicas_options.hxx

@@ -0,0 +1,109 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <couchbase/subdoc/fwd/command_bundle.hxx>
+
+#include <core/impl/subdoc/command.hxx>
+#include <couchbase/codec/encoded_value.hxx>
+#include <couchbase/common_options.hxx>
+#include <couchbase/expiry.hxx>
+#include <couchbase/lookup_in_replica_result.hxx>
+#include <couchbase/store_semantics.hxx>
+#include <couchbase/subdocument_error_context.hxx>
+
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace couchbase
+{
+/**
+ * Options for @ref collection#lookup_in_all_replicas().
+ *
+ * @since 1.0.0
+ * @committed
+ */
+struct lookup_in_all_replicas_options : common_options<lookup_in_all_replicas_options> {
+    /**
+     * Immutable value object representing consistent options.
+     *
+     * @since 1.0.0
+     * @internal
+     */
+    struct built : public common_options<lookup_in_all_replicas_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() };
+    }
+};
+
+/**
+ * The result for the @ref collection#lookup_in_all_replicas() operation
+ *
+ * @since 1.0.0
+ * @uncommitted
+ */
+using lookup_in_all_replicas_result = std::vector<lookup_in_replica_result>;
+
+/**
+ * The signature for the handler of the @ref collection#lookup_in_all_replicas() operation
+ *
+ * @since 1.0.0
+ * @uncommitted
+ */
+using lookup_in_all_replicas_handler = std::function<void(couchbase::subdocument_error_context, lookup_in_all_replicas_result)>;
+
+#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
+namespace core
+{
+class cluster;
+namespace impl
+{
+
+/**
+ * @since 1.0.0
+ * @internal
+ */
+void
+initiate_lookup_in_all_replicas_operation(std::shared_ptr<couchbase::core::cluster> core,
+                                          const std::string& bucket_name,
+                                          const std::string& scope_name,
+                                          const std::string& collection_name,
+                                          std::string document_key,
+                                          const std::vector<couchbase::core::impl::subdoc::command>& specs,
+                                          lookup_in_all_replicas_options::built options,
+                                          lookup_in_all_replicas_handler&& handler);
+#endif
+} // namespace impl
+} // namespace core
+} // namespace couchbase

package/deps/couchbase-cxx-client/couchbase/lookup_in_any_replica_options.hxx

@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <couchbase/subdoc/fwd/command_bundle.hxx>
+
+#include <core/impl/subdoc/command.hxx>
+#include <couchbase/codec/encoded_value.hxx>
+#include <couchbase/common_options.hxx>
+#include <couchbase/expiry.hxx>
+#include <couchbase/lookup_in_replica_result.hxx>
+#include <couchbase/store_semantics.hxx>
+#include <couchbase/subdocument_error_context.hxx>
+
+#include <chrono>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <vector>
+
+namespace couchbase
+{
+/**
+ * Options for @ref collection#lookup_in_any_replica().
+ *
+ * @since 1.0.0
+ * @committed
+ */
+struct lookup_in_any_replica_options : common_options<lookup_in_any_replica_options> {
+    /**
+     * Immutable value object representing consistent options.
+     *
+     * @since 1.0.0
+     * @internal
+     */
+    struct built : public common_options<lookup_in_any_replica_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() };
+    }
+};
+
+/**
+ * The signature for the handler of the @ref collection#lookup_in_any_replica() operation
+ *
+ * @since 1.0.0
+ * @uncommitted
+ */
+using lookup_in_any_replica_handler = std::function<void(couchbase::subdocument_error_context, lookup_in_replica_result)>;
+
+#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
+namespace core
+{
+class cluster;
+namespace impl
+{
+
+/**
+ * @since 1.0.0
+ * @internal
+ */
+void
+initiate_lookup_in_any_replica_operation(std::shared_ptr<couchbase::core::cluster> core,
+                                         const std::string& bucket_name,
+                                         const std::string& scope_name,
+                                         const std::string& collection_name,
+                                         std::string document_key,
+                                         const std::vector<couchbase::core::impl::subdoc::command>& specs,
+                                         lookup_in_any_replica_options::built options,
+                                         lookup_in_any_replica_handler&& handler);
+#endif
+} // namespace impl
+} // namespace core
+} // namespace couchbase

package/deps/couchbase-cxx-client/couchbase/lookup_in_options.hxx

@@ -111,8 +111,8 @@ initiate_lookup_in_operation(std::shared_ptr<couchbase::core::cluster> core,
                              std::string collection_name,
                              std::string document_key,
                              const std::vector<couchbase::core::impl::subdoc::command>& specs,
-                             lookup_in_options::built options,
-                             lookup_in_handler&& handler);
+                             couchbase::lookup_in_options::built options,
+                             couchbase::lookup_in_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core

package/deps/couchbase-cxx-client/couchbase/lookup_in_replica_result.hxx

@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+#include <couchbase/lookup_in_result.hxx>
+
+#include <vector>
+
+namespace couchbase
+{
+
+/**
+ * Represents result of lookup_in_replica operations.
+ *
+ * @since 1.0.0
+ * @committed
+ */
+class lookup_in_replica_result : public lookup_in_result
+{
+  public:
+    /**
+     * @since 1.0.0
+     * @internal
+     */
+    lookup_in_replica_result() = default;
+
+    /**
+     * Constructs result for lookup_in_replica operation
+     *
+     * @param cas
+     * @param entries list of the fields returned by the server
+     * @param is_deleted
+     * @param is_replica true if document originates from replica node
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    lookup_in_replica_result(couchbase::cas cas, std::vector<entry> entries, bool is_deleted, bool is_replica)
+      : lookup_in_result{ cas, std::move(entries), is_deleted }
+      , is_replica_{ is_replica }
+    {
+    }
+
+    /**
+     * Returns whether this document originates from a replica node
+     *
+     * @return whether document originates from a replica node
+     *
+     * @since 1.0.0
+     */
+    [[nodiscard]] auto is_replica() const -> bool
+    {
+        return is_replica_;
+    }
+
+  private:
+    bool is_replica_{ false };
+};
+} // namespace couchbase

package/deps/couchbase-cxx-client/couchbase/lookup_in_result.hxx

@@ -44,6 +44,7 @@ class lookup_in_result : public result
         codec::binary value;
         std::size_t original_index;
         bool exists;
+        std::error_code ec;
     };
 
     /**
@@ -84,6 +85,11 @@ class lookup_in_result : public result
     {
         for (const entry& e : entries_) {
             if (e.original_index == index) {
+                if (e.ec) {
+                    throw std::system_error(
+                      e.ec, "error getting result for spec at index " + std::to_string(index) + ", path \"" + e.path + "\"");
+                }
+
                 return codec::tao_json_serializer::deserialize<Document>(e.value);
             }
         }
@@ -105,6 +111,10 @@ class lookup_in_result : public result
     {
         for (const entry& e : entries_) {
             if (e.path == path) {
+                if (e.ec) {
+                    throw std::system_error(e.ec, "error getting result for path \"" + e.path + "\"");
+                }
+
                 return codec::tao_json_serializer::deserialize<Document>(e.value);
             }
         }
@@ -127,6 +137,10 @@ class lookup_in_result : public result
         const auto& macro_string = subdoc::to_string(macro);
         for (const entry& e : entries_) {
             if (e.path == macro_string) {
+                if (e.ec) {
+                    throw std::system_error(e.ec, "error getting result for macro \"" + macro_string + "\"");
+                }
+
                 return codec::tao_json_serializer::deserialize<Document>(e.value);
             }
         }
@@ -147,6 +161,10 @@ class lookup_in_result : public result
     {
         for (const entry& e : entries_) {
             if (e.original_index == index) {
+                if (e.ec && e.ec != couchbase::errc::key_value::path_not_found) {
+                    throw std::system_error(e.ec, "error getting result for path \"" + e.path + "\"");
+                }
+
                 return e.exists;
             }
         }
@@ -167,6 +185,10 @@ class lookup_in_result : public result
         const auto& macro_string = subdoc::to_string(macro);
         for (const entry& e : entries_) {
             if (e.path == macro_string) {
+                if (e.ec && e.ec != couchbase::errc::key_value::path_not_found) {
+                    throw std::system_error(e.ec, "error getting result for macro \"" + macro_string + "\"");
+                }
+
                 return e.exists;
             }
         }
@@ -186,6 +208,10 @@ class lookup_in_result : public result
     {
         for (const entry& e : entries_) {
             if (e.path == path) {
+                if (e.ec && e.ec != couchbase::errc::key_value::path_not_found) {
+                    throw std::system_error(e.ec, "error getting result for path \"" + e.path + "\"");
+                }
+
                 return e.exists;
             }
         }

package/deps/couchbase-cxx-client/couchbase/mutate_in_options.hxx

@@ -225,8 +225,8 @@ initiate_mutate_in_operation(std::shared_ptr<couchbase::core::cluster> core,
                              std::string collection_name,
                              std::string document_key,
                              const std::vector<couchbase::core::impl::subdoc::command>& specs,
-                             mutate_in_options::built options,
-                             mutate_in_handler&& handler);
+                             couchbase::mutate_in_options::built options,
+                             couchbase::mutate_in_handler&& handler);
 #endif
 } // namespace impl
 } // namespace core