couchbase 4.4.1 → 4.4.2

package/deps/couchbase-cxx-client/couchbase/query_options.hxx

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/common_options.hxx>
 #include <couchbase/error.hxx>
 #include <couchbase/mutation_state.hxx>
@@ -27,11 +26,17 @@
 
 #include <chrono>
 #include <functional>
-#include <memory>
+#include <map>
 #include <optional>
+#include <vector>
 
 namespace couchbase
 {
+namespace codec
+{
+class tao_json_serializer;
+} // namespace codec
+
 /**
  * Options for cluster#query() and scope#query().
  *
@@ -435,10 +440,12 @@ struct query_options : public common_options<query_options> {
    * @since 1.0.0
    * @committed
    */
-  template<typename Value>
+  template<typename Serializer = codec::tao_json_serializer,
+           typename Value,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   auto raw(std::string name, const Value& value) -> query_options&
   {
-    raw_[std::move(name)] = std::move(codec::tao_json_serializer::serialize(value));
+    raw_[std::move(name)] = std::move(Serializer::template serialize(value));
     return self();
   }
 
@@ -452,12 +459,14 @@ struct query_options : public common_options<query_options> {
    * @since 1.0.0
    * @committed
    */
-  template<typename... Parameters>
+  template<typename Serializer = codec::tao_json_serializer,
+           typename... Parameters,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   auto positional_parameters(const Parameters&... parameters) -> query_options&
   {
     named_parameters_.clear();
     positional_parameters_.clear();
-    encode_positional_parameters(parameters...);
+    encode_positional_parameters<Serializer>(parameters...);
     return self();
   }
 
@@ -471,12 +480,14 @@ struct query_options : public common_options<query_options> {
    * @since 1.0.0
    * @committed
    */
-  template<typename... Parameters>
+  template<typename Serializer = codec::tao_json_serializer,
+           typename... Parameters,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   auto named_parameters(const Parameters&... parameters) -> query_options&
   {
     named_parameters_.clear();
     positional_parameters_.clear();
-    encode_named_parameters(parameters...);
+    encode_named_parameters<Serializer>(parameters...);
     return self();
   }
 
@@ -546,23 +557,29 @@ struct query_options : public common_options<query_options> {
   }
 
 private:
-  template<typename Parameter, typename... Rest>
+  template<typename Serializer = codec::tao_json_serializer,
+           typename Parameter,
+           typename... Rest,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   void encode_positional_parameters(const Parameter& parameter, Rest... args)
   {
-    positional_parameters_.emplace_back(
-      std::move(codec::tao_json_serializer::serialize(parameter)));
+    positional_parameters_.emplace_back(std::move(Serializer::template serialize(parameter)));
     if constexpr (sizeof...(args) > 0) {
-      encode_positional_parameters(args...);
+      encode_positional_parameters<Serializer>(args...);
     }
   }
 
-  template<typename Name, typename Parameter, typename... Rest>
+  template<typename Serializer = codec::tao_json_serializer,
+           typename Name,
+           typename Parameter,
+           typename... Rest,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   void encode_named_parameters(const std::pair<Name, Parameter>& parameter, Rest... args)
   {
     named_parameters_[parameter.first] =
-      std::move(codec::tao_json_serializer::serialize(parameter.second));
+      std::move(Serializer::template serialize(parameter.second));
     if constexpr (sizeof...(args) > 0) {
-      encode_named_parameters(args...);
+      encode_named_parameters<Serializer>(args...);
     }
   }
 

package/deps/couchbase-cxx-client/couchbase/query_result.hxx

@@ -17,14 +17,21 @@
 
 #pragma once
 
-#include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/query_meta_data.hxx>
 
+#include <couchbase/codec/encoded_value.hxx>
+#include <couchbase/codec/serializer_traits.hxx>
+
 #include <vector>
 
 namespace couchbase
 {
 
+namespace codec
+{
+class tao_json_serializer;
+}
+
 /**
  * Represents result of @ref cluster#query() and @ref scope#query() calls.
  *
@@ -75,7 +82,7 @@ public:
     return rows_;
   }
 
-  template<typename Serializer,
+  template<typename Serializer = codec::tao_json_serializer,
            typename Document = typename Serializer::document_type,
            std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   [[nodiscard]] auto rows_as() const -> std::vector<Document>
@@ -88,11 +95,6 @@ public:
     return rows;
   }
 
-  [[nodiscard]] auto rows_as_json() const -> std::vector<codec::tao_json_serializer::document_type>
-  {
-    return rows_as<codec::tao_json_serializer>();
-  }
-
 private:
   query_meta_data meta_data_{};
   std::vector<codec::binary> rows_{};

package/deps/couchbase-cxx-client/couchbase/query_string_query.hxx

@@ -31,15 +31,15 @@ namespace couchbase
  * parameter with the number to boost the search. For example perform
  * @ref match_query for pool in both the name and description fields, but documents having the term
  * in the name field score higher.
- * @snippet test_unit_search.cxx search-query-string-boosting
+ * @snippet{trimleft} test_unit_search.cxx search-query-string-boosting
  *
  * 2. You can perform date or numeric range searches by using the `>`, `>=`, `<`, and `<=`
  * operators, followed by a date value in quotes. For example, perform a @ref date_range_query on
  * the created field for values after September 21, 2016.
- * @snippet test_unit_search.cxx search-query-string-date-range
+ * @snippet{trimleft} test_unit_search.cxx search-query-string-date-range
  * Or, perform a @ref numeric_range_query  on the `reviews.ratings.Cleanliness` field, for values
  * greater than 4.
- * @snippet test_unit_search.cxx search-query-string-numeric-range
+ * @snippet{trimleft} test_unit_search.cxx search-query-string-numeric-range
  *
  * @see https://docs.couchbase.com/server/current/fts/fts-query-string-syntax.html definition of
  * query syntax

package/deps/couchbase-cxx-client/couchbase/regexp_query.hxx

@@ -28,7 +28,7 @@ namespace couchbase
  * Finds documents containing terms that match the specified regular expression.
  *
  * Match documents where field `reviews.content` contains words starting with `"inter"`:
- * @snippet test_unit_search.cxx search-regexp
+ * @snippet{trimleft} test_unit_search.cxx search-regexp
  *
  * @see https://docs.couchbase.com/server/current/fts/fts-supported-queries-regexp.html server
  * documentation

package/deps/couchbase-cxx-client/couchbase/search_numeric_range.hxx

@@ -19,6 +19,7 @@
 
 #include <cinttypes>
 #include <string>
+#include <variant>
 
 namespace couchbase
 {

package/deps/couchbase-cxx-client/couchbase/search_options.hxx

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <couchbase/codec/tao_json_serializer.hxx>
 #include <couchbase/common_options.hxx>
 #include <couchbase/error.hxx>
 #include <couchbase/highlight_style.hxx>
@@ -34,6 +33,11 @@
 
 namespace couchbase
 {
+namespace codec
+{
+class tao_json_serializer;
+}
+
 /**
  * Options for @ref cluster#search() and @ref scope#search().
  *
@@ -183,10 +187,12 @@ struct search_options : public common_options<search_options> {
    * @since 1.0.0
    * @committed
    */
-  template<typename Value>
+  template<typename Value,
+           typename Serializer = codec::tao_json_serializer,
+           std::enable_if_t<codec::is_serializer_v<Serializer>, bool> = true>
   auto raw(std::string name, const Value& value) -> search_options&
   {
-    raw_[std::move(name)] = std::move(codec::tao_json_serializer::serialize(value));
+    raw_[std::move(name)] = std::move(Serializer::template serialize(value));
     return self();
   }
 

package/deps/couchbase-cxx-client/couchbase/term_range_query.hxx

@@ -30,7 +30,7 @@ namespace couchbase
  * specified range. Either min or max can be omitted, but not both.
  *
  * Match documents where field `desc` contains terms in the range `("foo", "foof")`:
- * @snippet test_unit_search.cxx search-term-range
+ * @snippet{trimleft} test_unit_search.cxx search-term-range
  *
  * @see https://docs.couchbase.com/server/current/fts/fts-supported-queries-term-range.html server
  * documentation.

package/deps/couchbase-cxx-client/couchbase/transactions/async_attempt_context.hxx

@@ -36,7 +36,7 @@ using async_err_handler = std::function<void(error)>;
  * In the example below, we get 3 documents in parallel, and update each when
  * the get returns the document:
  *
- * @snippet test/test_transaction_examples.cxx simple-async-txn
+ * @snippet{trimleft} test/test_transaction_examples.cxx simple-async-txn
  */
 class async_attempt_context
 {
@@ -67,6 +67,12 @@ public:
    * @param id The unique id of the document.
    * @param handler The handler which implements @ref async_result_handler
    *
+   * Select preferred server group in connection options:
+   * @snippet{trimleft} test_integration_read_replica.cxx select-preferred_server_group
+   *
+   * Fetch document from the nodes that belong to selected server group only:
+   * @snippet{trimleft} test_transaction_examples.cxx get_replica_from_preferred_server_group-async
+   *
    * @see network_options::preferred_server_group
    * @see https://docs.couchbase.com/server/current/manage/manage-groups/manage-groups.html
    */

package/deps/couchbase-cxx-client/couchbase/transactions/attempt_context.hxx

@@ -33,7 +33,7 @@ namespace transactions
  *
  * In the example below, we get a document then replace its content:
  *
- * @snippet test/test_transaction_examples.cxx simple-blocking-txn
+ * @snippet{trimleft} test/test_transaction_examples.cxx simple-blocking-txn
  */
 
 class attempt_context
@@ -50,6 +50,17 @@ public:
    * @param id The unique id of the document.
    * @return The result of the operation, which is an @ref error and a @ref
    * transaction_get_result.
+   *
+   * The example below shows how to use custom transcoder with transactions.
+   *
+   * The type should have transcoder to be defined. The only restriction is
+   * that the transcoder should mark encoded value with either
+   * codec::codec_flags::json_common_flags or codec::codec_flags::binary_common_flags.
+   * Behavior of transcoders with any other flags is not defined.
+   *
+   * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-sync_get
+   *
+   * @see transactions::transaction_get_result for more complete example
    */
   virtual auto get(const couchbase::collection& coll,
                    const std::string& id) -> std::pair<error, transaction_get_result> = 0;
@@ -67,6 +78,12 @@ public:
    * @return The result of the operation, which is an @ref error and a @ref
    * transaction_get_result.
    *
+   * Select preferred server group in connection options:
+   * @snippet{trimleft} test_integration_read_replica.cxx select-preferred_server_group
+   *
+   * Fetch document from the nodes that belong to selected server group only:
+   * @snippet{trimleft} test_transaction_examples.cxx get_replica_from_preferred_server_group-sync
+   *
    * @see network_options::preferred_server_group
    * @see https://docs.couchbase.com/server/current/manage/manage-groups/manage-groups.html
    */
@@ -110,17 +127,26 @@ public:
   /**
    * Replace the contents of a document in a collection.
    *
-   * Replaces the contents of an existing document. Note that currently this
-   content can be either a
-   * <std::vector<std::byte>> or an object which can be serialized with the @ref
-   codec::tao_json_serializer.
-
+   * Replaces the contents of an existing document. Note that currently this content can be either a
+   * std::vector<std::byte> or an object which can be serialized with the @ref
+   * codec::tao_json_serializer.
+   *
    * @tparam Content Type of the contents of the document.
-   * @param doc Document whose content will be replaced.  This is gotten from a
-   call to @ref attempt_context::get
+   * @param doc Document whose content will be replaced.  This is gotten from a call to @ref
+   * attempt_context::get
    * @param content New content of the document.
-   * @return The result of the operation, which is an @ref error and a @ref
-   transaction_get_result.
+   * @return The result of the operation, which is an @ref error and a @ref transaction_get_result.
+   *
+   * The example below shows how to use custom transcoder with transactions.
+   *
+   * The type should have transcoder to be defined. The only restriction is
+   * that the transcoder should mark encoded value with either
+   * codec::codec_flags::json_common_flags or codec::codec_flags::binary_common_flags.
+   * Behavior of transcoders with any other flags is not defined.
+   *
+   * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-sync_replace
+   *
+   * @see transactions::transaction_get_result for more complete example
    */
   template<typename Transcoder = codec::default_json_transcoder,
            typename Document,

package/deps/couchbase-cxx-client/couchbase/transactions/transaction_get_result.hxx

@@ -16,10 +16,9 @@
 #pragma once
 
 #include <string>
-#include <vector>
 
 #include <couchbase/cas.hxx>
-#include <couchbase/codec/tao_json_serializer.hxx>
+#include <couchbase/codec/default_json_transcoder.hxx>
 #include <couchbase/collection.hxx>
 #include <couchbase/result.hxx>
 
@@ -34,7 +33,26 @@ class document_metadata;
 
 namespace couchbase::transactions
 {
-
+/**
+ * The representation of the document in context of distributed transaction.
+ *
+ * By default transactions operate on JSON documents, that is a native encoding
+ * for Couchbase, but it is possible to use any other type, as long as its
+ * transcoder can encode it into bytestring.
+ *
+ * The following example shows how to use custom type with custom encoding in
+ * context of the transactions.
+ *
+ * We start with defining the type and its transcoder.
+ * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-ledger
+ * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-ledger_transcoder
+ *
+ * Then populate initial state of the system.
+ * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-initial_state
+ *
+ * Now the actual transactional mutation of the document.
+ * @snippet{trimleft} test_transaction_examples.cxx binary_object_in_transactions-sync
+ */
 class transaction_get_result
 {
 public:
@@ -57,6 +75,11 @@ public:
     return Transcoder::template decode<Document>(content());
   }
 
+  /**
+   * Content of the document.
+   *
+   * @return content of the document.
+   */
   template<typename Transcoder, std::enable_if_t<codec::is_transcoder_v<Transcoder>, bool> = true>
   [[nodiscard]] auto content_as() const -> typename Transcoder::document_type
   {

package/deps/couchbase-cxx-client/couchbase/vector_query.hxx

@@ -52,7 +52,7 @@ public:
    * @param vector_field_name the document field that contains the vector
    * @param base64_vector_query a base64-encoded sequence of little-endian IEEE 754 floats
    *
-   * @snippet test/test_unit_search.cxx base64-vector-query
+   * @snippet{trimleft} test/test_unit_search.cxx base64-vector-query
    * @since 1.0.0
    * @committed
    */

package/deps/couchbase-cxx-client/couchbase/wildcard_query.hxx

@@ -29,7 +29,7 @@ namespace couchbase
  * characters and `?` will match `1` occurrence of any character.
  *
  * Match documents where field `reviews.content` contains words starting with `"inter"`:
- * @snippet test_unit_search.cxx search-wildcard
+ * @snippet{trimleft} test_unit_search.cxx search-wildcard
  *
  * @see https://docs.couchbase.com/server/current/fts/fts-supported-queries-wildcard.html server
  * documentation

package/deps/couchbase-cxx-client/couchbase-sdk-cxx-black-duck-manifest.yaml

@@ -23,7 +23,7 @@ components:
     versions: [ 1.2.1 ]
   asio:
     bd-id: 3739d5e9-9ad8-4845-8077-1770167a69c2
-    versions: [ 1.30.2 ]
+    versions: [ 1.31.0 ]
   json:
     bd-id: cae0f7d2-4279-473a-9f71-eabdd121d2e3
     versions: [ 1.0.0-beta.14 ]

package/package.json

@@ -54,7 +54,7 @@
     "type": "git",
     "url": "http://github.com/couchbase/couchnode.git"
   },
-  "version": "4.4.1",
+  "version": "4.4.2",
   "config": {
     "native": false
   },
@@ -79,13 +79,13 @@
     ]
   },
   "optionalDependencies": {
-    "@couchbase/couchbase-darwin-arm64-napi": "4.4.1",
-    "@couchbase/couchbase-darwin-x64-napi": "4.4.1",
-    "@couchbase/couchbase-linux-arm64-napi": "4.4.1",
-    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.1",
-    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.1",
-    "@couchbase/couchbase-linux-x64-napi": "4.4.1",
-    "@couchbase/couchbase-win32-x64-napi": "4.4.1"
+    "@couchbase/couchbase-darwin-arm64-napi": "4.4.2",
+    "@couchbase/couchbase-darwin-x64-napi": "4.4.2",
+    "@couchbase/couchbase-linux-arm64-napi": "4.4.2",
+    "@couchbase/couchbase-linuxmusl-arm64-napi": "4.4.2",
+    "@couchbase/couchbase-linuxmusl-x64-napi": "4.4.2",
+    "@couchbase/couchbase-linux-x64-napi": "4.4.2",
+    "@couchbase/couchbase-win32-x64-napi": "4.4.2"
   },
   "files": [
     "LICENSE",
@@ -119,6 +119,8 @@
     "deps/couchbase-cxx-cache/asio/*/asio/COPYING",
     "deps/couchbase-cxx-cache/asio/*/asio/asio/include/*.hpp",
     "deps/couchbase-cxx-cache/asio/*/asio/asio/include/asio/**/*.[hi]pp",
+    "deps/couchbase-cxx-cache/asio/*/asio/asio/src/asio.cpp",
+    "deps/couchbase-cxx-cache/asio/*/asio/asio/src/asio_ssl.cpp",
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/**/*.{cc,h,c,asm,S}",
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/**/CMakeLists.txt",
     "deps/couchbase-cxx-cache/boringssl/*/boringssl/LICENSE",

package/scripts/buildPrebuild.js

@@ -5,7 +5,9 @@ function buildPrebuild(
   runtimeVersion,
   useOpenSSL,
   configure,
-  setCpmCache
+  setCpmCache,
+  useCmakeJsCompile,
+  cmakeParallel
 ) {
   runtime = runtime || process.env.CN_PREBUILD_RUNTIME || 'node'
   runtimeVersion =
@@ -21,15 +23,29 @@ function buildPrebuild(
 
   // we only want to configure if setting the CPM cache
   if (configure || setCpmCache) {
-    prebuilds.configureBinary(runtime, runtimeVersion, useOpenSSL, setCpmCache)
+    prebuilds.configureBinary(
+      runtime,
+      runtimeVersion,
+      useOpenSSL,
+      setCpmCache,
+      cmakeParallel
+    )
   } else {
-    prebuilds.buildBinary(runtime, runtimeVersion, useOpenSSL)
+    prebuilds.buildBinary(
+      runtime,
+      runtimeVersion,
+      useOpenSSL,
+      useCmakeJsCompile,
+      cmakeParallel
+    )
   }
 }
 
 let configurePrebuild = false
 let setCpmCache = false
+let useCmakeJsCompile = true
 let runtime, runtimeVersion, useOpenSSL
+let cmakeParallel = 4
 const args = process.argv.slice(2)
 if (args.length > 0) {
   // --configure
@@ -89,6 +105,28 @@ if (args.length > 0) {
   if (args.includes('--use-openssl')) {
     useOpenSSL = true
   }
+
+  // --parallel=<> OR --parallel <>
+  const parallelIdx = args.findIndex((a) => a.includes('parallel'))
+  if (parallelIdx >= 0) {
+    let pv = undefined
+    if (args[parallelIdx].includes('=')) {
+      pv = args[parallelIdx].split('=')[1]
+    } else if (args.length - 1 <= parallelIdx + 1) {
+      pv = args[parallelIdx + 1]
+    }
+
+    if (pv && !isNaN(parseInt(pv))) {
+      const pvi = parseInt(pv)
+      if (pvi <= os.cpus().length) {
+        cmakeParallel = pvi
+      }
+    }
+  }
+
+  if (args.includes('--use-cmakejs-build')) {
+    useCmakeJsCompile = false
+  }
 }
 
 buildPrebuild(
@@ -96,5 +134,7 @@ buildPrebuild(
   runtimeVersion,
   useOpenSSL,
   configurePrebuild,
-  setCpmCache
+  setCpmCache,
+  useCmakeJsCompile,
+  cmakeParallel
 )