couchbase 4.2.5 → 4.2.6-dev.1

package/deps/couchbase-cxx-client/test/test_integration_search.cxx

@@ -25,6 +25,8 @@
 
 #include <couchbase/query_string_query.hxx>
 
+#include <regex>
+
 using Catch::Matchers::StartsWith;
 
 TEST_CASE("integration: search query")
@@ -567,7 +569,14 @@ TEST_CASE("integration: search query collections")
         }
         couchbase::core::operations::management::search_index_upsert_request req{};
         req.index = index;
-        auto resp = test::utils::execute(integration.cluster, req);
+
+        couchbase::core::operations::management::search_index_upsert_response resp;
+        bool operation_completed = test::utils::wait_until([&integration, &resp, req]() {
+            resp = test::utils::execute(integration.cluster, req);
+            std::regex scope_not_found("collection: '.+' doesn't belong to scope");
+            return !std::regex_search(resp.error, scope_not_found);
+        });
+        REQUIRE(operation_completed);
         REQUIRE_SUCCESS(resp.ctx.ec);
         if (index_name != resp.name) {
             CB_LOG_INFO("update index name \"{}\" -> \"{}\"", index_name, resp.name);

package/deps/couchbase-cxx-client/test/test_transaction_public_async_api.cxx

@@ -32,7 +32,7 @@ async_options()
     return cfg;
 }
 
-TEST_CASE("can async get", "[transactions]")
+TEST_CASE("transactions public async API: can async get", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -62,7 +62,7 @@ TEST_CASE("can async get", "[transactions]")
     f.get();
 }
 
-TEST_CASE("can get fail as expected", "[transactions]")
+TEST_CASE("transactions public async API: can get fail as expected", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -85,7 +85,7 @@ TEST_CASE("can get fail as expected", "[transactions]")
       async_options());
     f.get();
 }
-TEST_CASE("can async remove", "[transactions]")
+TEST_CASE("transactions public async API: can async remove", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -114,7 +114,7 @@ TEST_CASE("can async remove", "[transactions]")
     f.get();
 }
 
-TEST_CASE("async remove with bad cas fails as expected", "[transactions]")
+TEST_CASE("transactions public async API: async remove with bad cas fails as expected", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -144,7 +144,8 @@ TEST_CASE("async remove with bad cas fails as expected", "[transactions]")
       async_options());
     f.get();
 }
-TEST_CASE("can async insert", "[transactions]")
+
+TEST_CASE("transactions public async API: can async insert", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -168,7 +169,7 @@ TEST_CASE("can async insert", "[transactions]")
     f.get();
 }
 
-TEST_CASE("async insert fails when doc already exists, but doesn't rollback", "[transactions]")
+TEST_CASE("transactions public async API: async insert fails when doc already exists, but doesn't rollback", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -196,7 +197,7 @@ TEST_CASE("async insert fails when doc already exists, but doesn't rollback", "[
     f.get();
 }
 
-TEST_CASE("can async replace", "[transactions]")
+TEST_CASE("transactions public async API: can async replace", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -227,7 +228,7 @@ TEST_CASE("can async replace", "[transactions]")
       async_options());
     f.get();
 }
-TEST_CASE("async replace fails as expected with bad cas", "[transactions]")
+TEST_CASE("transactions public async API: async replace fails as expected with bad cas", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -259,7 +260,7 @@ TEST_CASE("async replace fails as expected with bad cas", "[transactions]")
     f.get();
 }
 
-TEST_CASE("uncaught exception will rollback", "[transactions]")
+TEST_CASE("transactions public async API: uncaught exception will rollback", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -293,7 +294,7 @@ TEST_CASE("uncaught exception will rollback", "[transactions]")
     f.get();
 }
 
-TEST_CASE("can set transaction options", "[transactions]")
+TEST_CASE("transactions public async API: can set transaction options", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -334,7 +335,7 @@ TEST_CASE("can set transaction options", "[transactions]")
     f.get();
 }
 
-TEST_CASE("can do mutating query", "[transactions]")
+TEST_CASE("transactions public async API: can do mutating query", "[transactions]")
 {
 
     test::utils::integration_test_guard integration;
@@ -360,7 +361,7 @@ TEST_CASE("can do mutating query", "[transactions]")
     f.get();
 }
 
-TEST_CASE("some query errors rollback", "[transactions]")
+TEST_CASE("transactions public async API: some query errors rollback", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 

package/deps/couchbase-cxx-client/test/test_transaction_public_blocking_api.cxx

@@ -94,7 +94,7 @@ upsert_scope_and_collection(std::shared_ptr<couchbase::core::cluster> cluster,
     }
 }
 
-TEST_CASE("can get", "[transactions]")
+TEST_CASE("transactions public blocking API: can get", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -118,7 +118,7 @@ TEST_CASE("can get", "[transactions]")
     CHECK_FALSE(tx_err.ec());
 }
 
-TEST_CASE("get returns error if doc doesn't exist", "[transactions]")
+TEST_CASE("transactions public blocking API: get returns error if doc doesn't exist", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -137,7 +137,7 @@ TEST_CASE("get returns error if doc doesn't exist", "[transactions]")
     CHECK_FALSE(tx_err.ec());
 }
 
-TEST_CASE("can insert", "[transactions]")
+TEST_CASE("transactions public blocking API: can insert", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -165,7 +165,7 @@ TEST_CASE("can insert", "[transactions]")
     REQUIRE(final_doc.content_as<tao::json::value>() == content);
 }
 
-TEST_CASE("insert has error as expected when doc already exists", "[transactions]")
+TEST_CASE("transactions public blocking API: insert has error as expected when doc already exists", "[transactions]")
 {
 
     test::utils::integration_test_guard integration;
@@ -193,7 +193,7 @@ TEST_CASE("insert has error as expected when doc already exists", "[transactions
     REQUIRE(final_doc.content_as<tao::json::value>() == content);
 }
 
-TEST_CASE("can replace", "[transactions]")
+TEST_CASE("transactions public blocking API: can replace", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -225,7 +225,7 @@ TEST_CASE("can replace", "[transactions]")
             couchbase::core::utils::json::generate_binary(new_content));
 }
 
-TEST_CASE("replace fails as expected with bad cas", "[transactions]")
+TEST_CASE("transactions public blocking API: replace fails as expected with bad cas", "[transactions]")
 {
 
     test::utils::integration_test_guard integration;
@@ -255,7 +255,7 @@ TEST_CASE("replace fails as expected with bad cas", "[transactions]")
     REQUIRE(final_doc.content_as<tao::json::value>() == content);
 }
 
-TEST_CASE("can remove", "[transactions]")
+TEST_CASE("transactions public blocking API: can remove", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -280,7 +280,7 @@ TEST_CASE("can remove", "[transactions]")
     REQUIRE(final_err.ec() == couchbase::errc::key_value::document_not_found);
 }
 
-TEST_CASE("remove fails as expected with bad cas", "[transactions]")
+TEST_CASE("transactions public blocking API: remove fails as expected with bad cas", "[transactions]")
 {
 
     test::utils::integration_test_guard integration;
@@ -307,7 +307,7 @@ TEST_CASE("remove fails as expected with bad cas", "[transactions]")
     CHECK(tx_err.ec());
 }
 
-TEST_CASE("remove fails as expected with missing doc", "[transactions]")
+TEST_CASE("transactions public blocking API: remove fails as expected with missing doc", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -331,7 +331,7 @@ TEST_CASE("remove fails as expected with missing doc", "[transactions]")
     CHECK(tx_err.cause() == couchbase::errc::transaction_op::unknown);
 }
 
-TEST_CASE("uncaught exception in lambda will rollback without retry", "[transactions]")
+TEST_CASE("transactions public blocking API: uncaught exception in lambda will rollback without retry", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -352,7 +352,7 @@ TEST_CASE("uncaught exception in lambda will rollback without retry", "[transact
     CHECK(tx_err.cause() == couchbase::errc::transaction_op::unknown);
 }
 
-TEST_CASE("can pass per-transaction configs", "[transactions]")
+TEST_CASE("transactions public blocking API: can pass per-transaction configs", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -386,7 +386,7 @@ TEST_CASE("can pass per-transaction configs", "[transactions]")
     CHECK(tx_err.ec());
 }
 
-TEST_CASE("can do simple query", "[transactions]")
+TEST_CASE("transactions public blocking API: can do simple query", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -407,7 +407,7 @@ TEST_CASE("can do simple query", "[transactions]")
     CHECK_FALSE(result.transaction_id.empty());
 }
 
-TEST_CASE("can do simple mutating query", "[transactions]")
+TEST_CASE("transactions public blocking API: can do simple mutating query", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -430,7 +430,7 @@ TEST_CASE("can do simple mutating query", "[transactions]")
     CHECK(final_doc.content_as<tao::json::value>().at("some_number") == 10);
 }
 
-TEST_CASE("some query errors don't force rollback", "[transactions]")
+TEST_CASE("transactions public blocking API: some query errors don't force rollback", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -455,7 +455,7 @@ TEST_CASE("some query errors don't force rollback", "[transactions]")
     CHECK(final_doc.content_as<tao::json::value>() == content);
 }
 
-TEST_CASE("some query errors do rollback", "[transactions]")
+TEST_CASE("transactions public blocking API: some query errors do rollback", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -484,7 +484,7 @@ TEST_CASE("some query errors do rollback", "[transactions]")
     CHECK(doc2.cas().empty());
 }
 
-TEST_CASE("some query errors are seen immediately", "[transactions]")
+TEST_CASE("transactions public blocking API: some query errors are seen immediately", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -503,7 +503,7 @@ TEST_CASE("some query errors are seen immediately", "[transactions]")
     CHECK(result.unstaging_complete);
 }
 
-TEST_CASE("can query from a scope", "[transactions]")
+TEST_CASE("transactions public blocking API: can query from a scope", "[transactions]")
 {
     const std::string new_scope_name("newscope");
     const std::string new_coll_name("newcoll");
@@ -529,9 +529,15 @@ TEST_CASE("can query from a scope", "[transactions]")
       txn_opts());
     CHECK_FALSE(tx_err.ec());
     CHECK_FALSE(result.transaction_id.empty());
+
+    {
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, new_scope_name };
+        auto resp = test::utils::execute(integration.cluster, req);
+        REQUIRE_SUCCESS(resp.ctx.ec);
+    }
 }
 
-TEST_CASE("can get doc from bucket not yet opened", "[transactions]")
+TEST_CASE("transactions public blocking API: can get doc from bucket not yet opened", "[transactions]")
 {
 
     auto id = test::utils::uniq_id("txn");
@@ -559,7 +565,7 @@ TEST_CASE("can get doc from bucket not yet opened", "[transactions]")
     });
 }
 
-TEST_CASE("can insert doc into bucket not yet opened", "[transactions]")
+TEST_CASE("transactions public blocking API: can insert doc into bucket not yet opened", "[transactions]")
 {
     test::utils::integration_test_guard integration;
 
@@ -585,7 +591,7 @@ TEST_CASE("can insert doc into bucket not yet opened", "[transactions]")
     });
 }
 
-TEST_CASE("can replace doc in bucket not yet opened", "[transactions]")
+TEST_CASE("transactions public blocking API: can replace doc in bucket not yet opened", "[transactions]")
 {
 
     auto id = test::utils::uniq_id("txn");
@@ -620,7 +626,7 @@ TEST_CASE("can replace doc in bucket not yet opened", "[transactions]")
     });
 }
 
-TEST_CASE("can remove doc in bucket not yet opened", "[transactions]")
+TEST_CASE("transactions public blocking API: can remove doc in bucket not yet opened", "[transactions]")
 {
 
     auto id = test::utils::uniq_id("txn");

package/deps/couchbase-cxx-client/test/test_unit_query.cxx

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023 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.
+ */
+
+#include "test_helper_integration.hxx"
+
+#include "utils/move_only_context.hxx"
+
+#include "core/operations/document_query.hxx"
+
+couchbase::core::http_context
+make_http_context(couchbase::core::topology::configuration& config)
+{
+    static couchbase::core::query_cache query_cache{};
+    static couchbase::core::cluster_options cluster_options{};
+    std::string hostname{};
+    std::uint16_t port{};
+    couchbase::core::http_context ctx{ config, cluster_options, query_cache, hostname, port };
+    return ctx;
+}
+
+TEST_CASE("unit: query with read from replica", "[unit]")
+{
+    couchbase::core::topology::configuration config{};
+    config.cluster_capabilities.insert(couchbase::core::cluster_capability::n1ql_read_from_replica);
+    auto ctx = make_http_context(config);
+
+    SECTION("use_replica true")
+    {
+        couchbase::core::io::http_request http_req;
+        couchbase::core::operations::query_request req{};
+        req.use_replica = true;
+        auto ec = req.encode_to(http_req, ctx);
+        REQUIRE_SUCCESS(ec);
+        auto body = couchbase::core::utils::json::parse(http_req.body);
+        REQUIRE(body.is_object());
+        REQUIRE(body.get_object().at("use_replica").get_string() == "on");
+    }
+
+    SECTION("use_replica false")
+    {
+        couchbase::core::io::http_request http_req;
+        couchbase::core::operations::query_request req{};
+        req.use_replica = false;
+        auto ec = req.encode_to(http_req, ctx);
+        REQUIRE_SUCCESS(ec);
+        auto body = couchbase::core::utils::json::parse(http_req.body);
+        REQUIRE(body.is_object());
+        REQUIRE(body.get_object().at("use_replica").get_string() == "off");
+    }
+
+    SECTION("use_replica not set")
+    {
+        couchbase::core::io::http_request http_req;
+        couchbase::core::operations::query_request req{};
+        auto ec = req.encode_to(http_req, ctx);
+        REQUIRE_SUCCESS(ec);
+        auto body = couchbase::core::utils::json::parse(http_req.body);
+        REQUIRE(body.is_object());
+        REQUIRE_FALSE(body.get_object().count("use_replica"));
+    }
+}

package/deps/couchbase-cxx-client/test/utils/server_version.hxx

@@ -215,6 +215,11 @@ struct server_version {
     {
         return supports_search() && (is_mad_hatter() || is_cheshire_cat() || is_neo());
     }
+
+    [[nodiscard]] bool is_capella() const
+    {
+        return deployment == deployment_type::capella;
+    }
 };
 
 } // namespace test::utils

package/deps/couchbase-cxx-client/test/utils/wait_until.cxx

@@ -21,8 +21,11 @@
 #include "core/operations/management/collections_manifest_get.hxx"
 #include "core/operations/management/search_get_stats.hxx"
 #include "core/operations/management/search_index_get_documents_count.hxx"
+#include "core/topology/collections_manifest_fmt.hxx"
 #include "core/utils/json.hxx"
 
+#include <fmt/chrono.h>
+
 namespace test::utils
 {
 bool
@@ -49,18 +52,34 @@ wait_until_bucket_healthy(std::shared_ptr<couchbase::core::cluster> cluster, con
 bool
 wait_until_collection_manifest_propagated(std::shared_ptr<couchbase::core::cluster> cluster,
                                           const std::string& bucket_name,
-                                          const std::uint64_t current_manifest_uid)
+                                          const std::uint64_t current_manifest_uid,
+                                          std::size_t successful_rounds,
+                                          std::chrono::seconds total_timeout)
 {
-    auto propagated = test::utils::wait_until([cluster, bucket_name, current_manifest_uid]() {
-        couchbase::core::operations::management::collections_manifest_get_request req{ { bucket_name, "_default", "_default", "" } };
-        auto resp = test::utils::execute(cluster, req);
-        return resp.manifest.uid >= current_manifest_uid;
-    });
-    if (propagated) {
-        // FIXME: The above check does not wait for all nodes to be up to date
-        std::this_thread::sleep_for(std::chrono::seconds(1));
+    std::size_t round = 0;
+    auto deadline = std::chrono::system_clock::now() + total_timeout;
+    while (std::chrono::system_clock::now() < deadline) {
+        auto propagated = test::utils::wait_until([cluster, bucket_name, current_manifest_uid, round, successful_rounds]() {
+            couchbase::core::operations::management::collections_manifest_get_request req{ { bucket_name, "_default", "_default", "" } };
+            auto resp = test::utils::execute(cluster, req);
+            CB_LOG_INFO("wait_until_collection_manifest_propagated \"{}\", expected: {}, actual: {}, round: {} ({}), manifest: {}",
+                        bucket_name,
+                        current_manifest_uid,
+                        resp.manifest.uid,
+                        round,
+                        successful_rounds,
+                        resp.manifest);
+            return resp.manifest.uid >= current_manifest_uid;
+        });
+        if (propagated) {
+            round += 1;
+            if (round >= successful_rounds) {
+                std::this_thread::sleep_for(std::chrono::seconds{ 1 });
+                return propagated;
+            }
+        }
     }
-    return propagated;
+    return false;
 }
 
 bool

package/deps/couchbase-cxx-client/test/utils/wait_until.hxx

@@ -61,7 +61,9 @@ wait_until_bucket_healthy(std::shared_ptr<couchbase::core::cluster> cluster, con
 bool
 wait_until_collection_manifest_propagated(std::shared_ptr<couchbase::core::cluster> cluster,
                                           const std::string& bucket_name,
-                                          const std::uint64_t current_manifest_uid);
+                                          const std::uint64_t current_manifest_uid,
+                                          std::size_t successful_rounds = 4,
+                                          std::chrono::seconds total_timeout = std::chrono::minutes{ 5 });
 bool
 wait_until_user_present(const std::shared_ptr<couchbase::core::cluster>& cluster, const std::string& username);
 

package/deps/couchbase-cxx-client/tools/utils.cxx

@@ -82,6 +82,7 @@ auto
 usage_block_for_cluster_options() -> std::string
 {
     const auto default_user_agent_extra{ "cbc" };
+    const auto default_network{ "auto" };
     const auto default_options = default_cluster_options().build();
     const auto connection_string = default_connection_string();
 
@@ -161,6 +162,7 @@ Tracing options:
 
 Behavior options:
   --user-agent-extra=STRING          Append extra string SDK identifiers (full user-agent is "{sdk_id};{user_agent_extra}"). [default: {user_agent_extra}].
+  --network=STRING                   Network (a.k.a. Alternate Addresses) to use. [default: {network}]
   --show-queries                     Log queries on INFO level.
   --enable-clustermap-notifications  Allow server to send notifications when cluster configuration changes.
   --disable-mutation-tokens          Do not request Key/Value service to send mutation tokens.
@@ -209,7 +211,8 @@ Behavior options:
       fmt::arg("tracing_threshold_management", default_options.tracing.management_threshold),
       fmt::arg("tracing_threshold_eventing", default_options.tracing.eventing_threshold),
       fmt::arg("sdk_id", couchbase::core::meta::sdk_id()),
-      fmt::arg("user_agent_extra", default_user_agent_extra));
+      fmt::arg("user_agent_extra", default_user_agent_extra),
+      fmt::arg("network", default_network));
 }
 
 void

package/dist/binding.d.ts

@@ -36,6 +36,11 @@ export interface CppQueryContext {
     bucket_name: string;
     scope_name: string;
 }
+export interface CppScanIterator {
+    cancelled: boolean;
+    next(callback: (err: CppError | null, result: CppRangeScanItem | undefined) => void): void;
+    cancel(): boolean;
+}
 export declare enum CppManagementAnalyticsCouchbaseLinkEncryptionLevel {
 }
 export declare enum CppManagementClusterBucketType {
@@ -126,8 +131,6 @@ export declare enum CppPersistTo {
 }
 export declare enum CppReplicateTo {
 }
-export declare enum CppScanSort {
-}
 export interface CppManagementAnalyticsDataset {
     name: string;
     dataverse_name: string;
@@ -577,6 +580,7 @@ export interface CppQueryRequest {
     readonly: boolean;
     flex_index: boolean;
     preserve_expiry: boolean;
+    use_replica?: boolean;
     max_parallelism?: number;
     scan_cap?: number;
     scan_wait?: CppMilliseconds;
@@ -1789,12 +1793,15 @@ export interface CppImplSubdocCommand {
     original_index_: number;
 }
 export interface CppScanTerm {
-    id: Buffer;
+    term: string;
     exclusive: boolean;
 }
 export interface CppRangeScan {
-    start_: CppScanTerm;
-    end_: CppScanTerm;
+    from?: CppScanTerm;
+    to?: CppScanTerm;
+}
+export interface CppPrefixScan {
+    prefix: string;
 }
 export interface CppSamplingScan {
     limit: number;
@@ -1809,7 +1816,7 @@ export interface CppRangeScanCreateOptions {
     scope_name: string;
     collection_name: string;
     scan_type_name: string;
-    scan_type_value: undefined | CppRangeScan | CppSamplingScan;
+    scan_type_value: undefined | CppRangeScan | CppPrefixScan | CppSamplingScan;
     timeout: CppMilliseconds;
     collection_id: number;
     snapshot_requirements?: CppRangeSnapshotRequirements;
@@ -1822,8 +1829,8 @@ export interface CppRangeScanCreateResult {
 export interface CppRangeScanContinueOptions {
     batch_item_limit: number;
     batch_byte_limit: number;
+    timeout: CppMilliseconds;
     batch_time_limit: CppMilliseconds;
-    ids_only: boolean;
 }
 export interface CppRangeScanContinueResult {
     more: boolean;
@@ -1842,7 +1849,7 @@ export interface CppRangeScanItemBody {
     value: Buffer;
 }
 export interface CppRangeScanItem {
-    key: Buffer;
+    key: string;
     body?: CppRangeScanItemBody;
 }
 export interface CppRangeScanCancelResult {
@@ -1853,10 +1860,9 @@ export interface CppMutationState {
 export interface CppRangeScanOrchestratorOptions {
     ids_only: boolean;
     consistent_with?: CppMutationState;
-    sort: CppScanSort;
     batch_item_limit: number;
     batch_byte_limit: number;
-    batch_time_limit: CppMilliseconds;
+    concurrency: number;
     timeout: CppMilliseconds;
 }
 export interface CppConnectionAutogen {
@@ -2212,8 +2218,7 @@ export interface CppBindingAutogen {
         xattr_cannot_modify_virtual_attribute: CppErrcKeyValue;
         xattr_no_access: CppErrcKeyValue;
         cannot_revive_living_document: CppErrcKeyValue;
-        range_scan_cancelled: CppErrcKeyValue;
-        range_scan_vb_uuid_not_equal: CppErrcKeyValue;
+        mutation_token_outdated: CppErrcKeyValue;
         range_scan_completed: CppErrcKeyValue;
     };
     errc_query: {
@@ -2393,10 +2398,6 @@ export interface CppBindingAutogen {
         two: CppReplicateTo;
         three: CppReplicateTo;
     };
-    scan_sort: {
-        none: CppScanSort;
-        ascending: CppScanSort;
-    };
 }
 export type CppErrc = CppErrcCommon | CppErrcKeyValue | CppErrcQuery | CppErrcAnalytics | CppErrcSearch | CppErrcView | CppErrcManagement | CppErrcFieldLevelEncryption | CppErrcNetwork;
 export declare enum CppTxnFailureType {
@@ -2570,6 +2571,10 @@ export interface CppConnection extends CppConnectionAutogen {
             }[];
         };
     }) => void): void;
+    scan(bucket_name: string, scope_name: string, collection_name: string, scan_type_name: string, scan_type_value: CppRangeScan | CppSamplingScan | CppPrefixScan, options: CppRangeScanOrchestratorOptions): {
+        cppErr: CppError | null;
+        result: CppScanIterator;
+    };
 }
 export interface CppTransactionsConfig {
     durability_level?: CppDurabilityLevel;

package/dist/binding.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CppTxnExternalException = exports.CppTxnFailureType = exports.CppScanSort = exports.CppReplicateTo = exports.CppPersistTo = exports.CppStoreSemantics = exports.CppImplSubdocOpcode = exports.CppKeyValueStatusCode = exports.CppErrcNetwork = exports.CppErrcFieldLevelEncryption = exports.CppErrcManagement = exports.CppErrcView = exports.CppErrcSearch = exports.CppErrcAnalytics = exports.CppErrcQuery = exports.CppErrcKeyValue = exports.CppErrcCommon = exports.CppDurabilityLevel = exports.CppAnalyticsResponseAnalyticsStatus = exports.CppViewSortOrder = exports.CppViewScanConsistency = exports.CppViewOnError = exports.CppServiceType = exports.CppSearchScanConsistency = exports.CppSearchHighlightStyle = exports.CppQueryScanConsistency = exports.CppQueryProfile = exports.CppDiagPingState = exports.CppDiagEndpointState = exports.CppDiagClusterState = exports.CppDesignDocumentNamespace = exports.CppAnalyticsScanConsistency = exports.CppProtocolSubdocOpcode = exports.CppRetryReason = exports.CppManagementRbacAuthDomain = exports.CppManagementEventingFunctionProcessingStatus = exports.CppManagementEventingFunctionDeploymentStatus = exports.CppManagementEventingFunctionStatus = exports.CppManagementEventingFunctionBucketAccess = exports.CppManagementEventingFunctionLogLevel = exports.CppManagementEventingFunctionLanguageCompatibility = exports.CppManagementEventingFunctionDcpBoundary = exports.CppManagementClusterBucketStorageBackend = exports.CppManagementClusterBucketConflictResolution = exports.CppManagementClusterBucketEvictionPolicy = exports.CppManagementClusterBucketCompression = exports.CppManagementClusterBucketType = exports.CppManagementAnalyticsCouchbaseLinkEncryptionLevel = exports.zeroCas = void 0;
+exports.CppTxnExternalException = exports.CppTxnFailureType = exports.CppReplicateTo = exports.CppPersistTo = exports.CppStoreSemantics = exports.CppImplSubdocOpcode = exports.CppKeyValueStatusCode = exports.CppErrcNetwork = exports.CppErrcFieldLevelEncryption = exports.CppErrcManagement = exports.CppErrcView = exports.CppErrcSearch = exports.CppErrcAnalytics = exports.CppErrcQuery = exports.CppErrcKeyValue = exports.CppErrcCommon = exports.CppDurabilityLevel = exports.CppAnalyticsResponseAnalyticsStatus = exports.CppViewSortOrder = exports.CppViewScanConsistency = exports.CppViewOnError = exports.CppServiceType = exports.CppSearchScanConsistency = exports.CppSearchHighlightStyle = exports.CppQueryScanConsistency = exports.CppQueryProfile = exports.CppDiagPingState = exports.CppDiagEndpointState = exports.CppDiagClusterState = exports.CppDesignDocumentNamespace = exports.CppAnalyticsScanConsistency = exports.CppProtocolSubdocOpcode = exports.CppRetryReason = exports.CppManagementRbacAuthDomain = exports.CppManagementEventingFunctionProcessingStatus = exports.CppManagementEventingFunctionDeploymentStatus = exports.CppManagementEventingFunctionStatus = exports.CppManagementEventingFunctionBucketAccess = exports.CppManagementEventingFunctionLogLevel = exports.CppManagementEventingFunctionLanguageCompatibility = exports.CppManagementEventingFunctionDcpBoundary = exports.CppManagementClusterBucketStorageBackend = exports.CppManagementClusterBucketConflictResolution = exports.CppManagementClusterBucketEvictionPolicy = exports.CppManagementClusterBucketCompression = exports.CppManagementClusterBucketType = exports.CppManagementAnalyticsCouchbaseLinkEncryptionLevel = exports.zeroCas = void 0;
 /*
 eslint
 jsdoc/require-jsdoc: off,
@@ -147,9 +147,6 @@ var CppPersistTo;
 var CppReplicateTo;
 (function (CppReplicateTo) {
 })(CppReplicateTo = exports.CppReplicateTo || (exports.CppReplicateTo = {}));
-var CppScanSort;
-(function (CppScanSort) {
-})(CppScanSort = exports.CppScanSort || (exports.CppScanSort = {}));
 var CppTxnFailureType;
 (function (CppTxnFailureType) {
 })(CppTxnFailureType = exports.CppTxnFailureType || (exports.CppTxnFailureType = {}));

package/dist/bindingutilities.d.ts

@@ -1,11 +1,12 @@
 import { AnalyticsScanConsistency, AnalyticsStatus } from './analyticstypes';
-import { CppAnalyticsScanConsistency, CppAnalyticsResponseAnalyticsStatus, CppDurabilityLevel, CppDiagEndpointState, CppMutationState, CppDiagPingState, CppQueryProfile, CppQueryScanConsistency, CppSearchHighlightStyle, CppSearchScanConsistency, CppServiceType, CppStoreSemantics, CppTxnExternalException, CppViewScanConsistency, CppViewSortOrder, CppPersistTo, CppReplicateTo, CppTxnOpException } from './binding';
+import { CppAnalyticsScanConsistency, CppAnalyticsResponseAnalyticsStatus, CppDurabilityLevel, CppDiagEndpointState, CppMutationState, CppDiagPingState, CppQueryProfile, CppQueryScanConsistency, CppSearchHighlightStyle, CppSearchScanConsistency, CppServiceType, CppStoreSemantics, CppTxnExternalException, CppViewScanConsistency, CppViewSortOrder, CppPersistTo, CppReplicateTo, CppTxnOpException, CppRangeScan, CppSamplingScan, CppPrefixScan } from './binding';
 import { CppError } from './binding';
 import { EndpointState, PingState } from './diagnosticstypes';
 import { ErrorContext } from './errorcontexts';
 import { DurabilityLevel, ServiceType, StoreSemantics } from './generaltypes';
 import { MutationState } from './mutationstate';
 import { QueryProfileMode, QueryScanConsistency } from './querytypes';
+import { RangeScan, SamplingScan, PrefixScan } from './rangeScan';
 import { SearchScanConsistency, HighlightStyle } from './searchtypes';
 import { ViewOrdering, ViewScanConsistency } from './viewtypes';
 /**
@@ -92,3 +93,7 @@ export declare function contextFromCpp(err: CppError | null): ErrorContext | nul
  * @internal
  */
 export declare function errorFromCpp(err: CppError | null): Error | null;
+/**
+ * @internal
+ */
+export declare function scanTypeToCpp(scanType: RangeScan | SamplingScan | PrefixScan): CppRangeScan | CppSamplingScan | CppPrefixScan;