couchbase 4.1.1 → 4.1.2

package/deps/couchbase-cxx-client/third_party/json/include/tao/json/events/set_value.hpp

@@ -0,0 +1,142 @@
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/json/
+
+#ifndef TAO_JSON_EVENTS_SET_VALUE_HPP
+#define TAO_JSON_EVENTS_SET_VALUE_HPP
+
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include "../binary_view.hpp"
+#include "../forward.hpp"
+#include "../type.hpp"
+
+namespace tao::json::events
+{
+   // Events consumer to build a JSON Value.
+
+   template< template< typename... > class Traits >
+   struct set_basic_value
+   {
+      std::vector< basic_value< Traits > > stack_;
+      std::vector< std::string > keys_;
+      basic_value< Traits >& value_;
+
+      set_basic_value( basic_value< Traits >& v ) noexcept
+         : value_( v )
+      {}
+
+      void null() noexcept
+      {
+         value_.set_null();
+      }
+
+      void boolean( const bool v ) noexcept
+      {
+         value_.set_boolean( v );
+      }
+
+      void number( const std::int64_t v ) noexcept
+      {
+         value_.set_signed( v );
+      }
+
+      void number( const std::uint64_t v ) noexcept
+      {
+         value_.set_unsigned( v );
+      }
+
+      void number( const double v ) noexcept
+      {
+         value_.set_double( v );
+      }
+
+      void string( const std::string_view v )
+      {
+         value_.emplace_string( v );
+      }
+
+      void string( const char* v )
+      {
+         value_.emplace_string( v );
+      }
+
+      void string( std::string&& v )
+      {
+         value_.emplace_string( std::move( v ) );
+      }
+
+      void binary( const tao::binary_view v )
+      {
+         value_.emplace_binary( v.begin(), v.end() );
+      }
+
+      void binary( std::vector< std::byte >&& v )
+      {
+         value_.emplace_binary( std::move( v ) );
+      }
+
+      void begin_array()
+      {
+         stack_.emplace_back( empty_array );
+      }
+
+      void begin_array( const std::size_t size )
+      {
+         begin_array();
+         stack_.back().get_array().reserve( size );
+      }
+
+      void element()
+      {
+         stack_.back().emplace_back( std::move( value_ ) );
+      }
+
+      void end_array( const std::size_t /*unused*/ = 0 )
+      {
+         value_ = std::move( stack_.back() );
+         stack_.pop_back();
+      }
+
+      void begin_object( const std::size_t /*unused*/ = 0 )
+      {
+         stack_.emplace_back( empty_object );
+      }
+
+      void key( const std::string_view v )
+      {
+         keys_.emplace_back( v );
+      }
+
+      void key( const char* v )
+      {
+         keys_.emplace_back( v );
+      }
+
+      void key( std::string&& v )
+      {
+         keys_.emplace_back( std::move( v ) );
+      }
+
+      void member()
+      {
+         stack_.back().try_emplace( std::move( keys_.back() ), std::move( value_ ) );
+         keys_.pop_back();
+      }
+
+      void end_object( const std::size_t /*unused*/ = 0 )
+      {
+         value_ = std::move( stack_.back() );
+         stack_.pop_back();
+      }
+   };
+
+   using set_value = set_basic_value< traits >;
+
+}  // namespace tao::json::events
+
+#endif

package/deps/couchbase-cxx-client/third_party/json/include/tao/json/events/to_value.hpp

@@ -4,14 +4,8 @@
 #ifndef TAO_JSON_EVENTS_TO_VALUE_HPP
 #define TAO_JSON_EVENTS_TO_VALUE_HPP
 
-#include <cstddef>
-#include <cstdint>
-#include <string>
-#include <string_view>
-#include <utility>
-#include <vector>
+#include "set_value.hpp"
 
-#include "../binary_view.hpp"
 #include "../value.hpp"
 
 namespace tao::json::events
@@ -20,114 +14,13 @@ namespace tao::json::events
 
    template< template< typename... > class Traits >
    struct to_basic_value
+      : set_basic_value< Traits >
    {
-      std::vector< basic_value< Traits > > stack_;
-      std::vector< std::string > keys_;
       basic_value< Traits > value;
 
-      void null()
-      {
-         value.set_null();
-      }
-
-      void boolean( const bool v )
-      {
-         value.set_boolean( v );
-      }
-
-      void number( const std::int64_t v )
-      {
-         value.set_signed( v );
-      }
-
-      void number( const std::uint64_t v )
-      {
-         value.set_unsigned( v );
-      }
-
-      void number( const double v )
-      {
-         value.set_double( v );
-      }
-
-      void string( const std::string_view v )
-      {
-         value.emplace_string( v );
-      }
-
-      void string( const char* v )
-      {
-         value.emplace_string( v );
-      }
-
-      void string( std::string&& v )
-      {
-         value.emplace_string( std::move( v ) );
-      }
-
-      void binary( const tao::binary_view v )
-      {
-         value.emplace_binary( v.begin(), v.end() );
-      }
-
-      void binary( std::vector< std::byte >&& v )
-      {
-         value.emplace_binary( std::move( v ) );
-      }
-
-      void begin_array()
-      {
-         stack_.emplace_back( empty_array );
-      }
-
-      void begin_array( const std::size_t size )
-      {
-         begin_array();
-         stack_.back().get_array().reserve( size );
-      }
-
-      void element()
-      {
-         stack_.back().emplace_back( std::move( value ) );
-      }
-
-      void end_array( const std::size_t /*unused*/ = 0 )
-      {
-         value = std::move( stack_.back() );
-         stack_.pop_back();
-      }
-
-      void begin_object( const std::size_t /*unused*/ = 0 )
-      {
-         stack_.emplace_back( empty_object );
-      }
-
-      void key( const std::string_view v )
-      {
-         keys_.emplace_back( v );
-      }
-
-      void key( const char* v )
-      {
-         keys_.emplace_back( v );
-      }
-
-      void key( std::string&& v )
-      {
-         keys_.emplace_back( std::move( v ) );
-      }
-
-      void member()
-      {
-         stack_.back().try_emplace( std::move( keys_.back() ), std::move( value ) );
-         keys_.pop_back();
-      }
-
-      void end_object( const std::size_t /*unused*/ = 0 )
-      {
-         value = std::move( stack_.back() );
-         stack_.pop_back();
-      }
+      to_basic_value() noexcept
+         : set_basic_value< Traits >( value )
+      {}
    };
 
    using to_value = to_basic_value< traits >;

package/deps/couchbase-cxx-client/third_party/json/include/tao/json/events/virtualize.hpp

@@ -0,0 +1,27 @@
+// Copyright (c) 2022 Dr. Colin Hirsch and Daniel Frey
+// Please see LICENSE for license or visit https://github.com/taocpp/json/
+
+#ifndef TAO_JSON_EVENTS_VIRTUALIZE_HPP
+#define TAO_JSON_EVENTS_VIRTUALIZE_HPP
+
+#include <type_traits>
+
+#include "virtual_base.hpp"
+#include "virtual_ref.hpp"
+
+namespace tao::json::events
+{
+   template< typename Consumer >
+   [[nodiscard]] decltype( auto ) virtualize( Consumer& c ) noexcept
+   {
+      if constexpr( std::is_base_of_v< virtual_base, Consumer > ) {
+         return c;
+      }
+      else {
+         return events::virtual_ref( c );
+      }
+   }
+
+}  // namespace tao::json::events
+
+#endif

package/deps/couchbase-cxx-client/third_party/json/include/tao/json/events.hpp

@@ -5,6 +5,7 @@
 #define TAO_JSON_EVENTS_HPP
 
 // Events producers
+#include "events/capture.hpp"
 #include "events/from_file.hpp"
 #include "events/from_input.hpp"
 #include "events/from_stream.hpp"
@@ -13,6 +14,7 @@
 #include "events/produce.hpp"
 
 // Events consumers
+#include "events/set_value.hpp"
 #include "events/to_pretty_stream.hpp"
 #include "events/to_stream.hpp"
 #include "events/to_string.hpp"
@@ -40,6 +42,7 @@
 #include "events/virtual_base.hpp"
 #include "events/virtual_ref.hpp"
 #include "events/virtual_wrap.hpp"
+#include "events/virtualize.hpp"
 
 // Events other
 #include "events/debug.hpp"

package/deps/couchbase-cxx-client/third_party/json/include/tao/json/traits.hpp

@@ -826,7 +826,7 @@ namespace tao::json
    {
       static void assign( basic_value< Traits >& v, const std::map< std::string, basic_value< Traits >, std::less<> >& o )
       {
-         v.set_object( std::move( o ) );
+         v.set_object( o );
       }
 
       static void assign( basic_value< Traits >& v, std::map< std::string, basic_value< Traits >, std::less<> >&& o ) noexcept

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

@@ -3,6 +3,7 @@
 
 #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( 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( Consumer& c ) noexcept( noexcept( object_t< Traits, Consumer >( c ) ) )
-      {
-         return object_t< Traits, Consumer >( c );
-      }
-
-   }  // namespace events
-
    struct point
    {
       double x = 1.0;
@@ -120,7 +26,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const point& data )
       {
-         auto a = events::array_consumer< Traits >( consumer );
+         auto a = events::array< Traits >( consumer );
          a.push_back( data.x );
          a.push_back( data.y );
       }
@@ -140,7 +46,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const employee& data )
       {
-         auto o = events::object_consumer< Traits >( consumer );
+         auto o = events::object< 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/.github/workflows/linters.yml

@@ -2,9 +2,9 @@ name: linters
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   clang_format:

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/.github/workflows/sanitizers.yml

@@ -2,9 +2,9 @@ name: sanitizers
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   address:
@@ -29,6 +29,10 @@ jobs:
           submodules: recursive
       - name: Initialize couchbase
         run: ./bin/init-cluster
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.job }}
       - name: Build tests
         env:
           CB_SANITIZER: asan
@@ -68,6 +72,10 @@ jobs:
           submodules: recursive
       - name: Initialize couchbase
         run: ./bin/init-cluster
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.job }}
       - name: Build tests
         env:
           CB_SANITIZER: lsan
@@ -107,6 +115,10 @@ jobs:
           submodules: recursive
       - name: Initialize couchbase
         run: ./bin/init-cluster
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.job }}
       - name: Build tests
         env:
           CB_SANITIZER: ubsan
@@ -146,6 +158,10 @@ jobs:
           submodules: recursive
       - name: Initialize couchbase
         run: ./bin/init-cluster
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ github.job }}
       - name: Build tests
         env:
           CB_SANITIZER: tsan

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/.github/workflows/tests.yml

@@ -2,16 +2,22 @@ name: tests
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
-  cheshire_cat:
+  test:
+    strategy:
+      matrix:
+        server:
+          - 7.1.0
+          - 7.0.3
+          - 6.6.5
     runs-on: ubuntu-20.04
     services:
       couchbase:
-        image: couchbase:enterprise-7.0.3
+        image: couchbase:enterprise-${{ matrix.server }}
         ports:
           - 8091-8096:8091-8096
           - 11210:11210
@@ -25,36 +31,10 @@ jobs:
           submodules: recursive
       - name: Initialize couchbase
         run: ./bin/init-cluster
-      - name: Build tests
-        run: ./bin/build-tests
-      - name: Check couchbase
-        run: ./bin/check-cluster
-      - name: Run tests
-        timeout-minutes: 15
-        env:
-          TEST_SERVER_VERSION: 7.0.3
-          TEST_CONNECTION_STRING: couchbase://127.0.0.1
-          TEST_LOG_LEVEL: trace
-        run: ./bin/run-tests
-
-  mad_hatter:
-    runs-on: ubuntu-20.04
-    services:
-      couchbase:
-        image: couchbase:enterprise-6.6.4
-        ports:
-          - 8091-8096:8091-8096
-          - 11210:11210
-    steps:
-      - name: Install build environment
-        run: |
-          sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake gcc g++ curl
-      - uses: actions/checkout@v2
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
         with:
-          submodules: recursive
-      - name: Initialize couchbase
-        run: ./bin/init-cluster
+          key: ${{ github.job }}
       - name: Build tests
         run: ./bin/build-tests
       - name: Check couchbase
@@ -62,7 +42,7 @@ jobs:
       - name: Run tests
         timeout-minutes: 15
         env:
-          TEST_SERVER_VERSION: 6.6.4
+          TEST_SERVER_VERSION: ${{ matrix.server }}
           TEST_CONNECTION_STRING: couchbase://127.0.0.1
           TEST_LOG_LEVEL: trace
         run: ./bin/run-tests

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/.github/workflows/windows.yml

@@ -2,13 +2,16 @@ name: windows
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
-  vs22:
-    runs-on: windows-2022
+  build:
+    strategy:
+      matrix:
+        os: [windows-2022, windows-2019]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Install build environment
         run: |
@@ -16,17 +19,12 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Build tests
-        run: ruby ./bin/build-tests.rb
-
-  vs19:
-    runs-on: windows-2019
-    steps:
-      - name: Install build environment
-        run: |
-          choco install --no-progress openssl
-      - uses: actions/checkout@v2
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
         with:
-          submodules: recursive
+          key: ${{ github.job }}-${{ matrix.os }}
+          variant: sccache
       - name: Build tests
+        env:
+          CB_CACHE_OPTION: sccache
         run: ruby ./bin/build-tests.rb

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/.gitmodules

@@ -3,7 +3,8 @@
 	url = https://github.com/microsoft/gsl.git
 [submodule "third_party/json"]
 	path = third_party/json
-	url = https://github.com/taocpp/json.git
+	url = https://github.com/couchbasedeps/taocpp-json.git
+    branch = 1.0.0-couchbase
 [submodule "third_party/spdlog"]
 	path = third_party/spdlog
 	url = https://github.com/gabime/spdlog.git

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/CMakeLists.txt

@@ -101,7 +101,12 @@ target_include_directories(
 target_link_libraries(couchbase_cxx_client PRIVATE project_options project_warnings)
 
 include(cmake/DetectStandardFilesystem.cmake)
-couchbase_cxx_check_filesystem(couchbase_cxx_client "filesystem" "std::filesystem" "stdc++fs;c++fs" STD_FILESYSTEM)
+couchbase_cxx_check_filesystem(
+  couchbase_cxx_client
+  "filesystem"
+  "std::filesystem"
+  "stdc++fs;c++fs"
+  STD_FILESYSTEM)
 if(STD_FILESYSTEM)
   message(STATUS "Using std::filesystem")
 else()

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/bin/build-tests

@@ -32,12 +32,14 @@ CB_CC=${CB_CC:-$(which ${CB_DEFAULT_CC})}
 CB_CXX=${CB_CXX:-$(which ${CB_DEFAULT_CXX})}
 CB_NUMBER_OF_JOBS=${CB_NUMBER_OF_JOBS:-1}
 CB_CMAKE_BUILD_TYPE=${CB_CMAKE_BUILD_TYPE:-Debug}
+CB_CACHE_OPTION=${CB_CACHE_OPTION:-ccache}
 
 echo "CB_CMAKE=${CB_CMAKE}"
 echo "CB_CC=${CB_CC}"
 echo "CB_CXX=${CB_CXX}"
 echo "CB_NUMBER_OF_JOBS=${CB_NUMBER_OF_JOBS}"
 echo "CB_CMAKE_BUILD_TYPE=${CB_CMAKE_BUILD_TYPE}"
+echo "CB_CACHE_OPTION=${CB_CACHE_OPTION}"
 
 CB_CMAKE_EXTRAS=
 case "${CB_SANITIZER}" in
@@ -79,6 +81,7 @@ ${CB_CMAKE}  \
     -DCMAKE_CXX_COMPILER="${CB_CXX}" \
     -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=ON \
     -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON \
+    -DCACHE_OPTION="${CB_CACHE_OPTION}" \
     ${CB_CMAKE_EXTRAS} \
     -B "${BUILD_DIR}" \
     -S "${PROJECT_ROOT}"