couchbase 4.2.11-rc.1 → 4.3.0

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,17 @@
 
 #pragma once
 
-#include "scan_options.hxx"
+#include "range_scan_options.hxx"
 #include "timeout_defaults.hxx"
 
+#include <couchbase/best_effort_retry_strategy.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 +39,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 };
@@ -49,7 +52,7 @@ struct range_scan_orchestrator_options {
     std::uint32_t batch_byte_limit{ range_scan_continue_options::default_batch_byte_limit };
     std::uint16_t concurrency{ default_concurrency };
 
-    std::shared_ptr<couchbase::retry_strategy> retry_strategy{ nullptr };
+    std::shared_ptr<couchbase::retry_strategy> retry_strategy{ make_best_effort_retry_strategy() };
     std::chrono::milliseconds timeout{ timeout_defaults::key_value_scan_timeout };
     std::shared_ptr<couchbase::tracing::request_span> parent_span{};
 };

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/core/transactions/atr_cleanup_entry.cxx

@@ -131,12 +131,13 @@ atr_cleanup_entry::check_atr_and_cleanup(transactions_cleanup_attempt* result)
         throw *err;
     }
     cleanup_docs(durability_level);
-    auto ec = cleanup_->config().cleanup_hooks->on_cleanup_docs_completed();
+    auto ec =
+      wait_for_hook([this](auto handler) { return cleanup_->config().cleanup_hooks->on_cleanup_docs_completed(std::move(handler)); });
     if (ec) {
         throw client_error(*ec, "on_cleanup_docs_completed hook threw error");
     }
     cleanup_entry(durability_level);
-    ec = cleanup_->config().cleanup_hooks->on_cleanup_completed();
+    ec = wait_for_hook([this](auto handler) { return cleanup_->config().cleanup_hooks->on_cleanup_completed(std::move(handler)); });
     if (ec) {
         throw client_error(*ec, "on_cleanup_completed hook threw error");
     }
@@ -246,7 +247,9 @@ atr_cleanup_entry::commit_docs(std::optional<std::vector<doc_record>> docs, dura
         do_per_doc(*docs, true, [&](transaction_get_result& doc, bool) {
             if (doc.links().has_staged_content()) {
                 auto content = doc.links().staged_content();
-                auto ec = cleanup_->config().cleanup_hooks->before_commit_doc(doc.id().key());
+                auto ec = wait_for_hook([this, key = doc.id().key()](auto handler) {
+                    return cleanup_->config().cleanup_hooks->before_commit_doc(key, std::move(handler));
+                });
                 if (ec) {
                     throw client_error(*ec, "before_commit_doc hook threw error");
                 }
@@ -288,7 +291,9 @@ atr_cleanup_entry::remove_docs(std::optional<std::vector<doc_record>> docs, dura
 {
     if (docs) {
         do_per_doc(*docs, true, [&](transaction_get_result& doc, bool is_deleted) {
-            auto ec = cleanup_->config().cleanup_hooks->before_remove_doc(doc.id().key());
+            auto ec = wait_for_hook([this, key = doc.id().key()](auto handler) mutable {
+                return cleanup_->config().cleanup_hooks->before_remove_doc(key, std::move(handler));
+            });
             if (ec) {
                 throw client_error(*ec, "before_remove_doc hook threw error");
             }
@@ -330,7 +335,9 @@ atr_cleanup_entry::remove_docs_staged_for_removal(std::optional<std::vector<doc_
     if (docs) {
         do_per_doc(*docs, true, [&](transaction_get_result& doc, bool) {
             if (doc.links().is_document_being_removed()) {
-                auto ec = cleanup_->config().cleanup_hooks->before_remove_doc_staged_for_removal(doc.id().key());
+                auto ec = wait_for_hook([this, key = doc.id().key()](auto handler) mutable {
+                    return cleanup_->config().cleanup_hooks->before_remove_doc_staged_for_removal(key, std::move(handler));
+                });
                 if (ec) {
                     throw client_error(*ec, "before_remove_doc_staged_for_removal hook threw error");
                 }
@@ -358,7 +365,9 @@ atr_cleanup_entry::remove_txn_links(std::optional<std::vector<doc_record>> docs,
 {
     if (docs) {
         do_per_doc(*docs, false, [&](transaction_get_result& doc, bool) {
-            auto ec = cleanup_->config().cleanup_hooks->before_remove_links(doc.id().key());
+            auto ec = wait_for_hook([this, key = doc.id().key()](auto handler) mutable {
+                return cleanup_->config().cleanup_hooks->before_remove_links(key, std::move(handler));
+            });
             if (ec) {
                 throw client_error(*ec, "before_remove_links hook threw error");
             }
@@ -385,7 +394,7 @@ void
 atr_cleanup_entry::cleanup_entry(durability_level dl)
 {
     try {
-        auto ec = cleanup_->config().cleanup_hooks->before_atr_remove();
+        auto ec = wait_for_hook([this](auto handler) { return cleanup_->config().cleanup_hooks->before_atr_remove(std::move(handler)); });
         if (ec) {
             throw client_error(*ec, "before_atr_remove hook threw error");
         }