couchbase 4.0.0 → 4.1.2

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/events_to_string.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/include_json.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/integer.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/jaxn_ostream.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/jaxn_parse.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/jaxn_parts_parser.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/json_ostream.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/json_parse.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/json_parts_parser.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/json_pointer.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/key_camel_case_to_snake_case.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/key_snake_case_to_camel_case.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/literal.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/main.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_INCLUDE_SRC_TEST_MAIN_HPP

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/third_party/json/src/test/json/make_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/msgpack.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/object_construction.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/opaque_pointer.cpp

@@ -1,8 +1,9 @@
-// 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"
 
+#include <tao/json/events/capture.hpp>
 #include <tao/json/events/produce.hpp>
 #include <tao/json/from_string.hpp>
 #include <tao/json/produce.hpp>
@@ -13,101 +14,6 @@
 
 namespace tao::json
 {
-   namespace events
-   {
-      template< template< typename... > class Traits, typename Consumer >
-      struct array_t
-      {
-         Consumer* c_;
-
-         explicit array_t( Consumer& c ) noexcept( noexcept( c_->begin_array() ) )
-            : c_( &c )
-         {
-            c_->begin_array();
-         }
-
-         array_t( const array_t& ) = delete;
-
-         array_t( array_t&& r ) noexcept
-            : c_( r.c_ )
-         {
-            r.c_ = nullptr;
-         }
-
-         ~array_t()
-         {
-            if( c_ ) {
-               c_->end_array();
-            }
-         }
-
-         void operator=( const array_t& ) = delete;
-         void operator=( array_t&& ) = delete;
-
-         template< typename T >
-         array_t& push_back( T&& v )
-         {
-            assert( c_ );
-            produce< Traits >( *c_, std::forward< T >( v ) );
-            c_->element();
-            return *this;
-         }
-      };
-
-      template< template< typename... > class Traits, typename Consumer >
-      struct object_t
-      {
-         Consumer* c_;
-
-         explicit object_t( Consumer& c ) noexcept( noexcept( c_->begin_object() ) )
-            : c_( &c )
-         {
-            c_->begin_object();
-         }
-
-         object_t( const object_t& ) = delete;
-
-         object_t( object_t&& r ) noexcept
-            : c_( r.c_ )
-         {
-            r.c_ = nullptr;
-         }
-
-         ~object_t()
-         {
-            if( c_ ) {
-               c_->end_object();
-            }
-         }
-
-         void operator=( const object_t& ) = delete;
-         void operator=( object_t&& ) = delete;
-
-         template< typename T >
-         object_t& insert( const std::string& k, T&& v )
-         {
-            assert( c_ );
-            c_->key( k );
-            produce< Traits >( *c_, std::forward< T >( v ) );
-            c_->member();
-            return *this;
-         }
-      };
-
-      template< template< typename... > class Traits, typename Consumer >
-      [[nodiscard]] array_t< Traits, Consumer > array( 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 ) ) )
-      {
-         return object_t< Traits, Consumer >( c );
-      }
-
-   }  // namespace events
-
    struct point
    {
       double x = 1.0;

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/examples/game_server.cxx

@@ -248,7 +248,7 @@ main(int, const char*[])
         couchbase::operations::upsert_request req{ player_id };
         nlohmann::json j;
         to_json(j, player_data);
-        req.value = j.dump();
+        req.value = couchbase::utils::to_binary(j.dump());
         auto barrier = std::make_shared<std::promise<couchbase::operations::upsert_response>>();
         cluster->execute(req, [barrier](couchbase::operations::upsert_response resp) { barrier->set_value(resp); });
         auto f = barrier->get_future();
@@ -260,7 +260,7 @@ main(int, const char*[])
         couchbase::operations::upsert_request req{ monster_id };
         nlohmann::json j;
         to_json(j, monster_data);
-        req.value = j.dump();
+        req.value = couchbase::utils::to_binary(j.dump());
         auto barrier = std::make_shared<std::promise<couchbase::operations::upsert_response>>();
         auto f = barrier->get_future();
         cluster->execute(req, [barrier](couchbase::operations::upsert_response resp) { barrier->set_value(resp); });

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

@@ -57,6 +57,21 @@ namespace transactions
         return "MAJORITY";
     }
 
+    static std::string durability_level_to_string_for_query(durability_level l)
+    {
+        switch (l) {
+            case durability_level::NONE:
+                return "none";
+            case durability_level::MAJORITY:
+                return "majority";
+            case durability_level::MAJORITY_AND_PERSIST_TO_ACTIVE:
+                return "majorityAndPersistToActive";
+            case durability_level::PERSIST_TO_MAJORITY:
+                return "persistToMajority";
+        }
+        return "majority";
+    }
+
     static std::string store_durability_level_to_string(durability_level l)
     {
         switch (l) {

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_;
     }
@@ -72,6 +72,18 @@ class per_transaction_config
     {
         return expiration_time_;
     }
+
+    per_transaction_config& custom_metadata_collection(const transaction_keyspace& keyspace)
+    {
+        custom_metadata_collection_.emplace(keyspace);
+        return *this;
+    }
+
+    std::optional<transaction_keyspace> custom_metadata_collection()
+    {
+        return custom_metadata_collection_;
+    }
+
     transaction_config apply(const transaction_config& conf) const
     {
         transaction_config retval = conf;
@@ -87,14 +99,18 @@ class per_transaction_config
         if (expiration_time_) {
             retval.expiration_time(*expiration_time_);
         }
+        if (custom_metadata_collection_) {
+            retval.custom_metadata_collection(*custom_metadata_collection_);
+        }
         return retval;
     }
 
   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_;
+    std::optional<transaction_keyspace> custom_metadata_collection_;
 };
 
 } // namespace couchbase::transactions