couchbase 4.2.8-dev.1 → 4.2.9

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

@@ -25,17 +25,17 @@
 #include <future>
 #include <memory>
 
+namespace couchbase
+{
+class collection;
 #ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace couchbase::core
+namespace core
 {
 class cluster;
-} // namespace couchbase::core
+} // namespace core
+class binary_collection_impl;
 #endif
 
-namespace couchbase
-{
-class collection;
-
 /**
  * Allows to perform certain operations on non-JSON documents.
  *
@@ -53,10 +53,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto bucket_name() const noexcept -> const std::string&
-    {
-        return bucket_name_;
-    }
+    [[nodiscard]] auto bucket_name() const -> const std::string&;
 
     /**
      * Returns name of the scope where the collection is defined.
@@ -66,10 +63,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto scope_name() const noexcept -> const std::string&
-    {
-        return scope_name_;
-    }
+    [[nodiscard]] auto scope_name() const -> const std::string&;
 
     /**
      * Returns name of the collection.
@@ -79,16 +73,11 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto name() const noexcept -> const std::string&
-    {
-        return name_;
-    }
+    [[nodiscard]] auto name() const -> const std::string&;
 
     /**
      * Appends binary content to the document.
      *
-     * @tparam Handler type of the handler that implements @ref append_handler
-     *
      * @param document_id the document id which is used to uniquely identify it.
      * @param data the document content to append.
      * @param options custom options to customize the append behavior.
@@ -102,18 +91,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    void append(std::string document_id, std::vector<std::byte> data, const append_options& options, Handler&& handler) const
-    {
-        return core::impl::initiate_append_operation(core_,
-                                                     bucket_name_,
-                                                     scope_name_,
-                                                     name_,
-                                                     std::move(document_id),
-                                                     std::move(data),
-                                                     options.build(),
-                                                     std::forward<Handler>(handler));
-    }
+    void append(std::string document_id, std::vector<std::byte> data, const append_options& options, append_handler&& handler) const;
 
     /**
      * Appends binary content to the document.
@@ -132,15 +110,7 @@ class binary_collection
      * @committed
      */
     [[nodiscard]] auto append(std::string document_id, std::vector<std::byte> data, const append_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>>>();
-        auto future = barrier->get_future();
-        append(std::move(document_id), std::move(data), options, [barrier](auto ctx, auto result) {
-            barrier->set_value({ std::move(ctx), std::move(result) });
-        });
-        return future;
-    }
+      -> std::future<std::pair<key_value_error_context, mutation_result>>;
 
     /**
      * Prepends binary content to the document.
@@ -160,18 +130,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    void prepend(std::string document_id, std::vector<std::byte> data, const prepend_options& options, Handler&& handler) const
-    {
-        return core::impl::initiate_prepend_operation(core_,
-                                                      bucket_name_,
-                                                      scope_name_,
-                                                      name_,
-                                                      std::move(document_id),
-                                                      std::move(data),
-                                                      options.build(),
-                                                      std::forward<Handler>(handler));
-    }
+    void prepend(std::string document_id, std::vector<std::byte> data, const prepend_options& options, prepend_handler&& handler) const;
 
     /**
      * Prepends binary content to the document.
@@ -190,15 +149,7 @@ class binary_collection
      * @committed
      */
     [[nodiscard]] auto prepend(std::string document_id, std::vector<std::byte> data, const prepend_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>>>();
-        auto future = barrier->get_future();
-        prepend(std::move(document_id), std::move(data), options, [barrier](auto ctx, auto result) {
-            barrier->set_value({ std::move(ctx), std::move(result) });
-        });
-        return future;
-    }
+      -> std::future<std::pair<key_value_error_context, mutation_result>>;
 
     /**
      * Increments the counter document by one or the number defined in the options.
@@ -216,12 +167,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    void increment(std::string document_id, const increment_options& options, Handler&& handler) const
-    {
-        return core::impl::initiate_increment_operation(
-          core_, bucket_name_, scope_name_, name_, std::move(document_id), options.build(), std::forward<Handler>(handler));
-    }
+    void increment(std::string document_id, const increment_options& options, increment_handler&& handler) const;
 
     /**
      * Increments the counter document by one or the number defined in the options.
@@ -238,15 +184,7 @@ class binary_collection
      * @committed
      */
     [[nodiscard]] auto increment(std::string document_id, const increment_options& options) const
-      -> std::future<std::pair<key_value_error_context, counter_result>>
-    {
-        auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, counter_result>>>();
-        auto future = barrier->get_future();
-        increment(std::move(document_id), options, [barrier](auto ctx, auto result) {
-            barrier->set_value({ std::move(ctx), std::move(result) });
-        });
-        return future;
-    }
+      -> std::future<std::pair<key_value_error_context, counter_result>>;
 
     /**
      * Decrements the counter document by one or the number defined in the options.
@@ -264,12 +202,7 @@ class binary_collection
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    void decrement(std::string document_id, const decrement_options& options, Handler&& handler) const
-    {
-        return core::impl::initiate_decrement_operation(
-          core_, bucket_name_, scope_name_, name_, std::move(document_id), options.build(), std::forward<Handler>(handler));
-    }
+    void decrement(std::string document_id, const decrement_options& options, decrement_handler&& handler) const;
 
     /**
      * Decrements the counter document by one or the number defined in the options.
@@ -286,42 +219,13 @@ class binary_collection
      * @committed
      */
     [[nodiscard]] auto decrement(std::string document_id, const decrement_options& options) const
-      -> std::future<std::pair<key_value_error_context, counter_result>>
-    {
-        auto barrier = std::make_shared<std::promise<std::pair<key_value_error_context, counter_result>>>();
-        auto future = barrier->get_future();
-        decrement(std::move(document_id), options, [barrier](auto ctx, auto result) {
-            barrier->set_value({ std::move(ctx), std::move(result) });
-        });
-        return future;
-    }
+      -> std::future<std::pair<key_value_error_context, counter_result>>;
 
   private:
     friend class collection;
 
-    /**
-     * @param core
-     * @param bucket_name
-     * @param scope_name
-     * @param name
-     *
-     * @since 1.0.0
-     * @internal
-     */
-    binary_collection(std::shared_ptr<couchbase::core::cluster> core,
-                      std::string_view bucket_name,
-                      std::string_view scope_name,
-                      std::string_view name)
-      : core_(std::move(core))
-      , bucket_name_(bucket_name)
-      , scope_name_(scope_name)
-      , name_(name)
-    {
-    }
+    binary_collection(core::cluster core, std::string_view bucket_name, std::string_view scope_name, std::string_view name);
 
-    std::shared_ptr<couchbase::core::cluster> core_;
-    std::string bucket_name_;
-    std::string scope_name_;
-    std::string name_;
+    std::shared_ptr<binary_collection_impl> impl_;
 };
 } // namespace couchbase

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

@@ -23,16 +23,16 @@
 
 #include <memory>
 
+namespace couchbase
+{
 #ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace couchbase::core
+namespace core
 {
 class cluster;
-} // namespace couchbase::core
-#endif
-
-namespace couchbase
-{
+} // namespace core
 class cluster;
+class bucket_impl;
+#endif
 
 /**
  * Provides access to Couchbase bucket
@@ -51,10 +51,7 @@ class bucket
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto default_scope() const -> scope
-    {
-        return { core_, name_, scope::default_name };
-    }
+    [[nodiscard]] auto default_scope() const -> scope;
 
     /**
      * Opens the default collection for this bucket using the default scope.
@@ -64,10 +61,7 @@ class bucket
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto default_collection() const -> collection
-    {
-        return { core_, name_, scope::default_name, collection::default_name };
-    }
+    [[nodiscard]] auto default_collection() const -> collection;
 
     /**
      * Opens the {@link scope} with the given name.
@@ -78,10 +72,7 @@ class bucket
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto scope(std::string_view scope_name) const -> scope
-    {
-        return { core_, name_, scope_name };
-    }
+    [[nodiscard]] auto scope(std::string_view scope_name) const -> scope;
 
     /**
      * Provides access to the collection management services.
@@ -91,21 +82,13 @@ class bucket
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto collections() const -> collection_manager
-    {
-        return collection_manager{ core_, name_ };
-    }
+    [[nodiscard]] auto collections() const -> collection_manager;
 
   private:
-    friend class cluster;
+    friend cluster;
 
-    bucket(std::shared_ptr<couchbase::core::cluster> core, std::string_view name)
-      : core_(std::move(core))
-      , name_(name)
-    {
-    }
+    bucket(core::cluster core, std::string_view name);
 
-    std::shared_ptr<couchbase::core::cluster> core_;
-    std::string name_;
+    std::shared_ptr<bucket_impl> impl_;
 };
 } // namespace couchbase

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

@@ -28,10 +28,14 @@
 #include <memory>
 
 #ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace couchbase::core
+namespace couchbase
+{
+namespace core
 {
 class cluster;
-} // namespace couchbase::core
+} // namespace core
+class bucket_manager_impl;
+} // namespace couchbase
 #endif
 
 namespace couchbase
@@ -125,11 +129,8 @@ class bucket_manager
   private:
     friend class cluster;
 
-    explicit bucket_manager(std::shared_ptr<couchbase::core::cluster> core)
-      : core_(std::move(core))
-    {
-    }
+    explicit bucket_manager(core::cluster core);
 
-    std::shared_ptr<couchbase::core::cluster> core_;
+    std::shared_ptr<bucket_manager_impl> impl_;
 };
 } // namespace couchbase

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

@@ -22,7 +22,6 @@
 #include <couchbase/manager_error_context.hxx>
 
 #include <functional>
-#include <memory>
 #include <optional>
 #include <string>
 

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

@@ -17,32 +17,30 @@
 
 #pragma once
 
+#include <couchbase/analytics_index_manager.hxx>
 #include <couchbase/analytics_options.hxx>
 #include <couchbase/bucket.hxx>
 #include <couchbase/bucket_manager.hxx>
 #include <couchbase/cluster_options.hxx>
 #include <couchbase/query_index_manager.hxx>
 #include <couchbase/query_options.hxx>
+#include <couchbase/search_index_manager.hxx>
 #include <couchbase/search_options.hxx>
 #include <couchbase/search_query.hxx>
 #include <couchbase/transactions.hxx>
 
 #include <memory>
 
-#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace couchbase::core
+namespace couchbase
 {
-namespace transactions
+#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
+namespace core
 {
-class transactions;
-} // namespace transactions
-
 class cluster;
-} // namespace couchbase::core
+} // namespace core
+class cluster_impl;
 #endif
 
-namespace couchbase
-{
 /**
  * The {@link cluster} is the main entry point when connecting to a Couchbase cluster.
  *
@@ -55,21 +53,18 @@ class cluster
     /**
      * Connect to a Couchbase cluster.
      *
-     * @tparam Handler callable type that implements @ref cluster_connect_handler signature
-     *
      * @param io IO context
      * @param connection_string connection string used to locate the Couchbase cluster object.
      * @param options options to customize connection (note, that connection_string takes precedence over this options).
-     * @param handler the handler that implements @ref cluster_connect_handler
+     * @param handler the handler
      *
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    static void connect(asio::io_context& io, const std::string& connection_string, const cluster_options& options, Handler&& handler)
-    {
-        return core::impl::initiate_cluster_connect(io, connection_string, options, std::forward<Handler>(handler));
-    }
+    static void connect(asio::io_context& io,
+                        const std::string& connection_string,
+                        const cluster_options& options,
+                        cluster_connect_handler&& handler);
 
     /**
      * Connect to a Couchbase cluster.
@@ -84,13 +79,7 @@ class cluster
      * @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>>
-    {
-        auto barrier = std::make_shared<std::promise<std::pair<cluster, std::error_code>>>();
-        auto future = barrier->get_future();
-        connect(io, connection_string, options, [barrier](auto c, auto ec) { barrier->set_value({ std::move(c), ec }); });
-        return future;
-    }
+      -> std::future<std::pair<cluster, std::error_code>>;
 
     cluster() = default;
     cluster(const cluster& other) = default;
@@ -98,7 +87,7 @@ class cluster
     auto operator=(const cluster& other) -> cluster& = default;
     auto operator=(cluster&& other) -> cluster& = default;
 
-    void close();
+    void close() const;
 
     /**
      * Wraps low-level implementation of the SDK to provide common API.
@@ -108,10 +97,7 @@ class cluster
      * @since 1.0.0
      * @volatile
      */
-    explicit cluster(std::shared_ptr<couchbase::core::cluster> core)
-      : core_(std::move(core))
-    {
-    }
+    explicit cluster(core::cluster core);
 
     /**
      * Opens a {@link bucket} with the given name.
@@ -122,16 +108,11 @@ class cluster
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto bucket(std::string_view bucket_name) const -> bucket
-    {
-        return { core_, bucket_name };
-    }
+    [[nodiscard]] auto bucket(std::string_view bucket_name) const -> bucket;
 
     /**
      * Performs a query against the query (N1QL) services.
      *
-     * @tparam Handler callable type that implements @ref query_handler signature
-     *
      * @param statement the N1QL query statement.
      * @param options options to customize the query request.
      * @param handler the handler that implements @ref query_handler
@@ -142,11 +123,7 @@ class cluster
      * @since 1.0.0
      * @committed
      */
-    template<typename Handler>
-    void query(std::string statement, const query_options& options, Handler&& handler) const
-    {
-        return core::impl::initiate_query_operation(core_, std::move(statement), {}, options.build(), std::forward<Handler>(handler));
-    }
+    void query(std::string statement, const query_options& options, query_handler&& handler) const;
 
     /**
      * Performs a query against the query (N1QL) services.
@@ -159,15 +136,7 @@ class cluster
      * @committed
      */
     [[nodiscard]] auto query(std::string statement, const query_options& options) const
-      -> std::future<std::pair<query_error_context, query_result>>
-    {
-        auto barrier = std::make_shared<std::promise<std::pair<query_error_context, query_result>>>();
-        auto future = barrier->get_future();
-        query(std::move(statement), options, [barrier](auto ctx, auto result) {
-            barrier->set_value({ std::move(ctx), std::move(result) });
-        });
-        return future;
-    }
+      -> std::future<std::pair<query_error_context, query_result>>;
 
     /**
      * Performs a query against the full text search services.
@@ -246,52 +215,51 @@ class cluster
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto query_indexes() const -> query_index_manager
-    {
-        return query_index_manager{ core_ };
-    }
+    [[nodiscard]] auto query_indexes() const -> query_index_manager;
 
     /**
-     * Provides access to the bucket management services.
+     * Provides access ot the Analytics index management services.
      *
      * @return a manager instance
      *
      * @since 1.0.0
      * @committed
      */
-    [[nodiscard]] auto buckets() const -> bucket_manager
-    {
-        return bucket_manager{ core_ };
-    }
+    [[nodiscard]] auto analytics_indexes() const -> analytics_index_manager;
 
     /**
-     * Provides access to transaction services.
-     *
-     * See {@link transactions} for details on using the transactions object.
+     * Provides access to the bucket management services.
      *
-     * @return an {@link transactions} object
+     * @return a manager instance
      *
      * @since 1.0.0
      * @committed
      */
+    [[nodiscard]] auto buckets() const -> bucket_manager;
 
-    [[nodiscard]] auto transactions() -> std::shared_ptr<couchbase::transactions::transactions>;
+    /**
+     * Provides access to search index management services
+     *
+     * @return a manager instance
+     *
+     * @since 1.0.0
+     * @committed
+     */
+    [[nodiscard]] auto search_indexes() const -> search_index_manager;
 
     /**
-     * Provide access to core cluster object
+     * Provides access to transaction services.
      *
-     * This is used internally, during testing, and may be removed as the API evolves.
+     * See {@link transactions} for details on using the transactions object.
      *
-     * @return pointer to core cluster
-     * @volatile
+     * @return an {@link transactions} object
+     *
+     * @since 1.0.0
+     * @committed
      */
-    [[nodiscard]] auto core() -> std::shared_ptr<couchbase::core::cluster>
-    {
-        return core_;
-    }
+    [[nodiscard]] auto transactions() const -> std::shared_ptr<couchbase::transactions::transactions>;
 
   private:
-    std::shared_ptr<couchbase::core::cluster> core_{};
-    std::shared_ptr<couchbase::core::transactions::transactions> transactions_{};
+    std::shared_ptr<cluster_impl> impl_{};
 };
 } // namespace couchbase

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

@@ -25,6 +25,7 @@
 #include <couchbase/metrics_options.hxx>
 #include <couchbase/network_options.hxx>
 #include <couchbase/password_authenticator.hxx>
+#include <couchbase/retry_strategy.hxx>
 #include <couchbase/security_options.hxx>
 #include <couchbase/timeout_options.hxx>
 #include <couchbase/tracing_options.hxx>
@@ -312,31 +313,4 @@ class cluster;
  * @uncommitted
  */
 using cluster_connect_handler = std::function<void(cluster, std::error_code)>;
-
-#ifndef COUCHBASE_CXX_CLIENT_DOXYGEN
-namespace core
-{
-class cluster;
-}
-
-namespace core::impl
-{
-
-/**
- * @since 1.0.0
- * @internal
- */
-void
-initiate_cluster_connect(asio::io_context& io,
-                         const std::string& connection_string,
-                         const couchbase::cluster_options& options,
-                         cluster_connect_handler&& handler);
-/**
- * @since 1.0.0
- * @internal
- */
-void
-initiate_cluster_close(std::shared_ptr<couchbase::core::cluster> core);
-#endif
-} // namespace core::impl
 } // namespace couchbase