couchbase 4.4.6-dev.1 → 4.5.0

package/src/jstocbpp_autogen.hpp

@@ -296,6 +296,7 @@ struct js_to_cbpp_t<couchbase::core::management::cluster::bucket_settings> {
         js_to_cbpp<std::optional<std::uint32_t>>(
             cppObj.history_retention_duration,
             jsObj.Get("history_retention_duration"));
+        // num_vbuckets
         js_to_cbpp<
             couchbase::core::management::cluster::bucket_storage_backend>(
             cppObj.storage_backend, jsObj.Get("storage_backend"));
@@ -353,6 +354,7 @@ struct js_to_cbpp_t<couchbase::core::management::cluster::bucket_settings> {
         resObj.Set("history_retention_duration",
                    cbpp_to_js<std::optional<std::uint32_t>>(
                        env, cppObj.history_retention_duration));
+        // num_vbuckets
         resObj.Set(
             "storage_backend",
             cbpp_to_js<
@@ -2025,7 +2027,8 @@ struct js_to_cbpp_t<couchbase::core::operations::get_all_replicas_request> {
         js_to_cbpp<couchbase::core::document_id>(cppObj.id, jsObj.Get("id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
-        // read_preference
+        js_to_cbpp<couchbase::read_preference>(cppObj.read_preference,
+                                               jsObj.Get("read_preference"));
         return cppObj;
     }
     static inline Napi::Value
@@ -2038,7 +2041,8 @@ struct js_to_cbpp_t<couchbase::core::operations::get_all_replicas_request> {
         resObj.Set("timeout",
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));
-        // read_preference
+        resObj.Set("read_preference", cbpp_to_js<couchbase::read_preference>(
+                                          env, cppObj.read_preference));
         return resObj;
     }
 };
@@ -2213,7 +2217,8 @@ struct js_to_cbpp_t<couchbase::core::operations::get_any_replica_request> {
         js_to_cbpp<couchbase::core::document_id>(cppObj.id, jsObj.Get("id"));
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
-        // read_preference
+        js_to_cbpp<couchbase::read_preference>(cppObj.read_preference,
+                                               jsObj.Get("read_preference"));
         return cppObj;
     }
     static inline Napi::Value
@@ -2226,7 +2231,8 @@ struct js_to_cbpp_t<couchbase::core::operations::get_any_replica_request> {
         resObj.Set("timeout",
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));
-        // read_preference
+        resObj.Set("read_preference", cbpp_to_js<couchbase::read_preference>(
+                                          env, cppObj.read_preference));
         return resObj;
     }
 };
@@ -3146,7 +3152,8 @@ struct js_to_cbpp_t<
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
         // parent_span
-        // read_preference
+        js_to_cbpp<couchbase::read_preference>(cppObj.read_preference,
+                                               jsObj.Get("read_preference"));
         return cppObj;
     }
     static inline Napi::Value
@@ -3165,7 +3172,8 @@ struct js_to_cbpp_t<
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));
         // parent_span
-        // read_preference
+        resObj.Set("read_preference", cbpp_to_js<couchbase::read_preference>(
+                                          env, cppObj.read_preference));
         return resObj;
     }
 };
@@ -4797,7 +4805,8 @@ struct js_to_cbpp_t<
         js_to_cbpp<std::optional<std::chrono::milliseconds>>(
             cppObj.timeout, jsObj.Get("timeout"));
         // parent_span
-        // read_preference
+        js_to_cbpp<couchbase::read_preference>(cppObj.read_preference,
+                                               jsObj.Get("read_preference"));
         return cppObj;
     }
     static inline Napi::Value
@@ -4816,7 +4825,8 @@ struct js_to_cbpp_t<
                    cbpp_to_js<std::optional<std::chrono::milliseconds>>(
                        env, cppObj.timeout));
         // parent_span
-        // read_preference
+        resObj.Set("read_preference", cbpp_to_js<couchbase::read_preference>(
+                                          env, cppObj.read_preference));
         return resObj;
     }
 };
@@ -4907,6 +4917,7 @@ struct js_to_cbpp_t<couchbase::core::operations::mutate_in_request> {
         js_to_cbpp<bool>(cppObj.access_deleted, jsObj.Get("access_deleted"));
         js_to_cbpp<bool>(cppObj.create_as_deleted,
                          jsObj.Get("create_as_deleted"));
+        // revive_document
         js_to_cbpp<std::optional<std::uint32_t>>(cppObj.expiry,
                                                  jsObj.Get("expiry"));
         js_to_cbpp<couchbase::store_semantics>(cppObj.store_semantics,
@@ -4939,6 +4950,7 @@ struct js_to_cbpp_t<couchbase::core::operations::mutate_in_request> {
                    cbpp_to_js<bool>(env, cppObj.access_deleted));
         resObj.Set("create_as_deleted",
                    cbpp_to_js<bool>(env, cppObj.create_as_deleted));
+        // revive_document
         resObj.Set("expiry", cbpp_to_js<std::optional<std::uint32_t>>(
                                  env, cppObj.expiry));
         resObj.Set("store_semantics", cbpp_to_js<couchbase::store_semantics>(
@@ -4979,6 +4991,7 @@ struct js_to_cbpp_t<
         js_to_cbpp<bool>(cppObj.access_deleted, jsObj.Get("access_deleted"));
         js_to_cbpp<bool>(cppObj.create_as_deleted,
                          jsObj.Get("create_as_deleted"));
+        // revive_document
         js_to_cbpp<std::optional<std::uint32_t>>(cppObj.expiry,
                                                  jsObj.Get("expiry"));
         js_to_cbpp<couchbase::store_semantics>(cppObj.store_semantics,
@@ -5013,6 +5026,7 @@ struct js_to_cbpp_t<
                    cbpp_to_js<bool>(env, cppObj.access_deleted));
         resObj.Set("create_as_deleted",
                    cbpp_to_js<bool>(env, cppObj.create_as_deleted));
+        // revive_document
         resObj.Set("expiry", cbpp_to_js<std::optional<std::uint32_t>>(
                                  env, cppObj.expiry));
         resObj.Set("store_semantics", cbpp_to_js<couchbase::store_semantics>(

package/src/jstocbpp_transactions.hpp

@@ -8,6 +8,8 @@
 #include <core/error_context/transaction_error_context.hxx>
 #include <core/transactions.hxx>
 #include <core/transactions/internal/exceptions_internal.hxx>
+#include <core/transactions/transaction_get_multi_replicas_from_preferred_server_group_result.hxx>
+#include <core/transactions/transaction_get_multi_result.hxx>
 #include <core/utils/json.hxx>
 
 namespace cbtxns = couchbase::transactions;
@@ -263,6 +265,55 @@ struct js_to_cbpp_t<cbcoretxns::transaction_get_result> {
     }
 };
 
+template <>
+struct js_to_cbpp_t<cbcoretxns::transaction_get_multi_result> {
+    static inline cbcoretxns::transaction_get_multi_result
+    from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        return cbcoretxns::transaction_get_multi_result(
+            js_to_cbpp<
+                std::vector<std::optional<couchbase::codec::encoded_value>>>(
+                jsObj.Get("content")));
+    }
+
+    static inline Napi::Value
+    to_js(Napi::Env env, const cbcoretxns::transaction_get_multi_result &res)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set("content", cbpp_to_js(env, res.content()));
+        return resObj;
+    }
+};
+
+template <>
+struct js_to_cbpp_t<
+    cbcoretxns::
+        transaction_get_multi_replicas_from_preferred_server_group_result> {
+    static inline cbcoretxns::
+        transaction_get_multi_replicas_from_preferred_server_group_result
+        from_js(Napi::Value jsVal)
+    {
+        auto jsObj = jsVal.ToObject();
+        return cbcoretxns::
+            transaction_get_multi_replicas_from_preferred_server_group_result(
+                js_to_cbpp<std::vector<
+                    std::optional<couchbase::codec::encoded_value>>>(
+                    jsObj.Get("content")));
+    }
+
+    static inline Napi::Value
+    to_js(Napi::Env env,
+          const cbcoretxns::
+              transaction_get_multi_replicas_from_preferred_server_group_result
+                  &res)
+    {
+        auto resObj = Napi::Object::New(env);
+        resObj.Set("content", cbpp_to_js(env, res.content()));
+        return resObj;
+    }
+};
+
 template <>
 struct js_to_cbpp_t<cbtxns::transaction_query_options> {
     static inline cbtxns::transaction_query_options from_js(Napi::Value jsVal)
@@ -368,12 +419,36 @@ struct js_to_cbpp_t<cbcoretxns::transaction_operation_failed> {
     to_js(Napi::Env env, const cbcoretxns::transaction_operation_failed &err)
     {
         Napi::Error jsErr = Napi::Error::New(env, "transaction_exception");
-        jsErr.Set("ctxtype",
-                  Napi::String::New(env, "transaction_operation_failed"));
+
         jsErr.Set("should_not_retry", cbpp_to_js(env, !err.should_retry()));
         jsErr.Set("should_not_rollback",
                   cbpp_to_js(env, !err.should_rollback()));
+        if (err.cause() == cbcoretxns::external_exception::UNKNOWN) {
+            if (err.to_raise() == cbcoretxns::final_error::EXPIRED) {
+                jsErr.Set("ctxtype",
+                          Napi::String::New(env, "transaction_exception"));
+                jsErr.Set("type",
+                          cbpp_to_js(env, cbcoretxns::failure_type::EXPIRY));
+            } else if (err.to_raise() == cbcoretxns::final_error::AMBIGUOUS) {
+                jsErr.Set("ctxtype",
+                          Napi::String::New(env, "transaction_exception"));
+                jsErr.Set("type",
+                          cbpp_to_js(
+                              env, cbcoretxns::failure_type::COMMIT_AMBIGUOUS));
+            } else {
+                jsErr.Set("ctxtype", Napi::String::New(
+                                         env, "transaction_operation_failed"));
+            }
+        } else if (err.cause() == cbcoretxns::external_exception::
+                                      DOCUMENT_UNRETRIEVABLE_EXCEPTION) {
+            jsErr.Set("ctxtype",
+                      Napi::String::New(env, "transaction_op_exception"));
+        } else {
+            jsErr.Set("ctxtype",
+                      Napi::String::New(env, "transaction_operation_failed"));
+        }
         jsErr.Set("cause", cbpp_to_js(env, err.cause()));
+        jsErr.Set("message", cbpp_to_js(env, std::string(err.what())));
         return jsErr.Value();
     }
 };
@@ -436,16 +511,17 @@ struct js_to_cbpp_t<cbcoretxns::op_exception> {
 template <>
 struct js_to_cbpp_t<couchbase::core::transaction_op_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::core::transaction_op_error_context &res)
+    to_js(Napi::Env env,
+          const couchbase::core::transaction_op_error_context &res)
     {
         auto resObj = Napi::Object::New(env);
         resObj.Set("code", cbpp_to_js(env, res.ec()));
         resObj.Set(
             "cause",
-            cbpp_to_js<
-                std::variant<std::monostate, couchbase::core::key_value_error_context,
-                             couchbase::core::query_error_context>>(env,
-                                                              res.cause()));
+            cbpp_to_js<std::variant<std::monostate,
+                                    couchbase::core::key_value_error_context,
+                                    couchbase::core::query_error_context>>(
+                env, res.cause()));
         return resObj;
     }
 };

package/src/transaction.cpp

@@ -4,6 +4,8 @@
 #include "transactions.hpp"
 #include <core/transactions/internal/exceptions_internal.hxx>
 #include <core/transactions/internal/utils.hxx>
+#include <core/transactions/transaction_get_multi_replicas_from_preferred_server_group_result.hxx>
+#include <core/transactions/transaction_get_multi_result.hxx>
 #include <type_traits>
 
 namespace couchnode
@@ -39,6 +41,12 @@ void Transaction::Init(Napi::Env env, Napi::Object exports)
         {
             InstanceMethod<&Transaction::jsNewAttempt>("newAttempt"),
             InstanceMethod<&Transaction::jsGet>("get"),
+            InstanceMethod<&Transaction::jsGetReplicaFromPreferredServerGroup>(
+                "getReplicaFromPreferredServerGroup"),
+            InstanceMethod<&Transaction::jsGetMulti>("getMulti"),
+            InstanceMethod<
+                &Transaction::jsGetMultiReplicasFromPreferredServerGroup>(
+                "getMultiReplicasFromPreferredServerGroup"),
             InstanceMethod<&Transaction::jsInsert>("insert"),
             InstanceMethod<&Transaction::jsReplace>("replace"),
             InstanceMethod<&Transaction::jsRemove>("remove"),
@@ -121,6 +129,99 @@ Napi::Value Transaction::jsGet(const Napi::CallbackInfo &info)
     return info.Env().Null();
 }
 
+Napi::Value Transaction::jsGetReplicaFromPreferredServerGroup(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+    auto cookie = RefCallCookie(info.Env(), callbackJsFn, "txnGetCallback");
+
+    auto docId = jsToCbpp<couchbase::core::document_id>(optsJsObj.Get("id"));
+
+    _impl->get_replica_from_preferred_server_group(
+        docId,
+        [this, cookie = std::move(cookie)](
+            std::exception_ptr err,
+            std::optional<cbcoretxns::transaction_get_result> res) mutable {
+            cookie.invoke([err = std::move(err), res = std::move(res)](
+                              Napi::Env env, Napi::Function callback) mutable {
+                // BUG(JSCBC-1024): We should revert to using direct get
+                // operations once the underlying issue has been resolved.
+                if (!err && !res.has_value()) {
+                    callback.Call(
+                        {cbpp_to_js(env, couchbase::errc::make_error_code(
+                                             couchbase::errc::key_value::
+                                                 document_irretrievable))});
+                    return;
+                }
+
+                callback.Call({cbpp_to_js(env, err), cbpp_to_js(env, res)});
+            });
+        });
+
+    return info.Env().Null();
+}
+
+Napi::Value Transaction::jsGetMulti(const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+    auto cookie =
+        RefCallCookie(info.Env(), callbackJsFn, "txnGetMultiCallback");
+
+    auto docIds = jsToCbpp<std::vector<couchbase::core::document_id>>(
+        optsJsObj.Get("ids"));
+    auto mode =
+        jsToCbpp<cbcoretxns::transaction_get_multi_mode>(optsJsObj.Get("mode"));
+
+    _impl->get_multi(
+        docIds, mode,
+        [this, cookie = std::move(cookie)](
+            std::exception_ptr err,
+            std::optional<cbcoretxns::transaction_get_multi_result>
+                res) mutable {
+            cookie.invoke([err = std::move(err), res = std::move(res)](
+                              Napi::Env env, Napi::Function callback) mutable {
+                callback.Call({cbpp_to_js(env, err), cbpp_to_js(env, res)});
+            });
+        });
+
+    return info.Env().Null();
+}
+
+Napi::Value Transaction::jsGetMultiReplicasFromPreferredServerGroup(
+    const Napi::CallbackInfo &info)
+{
+    auto optsJsObj = info[0].As<Napi::Object>();
+    auto callbackJsFn = info[1].As<Napi::Function>();
+    auto cookie =
+        RefCallCookie(info.Env(), callbackJsFn,
+                      "txnGetMultiReplicasFromPreferredServerGroupCallback");
+
+    auto docIds = jsToCbpp<std::vector<couchbase::core::document_id>>(
+        optsJsObj.Get("ids"));
+    auto mode = jsToCbpp<
+        cbcoretxns::
+            transaction_get_multi_replicas_from_preferred_server_group_mode>(
+        optsJsObj.Get("mode"));
+
+    _impl->get_multi_replicas_from_preferred_server_group(
+        docIds, mode,
+        [this, cookie = std::move(cookie)](
+            std::exception_ptr err,
+            std::optional<
+                cbcoretxns::
+                    transaction_get_multi_replicas_from_preferred_server_group_result>
+                res) mutable {
+            cookie.invoke([err = std::move(err), res = std::move(res)](
+                              Napi::Env env, Napi::Function callback) mutable {
+                callback.Call({cbpp_to_js(env, err), cbpp_to_js(env, res)});
+            });
+        });
+
+    return info.Env().Null();
+}
+
 Napi::Value Transaction::jsInsert(const Napi::CallbackInfo &info)
 {
     auto optsJsObj = info[0].As<Napi::Object>();

package/src/transaction.hpp

@@ -26,6 +26,11 @@ public:
     Napi::Value jsNewAttempt(const Napi::CallbackInfo &info);
     Napi::Value jsFinalizeAttempt(const Napi::CallbackInfo &info);
     Napi::Value jsGet(const Napi::CallbackInfo &info);
+    Napi::Value
+    jsGetReplicaFromPreferredServerGroup(const Napi::CallbackInfo &info);
+    Napi::Value jsGetMulti(const Napi::CallbackInfo &info);
+    Napi::Value
+    jsGetMultiReplicasFromPreferredServerGroup(const Napi::CallbackInfo &info);
     Napi::Value jsInsert(const Napi::CallbackInfo &info);
     Napi::Value jsReplace(const Napi::CallbackInfo &info);
     Napi::Value jsRemove(const Napi::CallbackInfo &info);

package/tools/gen-bindings-js.js

@@ -248,7 +248,8 @@ function isIgnoredField(st, fieldName) {
     fieldName === 'parent_span' ||
     fieldName === 'retry_strategy' ||
     fieldName === 'internal' ||
-    fieldName === 'read_preference' ||
+    fieldName === 'revive_document' ||
+    fieldName === 'num_vbuckets' ||
     (fieldName.endsWith('_') &&
       !StructsWithAllowedPrivateField.includes(st.name))
   ) {

package/tools/gen-bindings-json.py

@@ -88,6 +88,9 @@ FILE_LIST = [
     "core/range_scan_orchestrator_options.hxx",
     "core/query_context.hxx",
     "core/vector_query_combination.hxx",
+    "core/transactions/exceptions.hxx",
+    "core/transactions/transaction_get_multi_mode.hxx",
+    "core/transactions/transaction_get_multi_replicas_from_preferred_server_group_mode.hxx"
 ]
 
 TYPE_LIST = [
@@ -182,7 +185,11 @@ TYPE_LIST = [
     "couchbase::core::range_scan_cancel_result",
     "couchbase::core::query_context",
     "couchbase::core::vector_query_combination",
-    "couchbase::read_preference"
+    "couchbase::read_preference",
+    "couchbase::core::transactions::failure_type",
+    "couchbase::core::transactions::external_exception",
+    "couchbase::core::transactions::transaction_get_multi_mode",
+    "couchbase::core::transactions::transaction_get_multi_replicas_from_preferred_server_group_mode",
 ]
 
 STD_COMPARATOR_TEMPLATES = ["std::less<{0}>", "std::greater<{0}>", "std::less_equal<{0}>", "std::greater_equal<{0}>"]
@@ -242,6 +249,20 @@ class BindingsGenerator:
         if version is None:
             raise ValueError('Missing LLVM version.')
 
+        print(f'Using version={version}')
+        llvm_root_dir = f'/opt/homebrew/Cellar/llvm/{version}'
+        if not os.path.exists(llvm_root_dir):
+            print(f'LLVM root directory ({llvm_root_dir}) does not exist. Attempting to find it.')
+            llvm_root_dir = None
+            for d in os.listdir(f'/opt/homebrew/Cellar/llvm'):
+                if d.startswith(version):
+                    llvm_root_dir = os.path.join('/opt/homebrew/Cellar/llvm', d)
+                    print(f'Found LLVM root directory: {llvm_root_dir}')
+                    break
+            if llvm_root_dir is None:
+                raise ValueError((f'Unable to find LLVM root directory for version {version}.'
+                                  'Please use CN_LLVM_VERSION to override.'))
+
         if includedir is None:
             includedir = os.environ.get('CN_LLVM_INCLUDE')
         if includedir is None:
@@ -270,7 +291,7 @@ class BindingsGenerator:
         self._include_paths = [
             '-I/opt/homebrew/opt/llvm/include/c++/v1',
             f'-I{CXX_CLIENT_ROOT}/',
-            f'-I/opt/homebrew/Cellar/llvm/{version}/lib/clang/{version[:2]}/include',
+            f'-I{llvm_root_dir}/lib/clang/{version[:2]}/include',
             f'-I{system_headers}/usr/include'
         ]
 
@@ -731,12 +752,16 @@ if __name__ == '__main__':
     ap.add_argument('-s',
                     '--system-headers',
                     help='SET CN_SYS_HEADERS, or use command: xcrun --show-sdk-path')
+    ap.add_argument('--verbose',
+                    action='store_true',
+                    help='Run in verbose mode',)
     options = ap.parse_args()
 
     generator = BindingsGenerator(options.version,
                                   options.libdir,
                                   options.includedir,
-                                  options.system_headers)
+                                  options.system_headers,
+                                  options.verbose)
     generator.gen_bindings()