couchbase 3.5.6 → 3.6.0

data/ext/couchbase/core/transactions/internal/doc_record.hxx

@@ -38,28 +38,33 @@ public:
   {
   }
 
-  [[nodiscard]] const std::string& bucket_name() const
+  [[nodiscard]] auto bucket_name() const -> const std::string&
   {
     return id_.bucket();
   }
 
-  [[nodiscard]] const std::string& id() const
+  [[nodiscard]] auto id() const -> const std::string&
   {
     return id_.key();
   }
 
-  [[nodiscard]] const std::string& collection_name() const
+  [[nodiscard]] auto scope_name() const -> const std::string&
+  {
+    return id_.scope();
+  }
+
+  [[nodiscard]] auto collection_name() const -> const std::string&
   {
     return id_.collection();
   }
 
-  [[nodiscard]] const core::document_id& document_id() const
+  [[nodiscard]] auto document_id() const -> const core::document_id&
   {
     return id_;
   }
 
   template<typename OStream>
-  friend OStream& operator<<(OStream& os, const doc_record& dr)
+  friend auto operator<<(OStream& os, const doc_record& dr) -> OStream&
   {
     os << "doc_record{";
     os << "bucket: " << dr.id_.bucket() << ",";
@@ -70,7 +75,13 @@ public:
     return os;
   }
 
+  friend auto operator==(const doc_record& doc, const core::document_id& id) -> bool;
+
 private:
   core::document_id id_;
 };
+
+auto
+operator==(const doc_record& doc, const core::document_id& id) -> bool;
+
 } // namespace couchbase::core::transactions

data/ext/couchbase/core/transactions/internal/exceptions_internal.hxx

@@ -137,6 +137,18 @@ public:
     , cause_(external_exception_from_error_class(ec))
   {
   }
+  explicit transaction_operation_failed(error_class ec,
+                                        std::optional<external_exception> cause,
+                                        const std::string& what)
+    : std::runtime_error(what)
+    , ec_(ec)
+    , retry_(false)
+    , rollback_(true)
+    , to_raise_(FAILED)
+    , cause_(cause.value_or(UNKNOWN) == UNKNOWN ? external_exception_from_error_class(ec)
+                                                : cause.value_or(UNKNOWN))
+  {
+  }
   explicit transaction_operation_failed(const client_error& client_err)
     : std::runtime_error(client_err.what())
     , ec_(client_err.ec())

data/ext/couchbase/core/transactions/internal/transaction_context.hxx

@@ -101,6 +101,18 @@ public:
   void get_replica_from_preferred_server_group(const core::document_id& id,
                                                async_attempt_context::Callback&& cb);
 
+  void get_multi_replicas_from_preferred_server_group(
+    const std::vector<core::document_id>& ids,
+    transaction_get_multi_replicas_from_preferred_server_group_mode mode,
+    std::function<
+      void(std::exception_ptr,
+           std::optional<transaction_get_multi_replicas_from_preferred_server_group_result>)>&& cb);
+
+  void get_multi(
+    const std::vector<core::document_id>& ids,
+    transaction_get_multi_mode mode,
+    std::function<void(std::exception_ptr, std::optional<transaction_get_multi_result>)>&& cb);
+
   void get_optional(const core::document_id& id, async_attempt_context::Callback&& cb);
 
   void insert(const core::document_id& id,
@@ -133,6 +145,7 @@ public:
   void handle_error(const std::exception_ptr& err, txn_complete_callback&& callback);
 
   auto remaining() const -> std::chrono::nanoseconds;
+  [[nodiscard]] auto expiry_time() const -> std::chrono::steady_clock::time_point;
 
 private:
   transaction_context(transactions& txns,

data/ext/couchbase/core/transactions/internal/transaction_fields.hxx

@@ -62,6 +62,7 @@ static const std::string ATR_BUCKET_NAME = TRANSACTION_INTERFACE_PREFIX + "atr.b
 static const std::string ATR_COLL_NAME = TRANSACTION_INTERFACE_PREFIX + "atr.coll";
 static const std::string ATR_SCOPE_NAME = TRANSACTION_INTERFACE_PREFIX + "atr.scp";
 static const std::string STAGED_DATA = TRANSACTION_INTERFACE_PREFIX + "op.stgd";
+static const std::string STAGED_BINARY_DATA = TRANSACTION_INTERFACE_PREFIX + "op.bin";
 static const std::string TYPE = TRANSACTION_INTERFACE_PREFIX + "op.type";
 static const std::string CRC32_OF_STAGING = TRANSACTION_INTERFACE_PREFIX + "op.crc32";
 static const std::string FORWARD_COMPAT = TRANSACTION_INTERFACE_PREFIX + "fc";