couchbase 4.0.0 → 4.1.0

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/opaque_pointer.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"
@@ -95,13 +95,13 @@ namespace tao::json
       };
 
       template< template< typename... > class Traits, typename Consumer >
-      [[nodiscard]] array_t< Traits, Consumer > array( Consumer& c ) noexcept( noexcept( array_t< Traits, Consumer >( c ) ) )
+      [[nodiscard]] array_t< Traits, Consumer > array_consumer( Consumer& c ) noexcept( noexcept( array_t< Traits, Consumer >( c ) ) )
       {
          return array_t< Traits, Consumer >( c );
       }
 
       template< template< typename... > class Traits, typename Consumer >
-      [[nodiscard]] object_t< Traits, Consumer > object( Consumer& c ) noexcept( noexcept( object_t< Traits, Consumer >( c ) ) )
+      [[nodiscard]] object_t< Traits, Consumer > object_consumer( Consumer& c ) noexcept( noexcept( object_t< Traits, Consumer >( c ) ) )
       {
          return object_t< Traits, Consumer >( c );
       }
@@ -120,7 +120,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const point& data )
       {
-         auto a = events::array< Traits >( consumer );
+         auto a = events::array_consumer< Traits >( consumer );
          a.push_back( data.x );
          a.push_back( data.y );
       }
@@ -140,7 +140,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const employee& data )
       {
-         auto o = events::object< Traits >( consumer );
+         auto o = events::object_consumer< Traits >( consumer );
          o.insert( "name", data.name );
          if( !data.position.empty() ) {
             o.insert( "position", data.position );

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/operators.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/optional.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <limits>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/public_base.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/self_contained.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/sha256.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/temporary_parsing.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <bitset>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/test.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_HPP

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/test_events.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_EVENTS_HPP

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/test_types.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_TYPES_HPP

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/test_unhex.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_UNHEX_HPP

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/type.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/ubjson.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/uri_fragment.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/validate_event_interfaces.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"
@@ -24,6 +24,7 @@
 #include <tao/json/events/validate_event_order.hpp>
 #include <tao/json/events/validate_keys.hpp>
 #include <tao/json/events/virtual_ref.hpp>
+#include <tao/json/events/virtual_wrap.hpp>
 
 #include <tao/json/events/binary_to_base64.hpp>
 #include <tao/json/events/binary_to_base64url.hpp>
@@ -116,6 +117,7 @@ namespace tao::json
 
       check_consumer_impl< events::ref< Consumer > >();
       check_consumer_impl< events::virtual_ref< Consumer > >();
+      check_consumer_impl< events::virtual_wrap< Consumer > >();
 
       check_consumer_impl< events::tee< Consumer > >();
       check_consumer_impl< events::tee< events::discard, Consumer > >();

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/validate_utf8.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/value_access.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/value_basics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <algorithm>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/value_create.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <limits>
@@ -104,8 +104,8 @@ namespace tao::json
       test_signed< T >( -1 );
       test_signed< T >( 42 );
       test_signed< T >( -42 );
-      test_signed< T >( (std::numeric_limits< T >::min)() );
-      test_signed< T >( (std::numeric_limits< T >::max)() );
+      test_signed< T >( ( std::numeric_limits< T >::min )() );
+      test_signed< T >( ( std::numeric_limits< T >::max )() );
    }
 
    template< typename T >
@@ -127,8 +127,8 @@ namespace tao::json
       test_unsigned< T >( 0 );
       test_unsigned< T >( 1 );
       test_unsigned< T >( 42 );
-      test_unsigned< T >( (std::numeric_limits< T >::min)() );
-      test_unsigned< T >( (std::numeric_limits< T >::max)() );
+      test_unsigned< T >( ( std::numeric_limits< T >::min )() );
+      test_unsigned< T >( ( std::numeric_limits< T >::max )() );
    }
 
    void test_double( const double d )

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/value_ptr.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/value_subscript.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/with_arguments.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/include/couchbase/transactions/internal/utils.hxx

@@ -377,36 +377,33 @@ namespace transactions
     {
         couchbase::operations::management::bucket_get_all_request req{};
         // don't wrap this one, as the kv timeout isn't appropriate here.
-        std::mutex mtx;
-        std::condition_variable cv;
+        auto mtx = std::make_shared<std::mutex>();
+        auto cv = std::make_shared<std::condition_variable>();
         size_t count = 1; // non-zero so we know not to stop waiting immediately
         std::list<std::string> bucket_names;
-        c.execute(req, [&cv, &bucket_names, &c, &mtx, &count](couchbase::operations::management::bucket_get_all_response resp) {
-            std::unique_lock<std::mutex> lock(mtx);
+        c.execute(req, [cv, &bucket_names, &c, mtx, &count](couchbase::operations::management::bucket_get_all_response resp) {
+            std::unique_lock<std::mutex> lock(*mtx);
             // now set count to correct # of buckets to try to open
             count = resp.buckets.size();
             lock.unlock();
             for (auto& b : resp.buckets) {
                 // open the bucket
-                c.open_bucket(b.name, [&cv, name = b.name, &bucket_names, &mtx, &count](std::error_code ec) {
-                    std::unique_lock<std::mutex> lock(mtx);
+                c.open_bucket(b.name, [cv, name = b.name, &bucket_names, mtx, &count](std::error_code ec) {
+                    std::unique_lock<std::mutex> lock(*mtx);
                     if (!ec) {
                         // push bucket name into list only if we successfully opened it
                         bucket_names.push_back(name);
                     }
-                    count--;
-                    bool should_notify = (count == 0);
-                    lock.unlock();
-                    if (should_notify) {
-                        cv.notify_all();
+                    if (--count == 0) {
+                        cv->notify_all();
                     }
+                    lock.unlock();
                 });
             }
         });
-        std::unique_lock<std::mutex> lock(mtx);
-        cv.wait(lock, [&count]() { return count == 0; });
+        std::unique_lock<std::mutex> lock(*mtx);
+        cv->wait(lock);
         return bucket_names;
     }
-
 } // namespace transactions
 } // namespace couchbase

package/deps/couchbase-transactions-cxx/include/couchbase/transactions/per_transaction_config.hxx

@@ -44,12 +44,12 @@ class per_transaction_config
     {
         return durability_;
     }
-    per_transaction_config& scan_consistency(query_request::scan_consistency_type scan_consistency)
+    per_transaction_config& scan_consistency(couchbase::query_scan_consistency scan_consistency)
     {
         scan_consistency_ = scan_consistency;
         return *this;
     }
-    std::optional<query_request::scan_consistency_type> scan_consistency()
+    std::optional<couchbase::query_scan_consistency> scan_consistency()
     {
         return scan_consistency_;
     }
@@ -92,7 +92,7 @@ class per_transaction_config
 
   private:
     std::optional<couchbase::transactions::durability_level> durability_;
-    std::optional<query_request::scan_consistency_type> scan_consistency_;
+    std::optional<couchbase::query_scan_consistency> scan_consistency_;
     std::optional<milliseconds> kv_timeout_;
     std::optional<nanoseconds> expiration_time_;
 };

package/deps/couchbase-transactions-cxx/include/couchbase/transactions/transaction_config.hxx

@@ -147,7 +147,7 @@ namespace transactions
          *
          * @param scan_consistency Desired default scan consistency
          */
-        void scan_consistency(couchbase::operations::query_request::scan_consistency_type scan_consistency)
+        void scan_consistency(couchbase::query_scan_consistency scan_consistency)
         {
             scan_consistency_ = scan_consistency;
         }
@@ -156,7 +156,7 @@ namespace transactions
          *
          * @return scan consistency for transactional query operations.
          */
-        CB_NODISCARD operations::query_request::scan_consistency_type scan_consistency() const
+        CB_NODISCARD couchbase::query_scan_consistency scan_consistency() const
         {
             return scan_consistency_;
         }
@@ -250,7 +250,7 @@ namespace transactions
         bool cleanup_client_attempts_;
         std::unique_ptr<attempt_context_testing_hooks> attempt_context_hooks_;
         std::unique_ptr<cleanup_testing_hooks> cleanup_hooks_;
-        couchbase::operations::query_request::scan_consistency_type scan_consistency_;
+        couchbase::query_scan_consistency scan_consistency_;
         std::optional<couchbase::document_id> custom_metadata_collection_;
     };
 } // namespace transactions

package/deps/couchbase-transactions-cxx/include/couchbase/transactions/transaction_query_options.hxx

@@ -51,13 +51,13 @@ class transaction_query_options
         return *this;
     }
 
-    transaction_query_options& scan_consistency(couchbase::operations::query_request::scan_consistency_type scan_consistency)
+    transaction_query_options& scan_consistency(couchbase::query_scan_consistency scan_consistency)
     {
         query_req_.scan_consistency = scan_consistency;
         return *this;
     }
 
-    transaction_query_options& profile(couchbase::operations::query_request::profile_mode mode)
+    transaction_query_options& profile(couchbase::query_profile_mode mode)
     {
         query_req_.profile = mode;
         return *this;

package/deps/couchbase-transactions-cxx/src/transactions/attempt_context_impl.cxx

@@ -725,10 +725,8 @@ attempt_context_impl::query_begin_work(Handler&& cb)
                STAGE_QUERY_BEGIN_WORK,
                true,
                [this, cb = std::move(cb)](std::exception_ptr err, operations::query_response resp) mutable {
-                   if (resp.ctx.last_dispatched_to) {
-                       trace("begin_work setting query node to {}", *resp.ctx.last_dispatched_to);
-                       op_list_.set_query_node(resp.ctx.last_dispatched_to.value());
-                   }
+                   trace("begin_work setting query node to {}", resp.served_by_node);
+                   op_list_.set_query_node(resp.served_by_node);
                    return cb(err);
                });
 }

package/deps/couchbase-transactions-cxx/src/transactions/transaction_config.cxx

@@ -31,7 +31,7 @@ namespace transactions
       , cleanup_client_attempts_(true)
       , attempt_context_hooks_(new attempt_context_testing_hooks())
       , cleanup_hooks_(new cleanup_testing_hooks())
-      , scan_consistency_(operations::query_request::scan_consistency_type::request_plus)
+      , scan_consistency_(couchbase::query_scan_consistency::request_plus)
     {
     }
 

package/deps/couchbase-transactions-cxx/tests/transactions/transaction_context_t.cpp

@@ -373,7 +373,7 @@ TEST(SimpleTxnContext, CanSetPerTxnConfig)
     auto txns = TransactionsTestEnvironment::get_transactions();
     auto id = TransactionsTestEnvironment::get_document_id();
     per_transaction_config per_txn_cfg;
-    per_txn_cfg.scan_consistency(couchbase::operations::query_request::scan_consistency_type::not_bounded);
+    per_txn_cfg.scan_consistency(couchbase::query_scan_consistency::not_bounded);
     per_txn_cfg.expiration_time(std::chrono::milliseconds(1)).kv_timeout(std::chrono::milliseconds(2));
     per_txn_cfg.durability_level(couchbase::transactions::durability_level::NONE);
     transaction_context tx(txns, per_txn_cfg);

package/deps/couchbase-transactions-cxx/tests/transactions/transactions_env.h

@@ -83,7 +83,6 @@ struct conn {
     {
         couchbase::cluster_credentials auth{};
         {
-            couchbase::logger::create_console_logger();
             if (auto env_val = std::getenv("COUCHBASE_CXX_CLIENT_LOG_LEVEL")) {
                 couchbase::logger::set_log_levels(couchbase::logger::level_from_str(env_val));
             }

package/deps/couchbase-transactions-cxx/tests/transactions/utils_t.cpp

@@ -230,3 +230,29 @@ TEST(GetBuckets, CanGetBuckets)
     ASSERT_NE(buckets.end(), std::find(buckets.begin(), buckets.end(), std::string("default")));
     ASSERT_NE(buckets.end(), std::find(buckets.begin(), buckets.end(), std::string("secBucket")));
 }
+TEST(GetBuckets, CanRaceToGetAndOpenBuckets)
+{
+    std::list<std::future<std::list<std::string>>> futures;
+    size_t num_futures = 20;
+    auto& c = TransactionsTestEnvironment::get_cluster();
+    for (int i = 0; i < num_futures; i++) {
+        futures.push_back(std::move(std::async(std::launch::async, [&c] { return get_and_open_buckets(c); })));
+    }
+    for (auto& f : futures) {
+        EXPECT_NO_THROW(f.get());
+    }
+}
+TEST(GetBuckets, CanGetAndOpenBucketsInMultipleThreads)
+{
+    std::list<std::future<std::list<std::string>>> futures;
+    size_t num_futures = 20;
+    for (int i = 0; i < num_futures; i++) {
+        futures.push_back(std::move(std::async(std::launch::async, [&] {
+            auto& c = TransactionsTestEnvironment::get_cluster();
+            return get_and_open_buckets(c);
+        })));
+    }
+    for (auto& f : futures) {
+        EXPECT_NO_THROW(f.get());
+    }
+}

package/dist/analyticsexecutor.js

@@ -26,12 +26,12 @@ class AnalyticsExecutor {
             });
         });
         const timeout = options.timeout || this._cluster.analyticsTimeout;
-        this._cluster.conn.analyticsQuery({
+        this._cluster.conn.analytics({
             statement: query,
             timeout,
             client_context_id: options.clientContextId,
-            readonly: options.readOnly,
-            priority: options.priority,
+            readonly: options.readOnly || false,
+            priority: options.priority || false,
             scope_qualifier: options.queryContext,
             scan_consistency: (0, bindingutilities_1.analyticsScanConsistencyToCpp)(options.scanConsistency),
             raw: options.raw
@@ -39,14 +39,16 @@ class AnalyticsExecutor {
                     k,
                     JSON.stringify(v),
                 ]))
-                : undefined,
-            positional_parameters: Array.isArray(options.parameters)
-                ? options.parameters
-                : undefined,
-            named_parameters: !Array.isArray(options.parameters)
-                ? options.parameters
-                : undefined,
-        }, (err, resp) => {
+                : {},
+            positional_parameters: options.parameters && Array.isArray(options.parameters)
+                ? options.parameters.map((v) => JSON.stringify(v))
+                : [],
+            named_parameters: options.parameters && !Array.isArray(options.parameters)
+                ? Object.fromEntries(Object.entries(options.parameters).map(([k, v]) => [k, JSON.stringify(v)]))
+                : {},
+            body_str: '',
+        }, (cppErr, resp) => {
+            const err = (0, bindingutilities_1.errorFromCpp)(cppErr);
             if (err) {
                 emitter.emit('error', err);
                 emitter.emit('end');