couchbase 3.4.3 → 3.4.4

data/ext/couchbase/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{};
 };