couchbase 4.3.1 → 4.4.1-dev.1

package/src/jstocbpp_errors.hpp

@@ -6,7 +6,7 @@
 
 #include <core/cluster.hxx>
 #include <core/operations/management/error_utils.hxx>
-#include <couchbase/query_error_context.hxx>
+#include <core/error_context/query_error_context.hxx>
 
 namespace couchnode
 {
@@ -41,9 +41,9 @@ struct js_to_cbpp_t<std::error_code> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::key_value_extended_error_info> {
+struct js_to_cbpp_t<couchbase::core::key_value_extended_error_info> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::key_value_extended_error_info &cppObj)
+    to_js(Napi::Env env, const couchbase::core::key_value_extended_error_info &cppObj)
     {
         auto resObj = Napi::Object::New(env);
         resObj.Set("reference", cbpp_to_js(env, cppObj.reference()));
@@ -53,9 +53,9 @@ struct js_to_cbpp_t<couchbase::key_value_extended_error_info> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::key_value_error_context> {
+struct js_to_cbpp_t<couchbase::core::key_value_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::key_value_error_context &ctx)
+    to_js(Napi::Env env, const couchbase::core::key_value_error_context &ctx)
     {
         if (!ctx.ec()) {
             return env.Null();
@@ -81,9 +81,9 @@ struct js_to_cbpp_t<couchbase::key_value_error_context> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::subdocument_error_context> {
+struct js_to_cbpp_t<couchbase::core::subdocument_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::subdocument_error_context &ctx)
+    to_js(Napi::Env env, const couchbase::core::subdocument_error_context &ctx)
     {
         if (!ctx.ec()) {
             return env.Null();
@@ -189,9 +189,9 @@ struct js_to_cbpp_t<couchbase::core::error_context::query> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::query_error_context> {
+struct js_to_cbpp_t<couchbase::core::query_error_context> {
     static inline Napi::Value to_js(Napi::Env env,
-                                    const couchbase::query_error_context &ctx)
+                                    const couchbase::core::query_error_context &ctx)
     {
         if (!ctx.ec()) {
             return env.Null();

package/src/jstocbpp_transactions.hpp

@@ -5,6 +5,7 @@
 #include "jstocbpp_cpptypes.hpp"
 
 #include <core/cluster.hxx>
+#include <core/error_context/transaction_error_context.hxx>
 #include <core/transactions.hxx>
 #include <core/transactions/internal/exceptions_internal.hxx>
 #include <core/utils/json.hxx>
@@ -141,8 +142,9 @@ struct js_to_cbpp_t<cbcoretxns::transaction_links> {
                 jsObj.Get("staged_attempt_id")),
             js_to_cbpp<std::optional<std::string>>(
                 jsObj.Get("staged_operation_id")),
-            js_to_cbpp<std::optional<std::vector<std::byte>>>(
+            js_to_cbpp<std::optional<couchbase::codec::encoded_value>>(
                 jsObj.Get("staged_content")),
+            {},
             js_to_cbpp<std::optional<std::string>>(jsObj.Get("cas_pre_txn")),
             js_to_cbpp<std::optional<std::string>>(jsObj.Get("revid_pre_txn")),
             js_to_cbpp<std::optional<uint32_t>>(jsObj.Get("exptime_pre_txn")),
@@ -169,7 +171,8 @@ struct js_to_cbpp_t<cbcoretxns::transaction_links> {
                    cbpp_to_js(env, res.staged_attempt_id()));
         resObj.Set("staged_operation_id",
                    cbpp_to_js(env, res.staged_operation_id()));
-        resObj.Set("staged_content", cbpp_to_js(env, res.staged_content()));
+        resObj.Set("staged_content",
+                   cbpp_to_js(env, res.staged_content_json()));
         resObj.Set("cas_pre_txn", cbpp_to_js(env, res.cas_pre_txn()));
         resObj.Set("revid_pre_txn", cbpp_to_js(env, res.revid_pre_txn()));
         resObj.Set("exptime_pre_txn", cbpp_to_js(env, res.exptime_pre_txn()));
@@ -240,7 +243,7 @@ struct js_to_cbpp_t<cbcoretxns::transaction_get_result> {
         auto jsObj = jsVal.ToObject();
         return cbcoretxns::transaction_get_result(
             js_to_cbpp<couchbase::core::document_id>(jsObj.Get("id")),
-            js_to_cbpp<std::vector<std::byte>>(jsObj.Get("content")),
+            js_to_cbpp<couchbase::codec::encoded_value>(jsObj.Get("content")),
             js_to_cbpp<couchbase::cas>(jsObj.Get("cas")).value(),
             js_to_cbpp<cbcoretxns::transaction_links>(jsObj.Get("links")),
             js_to_cbpp<std::optional<cbcoretxns::document_metadata>>(
@@ -253,7 +256,7 @@ struct js_to_cbpp_t<cbcoretxns::transaction_get_result> {
         auto resObj = Napi::Object::New(env);
         resObj.Set("id", cbpp_to_js(env, res.id()));
         resObj.Set("content",
-                   cbpp_to_js<std::vector<std::byte>>(env, res.content()));
+                   cbpp_to_js<std::vector<std::byte>>(env, res.content().data));
         resObj.Set("cas", cbpp_to_js(env, couchbase::cas{res.cas()}));
         resObj.Set("links", cbpp_to_js(env, res.links()));
         resObj.Set("metadata", cbpp_to_js(env, res.metadata()));
@@ -406,9 +409,9 @@ struct js_to_cbpp_t<cbtxns::transaction_result> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::transaction_error_context> {
+struct js_to_cbpp_t<couchbase::core::transaction_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::transaction_error_context &res)
+    to_js(Napi::Env env, const couchbase::core::transaction_error_context &res)
     {
         auto resObj = Napi::Object::New(env);
         resObj.Set("code", cbpp_to_js(env, res.ec()));
@@ -432,16 +435,18 @@ struct js_to_cbpp_t<cbcoretxns::op_exception> {
 };
 
 template <>
-struct js_to_cbpp_t<couchbase::transaction_op_error_context> {
+struct js_to_cbpp_t<couchbase::core::transaction_op_error_context> {
     static inline Napi::Value
-    to_js(Napi::Env env, const couchbase::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<couchbase::key_value_error_context,
-                                           couchbase::query_error_context>>(
-                       env, res.cause()));
+        resObj.Set(
+            "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

@@ -64,7 +64,8 @@ Transaction::Transaction(const Napi::CallbackInfo &info)
     auto &transactions = Transactions::Unwrap(txnsJsObj)->transactions();
 
     auto txnConfig = jsToCbpp<cbtxns::transaction_options>(configJsObj);
-    _impl.reset(new cbcoretxns::transaction_context(transactions, txnConfig));
+    _impl.reset();
+    _impl = cbcoretxns::transaction_context::create(transactions, txnConfig);
 }
 
 Transaction::~Transaction()
@@ -74,7 +75,8 @@ Transaction::~Transaction()
 Napi::Value Transaction::jsNewAttempt(const Napi::CallbackInfo &info)
 {
     auto callbackJsFn = info[0].As<Napi::Function>();
-    auto cookie = RefCallCookie(info.Env(), callbackJsFn, "txnNewAttemptCallback");
+    auto cookie =
+        RefCallCookie(info.Env(), callbackJsFn, "txnNewAttemptCallback");
 
     _impl->new_attempt_context(
         [this, cookie = std::move(cookie)](std::exception_ptr err) mutable {
@@ -126,7 +128,8 @@ Napi::Value Transaction::jsInsert(const Napi::CallbackInfo &info)
     auto cookie = RefCallCookie(info.Env(), callbackJsFn, "txnInsertCallback");
 
     auto docId = jsToCbpp<couchbase::core::document_id>(optsJsObj.Get("id"));
-    auto content = jsToCbpp<std::vector<std::byte>>(optsJsObj.Get("content"));
+    auto content =
+        jsToCbpp<couchbase::codec::encoded_value>(optsJsObj.Get("content"));
 
     _impl->insert(
         docId, content,
@@ -150,7 +153,8 @@ Napi::Value Transaction::jsReplace(const Napi::CallbackInfo &info)
 
     auto doc =
         jsToCbpp<cbcoretxns::transaction_get_result>(optsJsObj.Get("doc"));
-    auto content = jsToCbpp<std::vector<std::byte>>(optsJsObj.Get("content"));
+    auto content =
+        jsToCbpp<couchbase::codec::encoded_value>(optsJsObj.Get("content"));
 
     _impl->replace(
         doc, content,
@@ -240,7 +244,8 @@ Napi::Value Transaction::jsCommit(const Napi::CallbackInfo &info)
 Napi::Value Transaction::jsRollback(const Napi::CallbackInfo &info)
 {
     auto callbackJsFn = info[0].As<Napi::Function>();
-    auto cookie = RefCallCookie(info.Env(), callbackJsFn, "txnRollbackCallback");
+    auto cookie =
+        RefCallCookie(info.Env(), callbackJsFn, "txnRollbackCallback");
 
     _impl->rollback(
         [this, cookie = std::move(cookie)](std::exception_ptr err) mutable {

package/tools/gen-bindings-js.js

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

package/tools/gen-bindings-json.py

@@ -22,6 +22,7 @@ cxx_deps_include_paths = {
     'json': ['-I{0}/json/{1}/json/include',
              '-I{0}/json/{1}/json/external/PEGTL/include'
              ],
+    'spdlog': ['-I{0}/spdlog/{1}/spdlog/include'],
 }
 
 fileList = [
@@ -62,12 +63,13 @@ fileList = [
     "couchbase/cas.hxx",
     "couchbase/error_codes.hxx",
     "couchbase/mutation_token.hxx",
-    "couchbase/key_value_status_code.hxx",
+    "core/error_context/key_value_status_code.hxx",
     "core/impl/subdoc/opcode.hxx",
     "core/impl/subdoc/command.hxx",
     "couchbase/store_semantics.hxx",
     "couchbase/persist_to.hxx",
     "couchbase/replicate_to.hxx",
+    "couchbase/read_preference.hxx",
     "core/range_scan_options.hxx",
     "core/range_scan_orchestrator_options.hxx",
     "core/query_context.hxx",
@@ -142,7 +144,7 @@ typeList = [
     "couchbase::core::operations::*",
     "couchbase::core::operations::management::*",
     "couchbase::core::tracing::request_span",
-    "couchbase::key_value_status_code",
+    "couchbase::core::key_value_status_code",
     "couchbase::core::impl::subdoc::command",
     "couchbase::core::impl::subdoc::opcode",
     "couchbase::store_semantics",
@@ -166,6 +168,7 @@ typeList = [
     "couchbase::core::range_scan_cancel_result",
     "couchbase::core::query_context",
     "couchbase::core::vector_query_combination",
+    "couchbase::read_preference"
 ]
 
 # end of configurable part

package/deps/couchbase-cxx-cache/asio/41f31469d0dd420500b334dc8c2fd3ffe7320d8e/asio/asio/COPYING

@@ -1,4 +0,0 @@
-Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-
-Distributed under the Boost Software License, Version 1.0. (See accompanying
-file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

package/deps/couchbase-cxx-cache/asio/41f31469d0dd420500b334dc8c2fd3ffe7320d8e/asio/asio/README

@@ -1,4 +0,0 @@
-asio version 1.29.0
-Released Thursday, 09 November 2023.
-
-See doc/index.html for API documentation and a tutorial.

package/deps/couchbase-cxx-cache/boringssl/e31ea00c1ea52052d2d78d44006cc88c80fa24a9/boringssl/src/crypto/obj/README

@@ -1,15 +0,0 @@
-The files nid.h, obj_mac.num, and obj_dat.h are generated from objects.txt and
-obj_mac.num. To regenerate them, run:
-
-    go run objects.go
-
-objects.txt contains the list of all built-in OIDs. It is processed by
-objects.go to output obj_mac.num, obj_dat.h, and nid.h.
-
-obj_mac.num is the list of NID values for each OID. This is an input/output
-file so NID values are stable across regenerations.
-
-nid.h is the header which defines macros for all the built-in OIDs in C.
-
-obj_dat.h contains the ASN1_OBJECTs corresponding to built-in OIDs themselves
-along with lookup tables for search by short name, OID, etc.

package/deps/couchbase-cxx-cache/boringssl/e31ea00c1ea52052d2d78d44006cc88c80fa24a9/boringssl/src/crypto/perlasm/readme

@@ -1,100 +0,0 @@
-The perl scripts in this directory are my 'hack' to generate
-multiple different assembler formats via the one origional script.
-
-The way to use this library is to start with adding the path to this directory
-and then include it.
-
-push(@INC,"perlasm","../../perlasm");
-require "x86asm.pl";
-
-The first thing we do is setup the file and type of assembler
-
-&asm_init($ARGV[0]);
-
-The first argument is the 'type'.  Currently
-'cpp', 'sol', 'a.out', 'elf' or 'win32'.
-Argument 2 is the file name.
-
-The reciprocal function is
-&asm_finish() which should be called at the end.
-
-There are 2 main 'packages'. x86ms.pl, which is the Microsoft assembler,
-and x86unix.pl which is the unix (gas) version.
-
-Functions of interest are:
-&external_label("des_SPtrans");	declare and external variable
-&LB(reg);			Low byte for a register
-&HB(reg);			High byte for a register
-&BP(off,base,index,scale)	Byte pointer addressing
-&DWP(off,base,index,scale)	Word pointer addressing
-&stack_push(num)		Basically a 'sub esp, num*4' with extra
-&stack_pop(num)			inverse of stack_push
-&function_begin(name,extra)	Start a function with pushing of
-				edi, esi, ebx and ebp.  extra is extra win32
-				external info that may be required.
-&function_begin_B(name,extra)	Same as normal function_begin but no pushing.
-&function_end(name)		Call at end of function.
-&function_end_A(name)		Standard pop and ret, for use inside functions
-&function_end_B(name)		Call at end but with poping or 'ret'.
-&swtmp(num)			Address on stack temp word.
-&wparam(num)			Parameter number num, that was push
-				in C convention.  This all works over pushes
-				and pops.
-&comment("hello there")		Put in a comment.
-&label("loop")			Refer to a label, normally a jmp target.
-&set_label("loop")		Set a label at this point.
-&data_word(word)		Put in a word of data.
-
-So how does this all hold together?  Given
-
-int calc(int len, int *data)
-	{
-	int i,j=0;
-
-	for (i=0; i<len; i++)
-		{
-		j+=other(data[i]);
-		}
-	}
-
-So a very simple version of this function could be coded as
-
-	push(@INC,"perlasm","../../perlasm");
-	require "x86asm.pl";
-	
-	&asm_init($ARGV[0]);
-
-	&external_label("other");
-
-	$tmp1=	"eax";
-	$j=	"edi";
-	$data=	"esi";
-	$i=	"ebp";
-
-	&comment("a simple function");
-	&function_begin("calc");
-	&mov(	$data,		&wparam(1)); # data
-	&xor(	$j,		$j);
-	&xor(	$i,		$i);
-
-	&set_label("loop");
-	&cmp(	$i,		&wparam(0));
-	&jge(	&label("end"));
-
-	&mov(	$tmp1,		&DWP(0,$data,$i,4));
-	&push(	$tmp1);
-	&call(	"other");
-	&add(	$j,		"eax");
-	&pop(	$tmp1);
-	&inc(	$i);
-	&jmp(	&label("loop"));
-
-	&set_label("end");
-	&mov(	"eax",		$j);
-
-	&function_end("calc");
-
-	&asm_finish();
-
-The above example is very very unoptimised but gives an idea of how
-things work.

package/deps/couchbase-cxx-cache/boringssl/e31ea00c1ea52052d2d78d44006cc88c80fa24a9/boringssl/src/pki/testdata/nist-pkits/README.chromium

@@ -1,19 +0,0 @@
-Name: NIST Public Key Interoperability Test Suite
-Short Name: NIST PKITS
-URL: http://csrc.nist.gov/groups/ST/crypto_apps_infra/pki/pkitesting.html
-Version: 1.0.1
-Date: April 14, 2011
-License: Public Domain: United States Government Work under 17 U.S.C. 105
-Shipped: no
-
-Description:
-The Public Key Interoperability Test Suite (PKITS) is a comprehensive X.509
-path validation test suite that was developed by NIST in conjunction with BAE
-Systems and NSA.  The PKITS path validation test suite is designed to cover
-most of the features specified in X.509 and RFC 3280.
-
-Local Modifications:
-Only the certs/ and crls/ directories were extracted from PKITS_data.zip.
-
-pkits_testcases-inl.h is generated from the test descriptions in PKITS.pdf
-using generate_tests.py.