couchbase 4.2.11-rc.1 → 4.2.11

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

@@ -22,8 +22,8 @@
 
 #include <tl/expected.hpp>
 
-#include <memory>
-#include <optional>
+#include <cstdint>
+#include <system_error>
 
 namespace asio
 {
@@ -39,10 +39,10 @@ class scan_stream_manager
 {
   public:
     virtual ~scan_stream_manager() = default;
-    virtual void stream_start_failed(std::int16_t node_id, bool fatal) = 0;
     virtual void stream_start_failed_awaiting_retry(std::int16_t node_id, std::uint16_t vbucket_id) = 0;
-    virtual void stream_continue_failed(std::int16_t node_id, bool fatal) = 0;
-    virtual void stream_completed(std::int16_t node_id) = 0;
+    virtual void stream_received_item(range_scan_item item) = 0;
+    virtual void stream_failed(std::int16_t node_id, std::uint16_t vbucket_id, std::error_code ec, bool fatal) = 0;
+    virtual void stream_completed(std::int16_t node_id, std::uint16_t vbucket_id) = 0;
 };
 
 class range_scan_orchestrator
@@ -61,5 +61,4 @@ class range_scan_orchestrator
   private:
     std::shared_ptr<range_scan_orchestrator_impl> impl_;
 };
-
 } // namespace couchbase::core

package/deps/couchbase-cxx-client/core/range_scan_orchestrator_options.hxx

@@ -15,17 +15,16 @@
 
 #pragma once
 
-#include "scan_options.hxx"
+#include "range_scan_options.hxx"
 #include "timeout_defaults.hxx"
 
 #include <couchbase/mutation_token.hxx>
 #include <couchbase/retry_strategy.hxx>
 
-#include <cinttypes>
+#include <chrono>
+#include <cstdint>
 #include <memory>
 #include <optional>
-#include <system_error>
-#include <variant>
 #include <vector>
 
 namespace couchbase
@@ -39,6 +38,9 @@ class request_span;
 
 namespace couchbase::core
 {
+struct mutation_state {
+    std::vector<couchbase::mutation_token> tokens;
+};
 
 struct range_scan_orchestrator_options {
     static constexpr std::uint16_t default_concurrency{ 1 };

package/deps/couchbase-cxx-client/core/scan_result.hxx

@@ -15,26 +15,16 @@
 
 #pragma once
 
-#include "scan_options.hxx"
-
+#include "range_scan_options.hxx"
 #include "utils/movable_function.hxx"
 
-#include <couchbase/mutation_token.hxx>
-#include <couchbase/retry_strategy.hxx>
-
 #include <tl/expected.hpp>
 
-#include <cinttypes>
 #include <future>
-#include <memory>
-#include <optional>
 #include <system_error>
-#include <variant>
-#include <vector>
 
 namespace couchbase::core
 {
-
 class scan_result_impl;
 
 class range_scan_item_iterator

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

@@ -79,7 +79,7 @@ class bucket
      * Performs application-level ping requests against services in the Couchbase cluster.
      *
      * @note This operation performs active I/O against services and endpoints to assess their health. If you do not
-     * wish to performs I/O, consider using @ref diagnostics() instead.
+     * wish to performs I/O, consider using @ref cluster::diagnostics() instead.
      *
      * @param options custom options to change the default behavior.
      * @param handler the handler that implements @ref ping_handler.
@@ -93,7 +93,7 @@ class bucket
      * Performs application-level ping requests against services in the Couchbase cluster.
      *
      * @note This operation performs active I/O against services and endpoints to assess their health. If you do not
-     * wish to performs I/O, consider using @ref diagnostics() instead.
+     * wish to performs I/O, consider using @ref cluster::diagnostics() instead.
      *
      * @param options custom options to change the default behavior.
      * @return future object that carries result of the operation.

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

@@ -222,7 +222,7 @@ class cluster
      * @since 1.0.0
      * @volatile
      */
-    [[nodiscard]] auto search(std::string index_name, search_request request, const search_options& = {}) const
+    [[nodiscard]] auto search(std::string index_name, search_request request, const search_options& options = {}) const
       -> std::future<std::pair<search_error_context, search_result>>;
 
     /**

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

@@ -791,6 +791,7 @@ class collection
      * @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_any_replica_handler
      *
      * @exception errc::key_value::document_not_found the given document id is not found in the collection.
      * @exception errc::common::ambiguous_timeout

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

@@ -64,7 +64,7 @@ class collection_query_index_manager
     void get_all_indexes(const get_all_query_indexes_options& options, get_all_query_indexes_handler&& handler) const;
 
     /**
-     * Get all indexes within the collection..
+     * Get all indexes within the collection.
      *
      * @param options optional parameters
      * @return future object that carries result of the operation

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

@@ -48,6 +48,7 @@ class error_context
     /**
      * Creates and initializes error context with given parameters.
      *
+     * @param operation_id
      * @param ec
      * @param last_dispatched_to
      * @param last_dispatched_from

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

@@ -50,7 +50,7 @@ class get_links_analytics_options : public common_options<get_links_analytics_op
     /**
      * The name of the link to fetch.
      *
-     * @param link_name
+     * @param name link name
      * @return reference to this object, for use in chaining
      *
      * @since 1.0.0
@@ -65,7 +65,7 @@ class get_links_analytics_options : public common_options<get_links_analytics_op
     /**
      * The type of links to restrict returned links to.
      *
-     * @param link_type
+     * @param link_type link type
      * @return reference to this object, for use in chaining
      *
      * @since 1.0.0

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

@@ -151,7 +151,7 @@ class scope
      * @since 1.0.0
      * @volatile
      */
-    [[nodiscard]] auto search(std::string index_name, search_request request, const search_options& = {}) const
+    [[nodiscard]] auto search(std::string index_name, search_request request, const search_options& options = {}) const
       -> std::future<std::pair<search_error_context, search_result>>;
 
     /**

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

@@ -35,7 +35,7 @@
 namespace couchbase
 {
 /**
- * Options for cluster#search_query() and scope#search_query().
+ * Options for @ref cluster#search_query(), @ref cluster#search() and @ref scope#search().
  *
  * @since 1.0.0
  * @committed
@@ -500,7 +500,7 @@ struct search_options : public common_options<search_options> {
 };
 
 /**
- * The signature for the handler of the @ref cluster#search_query() and @ref scope#search_query() operations
+ * The signature for the handler of the @ref cluster#search_query(), @ref cluster#search() and @ref scope#search() operations
  *
  * @since 1.0.0
  * @uncommitted

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

@@ -35,7 +35,7 @@ class internal_search_result;
 #endif
 
 /**
- * Represents result of @ref cluster#search_query() and @ref scope#search_query() calls.
+ * Represents result of @ref cluster#search_query(), @ref cluster#search() and @ref scope#search() calls.
  *
  * @since 1.0.0
  * @committed

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

@@ -41,6 +41,7 @@ class subdocument_error_context : public key_value_error_context
     /**
      * Creates and initializes error context with given parameters.
      *
+     * @param operation_id
      * @param ec
      * @param last_dispatched_to
      * @param last_dispatched_from

package/deps/couchbase-cxx-client/couchbase/transactions/transaction_options.hxx

@@ -78,7 +78,7 @@ class transaction_options
     /**
      * Set the timeout for this transaction.
      *
-     * @tparam T timeout type, e.g. @ref std::chrono::milliseconds, or similar
+     * @tparam T timeout type, e.g. std::chrono::milliseconds, or similar
      * @param timeout Desired timeout
      * @return reference to this object, convenient for chaining operations.
      */

package/deps/couchbase-cxx-client/couchbase-sdk-cxx-black-duck-manifest.yaml

@@ -1,3 +1,4 @@
+# NOTE: This file MUST be in sync with cmake/ThirdPartyDependencies.cmake
 components:
   boringssl:
     bd-id: 1e303b15-b82b-4a4d-8cd6-a2048fb2c73d

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.2.11-rc.1",
+  "version": "4.2.11",
   "config": {
     "native": false
   },
@@ -79,12 +79,12 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.2.11-rc.1",
-    "@couchbase/couchbase-darwin-x64-napi": "4.2.11-rc.1",
-    "@couchbase/couchbase-linux-arm64-napi": "4.2.11-rc.1",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.2.11-rc.1",
-    "@couchbase/couchbase-linux-x64-napi": "4.2.11-rc.1",
-    "@couchbase/couchbase-win32-x64-napi": "4.2.11-rc.1"
+    "@couchbase/couchbase-darwin-arm64-napi": "4.2.11",
+    "@couchbase/couchbase-darwin-x64-napi": "4.2.11",
+    "@couchbase/couchbase-linux-arm64-napi": "4.2.11",
+    "@couchbase/couchbase-linuxmusl-x64-napi": "4.2.11",
+    "@couchbase/couchbase-linux-x64-napi": "4.2.11",
+    "@couchbase/couchbase-win32-x64-napi": "4.2.11"
   },
   "files": [
     "LICENSE",

package/src/jstocbpp_autogen.hpp

@@ -19,7 +19,6 @@
 #include <core/operations/management/user.hxx>
 #include <core/operations/management/view.hxx>
 #include <core/range_scan_orchestrator_options.hxx>
-#include <core/scan_options.hxx>
 
 namespace couchnode
 {

package/deps/couchbase-cxx-client/core/scan_options.hxx

@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 2022-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
- *
- *     https://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 "range_scan_options.hxx"
-
-#include <couchbase/mutation_token.hxx>
-#include <couchbase/retry_strategy.hxx>
-
-#include <cinttypes>
-#include <memory>
-#include <optional>
-#include <system_error>
-#include <variant>
-#include <vector>
-
-namespace couchbase
-{
-class retry_strategy;
-namespace tracing
-{
-class request_span;
-} // namespace tracing
-} // namespace couchbase
-
-namespace couchbase::core
-{
-struct mutation_state {
-    std::vector<couchbase::mutation_token> tokens;
-};
-} // namespace couchbase::core