couchbase 4.2.5 → 4.2.6-dev

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

@@ -184,6 +184,8 @@ struct origin {
         return credentials_;
     }
 
+    [[nodiscard]] auto to_json() const -> std::string;
+
   private:
     couchbase::core::cluster_options options_{};
     cluster_credentials credentials_{};

package/deps/couchbase-cxx-client/core/protocol/status.cxx

@@ -189,10 +189,10 @@ map_status_code(protocol::client_opcode opcode, std::uint16_t status)
         case key_value_status_code::opaque_no_match:
 
         case key_value_status_code::range_scan_cancelled:
-            return errc::key_value::range_scan_cancelled;
+            return errc::common::request_canceled;
 
         case key_value_status_code::range_scan_vb_uuid_not_equal:
-            return errc::key_value::range_scan_vb_uuid_not_equal;
+            return errc::key_value::mutation_token_outdated;
 
         case key_value_status_code::unknown:
             break;

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

@@ -19,34 +19,10 @@
 
 namespace couchbase::core
 {
-range_scan::range_scan(scan_term start, scan_term end)
-  : start_{ std::move(start) }
-  , end_{ std::move(end) }
-{
-}
-
-range_scan::range_scan(std::string_view start, std::string_view end)
-  : start_{ utils::to_binary(start) }
-  , end_{ utils::to_binary(end) }
-{
-}
-
-range_scan::range_scan(std::string_view start, bool exclusive_start, std::string_view end, bool exclusive_end)
-  : start_{ utils::to_binary(start), exclusive_start }
-  , end_{ utils::to_binary(end), exclusive_end }
-{
-}
-
-range_scan::range_scan(std::vector<std::byte> start, std::vector<std::byte> end)
-  : start_{ std::move(start) }
-  , end_{ std::move(end) }
-{
-}
-
-range_scan::range_scan(std::vector<std::byte> start, bool exclusive_start, std::vector<std::byte> end, bool exclusive_end)
-  : start_{ std::move(start), exclusive_start }
-  , end_{ std::move(end), exclusive_end }
+auto
+prefix_scan::to_range_scan() const -> range_scan
 {
+    return { scan_term{ prefix, false }, scan_term{ prefix + "\xf4\x8f\xfb\xfb" } };
 }
 
 auto

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

@@ -29,28 +29,24 @@
 namespace couchbase::core
 {
 struct scan_term {
-    static constexpr std::byte minimum_marker{ 0x00 };
-    static constexpr std::byte maximum_marker{ 0xff };
-
-    std::vector<std::byte> id;
+    std::string term;
     bool exclusive{ false };
 };
 
 struct range_scan {
-    range_scan() = default;
-    range_scan(scan_term start, scan_term end);
-    range_scan(std::string_view start, std::string_view end);
-    range_scan(std::string_view start, bool exclusive_start, std::string_view end, bool exclusive_end);
-    range_scan(std::vector<std::byte> start, std::vector<std::byte> end);
-    range_scan(std::vector<std::byte> start, bool exclusive_start, std::vector<std::byte> end, bool exclusive_end);
-
-    scan_term start_{ { scan_term::minimum_marker } };
-    scan_term end_{ { scan_term::maximum_marker } };
+    std::optional<scan_term> from{};
+    std::optional<scan_term> to{};
+};
+
+struct prefix_scan {
+    std::string prefix{};
+
+    [[nodiscard]] auto to_range_scan() const -> range_scan;
 };
 
 struct sampling_scan {
     std::size_t limit{};
-    std::optional<std::uint32_t> seed{};
+    std::optional<std::uint64_t> seed{};
 };
 
 struct range_snapshot_requirements {
@@ -62,7 +58,7 @@ struct range_snapshot_requirements {
 struct range_scan_create_options {
     std::string scope_name{};
     std::string collection_name{};
-    std::variant<std::monostate, range_scan, sampling_scan> scan_type{};
+    std::variant<std::monostate, range_scan, prefix_scan, sampling_scan> scan_type{};
     std::chrono::milliseconds timeout{};
     std::uint32_t collection_id{ 0 };
     std::optional<range_snapshot_requirements> snapshot_requirements{};
@@ -88,10 +84,10 @@ struct range_scan_continue_options {
 
     std::uint32_t batch_item_limit{ default_batch_item_limit };
     std::uint32_t batch_byte_limit{ default_batch_byte_limit };
+    std::chrono::milliseconds timeout{};
     std::chrono::milliseconds batch_time_limit{ default_batch_time_limit };
     std::shared_ptr<couchbase::retry_strategy> retry_strategy{ nullptr };
 
-    bool ids_only{ false }; // support servers before MB-54267. TODO: remove after server GA
     struct {
         std::string user{};
     } internal{};
@@ -126,7 +122,7 @@ struct range_scan_item_body {
 };
 
 struct range_scan_item {
-    std::vector<std::byte> key{};
+    std::string key{};
     std::optional<range_scan_item_body> body{};
 };