couchbase 4.2.2 → 4.2.3

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

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
     services:
       couchbase:
-        image: couchbase:enterprise-7.0.3
+        image: couchbase:enterprise-7.1.4
         ports:
           - 8091-8096:8091-8096
           - 11210:11210
@@ -19,7 +19,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 gdb
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo bash -c "echo 'deb https://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' >> /etc/apt/sources.list"
           sudo apt-get update -y
@@ -28,6 +28,8 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env:
+          CB_TRAVEL_SAMPLE: yes
         run: ./bin/init-cluster
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -45,7 +47,7 @@ jobs:
         timeout-minutes: 30
         env:
           CB_SANITIZER: asan
-          TEST_SERVER_VERSION: 7.0.3
+          TEST_SERVER_VERSION: 7.1.4
           TEST_CONNECTION_STRING: couchbase://127.0.0.1
           TEST_LOG_LEVEL: trace
         run: ./bin/run-unit-tests
@@ -54,7 +56,7 @@ jobs:
     runs-on: ubuntu-20.04
     services:
       couchbase:
-        image: couchbase:enterprise-7.0.3
+        image: couchbase:enterprise-7.1.4
         ports:
           - 8091-8096:8091-8096
           - 11210:11210
@@ -62,7 +64,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 gdb
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo bash -c "echo 'deb https://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' >> /etc/apt/sources.list"
           sudo apt-get update -y
@@ -71,6 +73,8 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env:
+          CB_TRAVEL_SAMPLE: yes
         run: ./bin/init-cluster
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -88,7 +92,7 @@ jobs:
         timeout-minutes: 30
         env:
           CB_SANITIZER: lsan
-          TEST_SERVER_VERSION: 7.0.3
+          TEST_SERVER_VERSION: 7.1.4
           TEST_CONNECTION_STRING: couchbase://127.0.0.1
           TEST_LOG_LEVEL: trace
         run: ./bin/run-unit-tests
@@ -97,7 +101,7 @@ jobs:
     runs-on: ubuntu-20.04
     services:
       couchbase:
-        image: couchbase:enterprise-7.0.3
+        image: couchbase:enterprise-7.1.4
         ports:
           - 8091-8096:8091-8096
           - 11210:11210
@@ -105,7 +109,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 gdb
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo bash -c "echo 'deb https://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' >> /etc/apt/sources.list"
           sudo apt-get update -y
@@ -114,6 +118,8 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env:
+          CB_TRAVEL_SAMPLE: yes
         run: ./bin/init-cluster
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -131,7 +137,7 @@ jobs:
         timeout-minutes: 30
         env:
           CB_SANITIZER: ubsan
-          TEST_SERVER_VERSION: 7.0.3
+          TEST_SERVER_VERSION: 7.1.4
           TEST_CONNECTION_STRING: couchbase://127.0.0.1
           TEST_LOG_LEVEL: trace
         run: ./bin/run-unit-tests
@@ -140,7 +146,7 @@ jobs:
     runs-on: ubuntu-20.04
     services:
       couchbase:
-        image: couchbase:enterprise-7.0.3
+        image: couchbase:enterprise-7.1.4
         ports:
           - 8091-8096:8091-8096
           - 11210:11210
@@ -148,7 +154,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update -y
-          sudo apt-get install -y libssl-dev cmake curl wget gnupg2
+          sudo apt-get install -y libssl-dev cmake curl wget gnupg2 gdb
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo bash -c "echo 'deb https://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' >> /etc/apt/sources.list"
           sudo apt-get update -y
@@ -157,6 +163,8 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env:
+          CB_TRAVEL_SAMPLE: yes
         run: ./bin/init-cluster
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2
@@ -175,7 +183,7 @@ jobs:
         env:
           CB_SANITIZER: tsan
           TSAN_OPTIONS: second_deadlock_stack=1
-          TEST_SERVER_VERSION: 7.0.3
+          TEST_SERVER_VERSION: 7.1.4
           TEST_CONNECTION_STRING: couchbase://127.0.0.1
           TEST_LOG_LEVEL: trace
         run: ./bin/run-unit-tests

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

@@ -11,13 +11,13 @@ jobs:
     strategy:
       matrix:
         server:
-          - 7.1.1
-          - 7.0.3
+          - 7.1.4
+          - 7.0.5
         suite:
           - unit
           - transaction
         include:
-          - server: 6.6.5
+          - server: 6.6.6
             suite: unit
 
     runs-on: ubuntu-20.04
@@ -42,6 +42,8 @@ jobs:
         run: ./bin/init-cluster
       - name: Initialize couchbase for non-transactions testing
         if: ${{ matrix.suite != 'transaction' }}
+        env:
+          CB_TRAVEL_SAMPLE: yes
         run: ./bin/init-cluster
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2

package/deps/couchbase-cxx-client/.idea/vcs.xml

@@ -12,6 +12,8 @@
     <mapping directory="$PROJECT_DIR$/third_party/json" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/third_party/json/external/PEGTL" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/third_party/snappy" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/third_party/snappy/third_party/benchmark" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/third_party/snappy/third_party/googletest" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/third_party/spdlog" vcs="Git" />
   </component>
 </project>

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

@@ -91,7 +91,7 @@ set(couchbase_cxx_client_FILES
         core/cluster_agent_config.cxx
         core/cluster_options.cxx
         core/collections_component.cxx
-        core/config_profile.cxx
+        core/config_profiles.cxx
         core/core_sdk_shim.cxx
         core/crud_component.cxx
         core/dispatcher.cxx
@@ -255,6 +255,7 @@ set(couchbase_cxx_client_FILES
         core/utils/mutation_token.cxx
         core/utils/split_string.cxx
         core/utils/url_codec.cxx
+        core/impl/analytics.cxx
         core/impl/analytics_error_category.cxx
         core/impl/append.cxx
         core/impl/best_effort_retry_strategy.cxx
@@ -296,8 +297,6 @@ set(couchbase_cxx_client_FILES
         core/impl/retry_reason.cxx
         core/impl/search_error_category.cxx
         core/impl/streaming_json_lexter_error_category.cxx
-        core/impl/unlock.cxx
-        core/impl/watch_query_indexes.cxx
         core/impl/subdoc/array_add_unique.cxx
         core/impl/subdoc/array_append.cxx
         core/impl/subdoc/array_insert.cxx
@@ -317,9 +316,13 @@ set(couchbase_cxx_client_FILES
         core/impl/subdoc/upsert.cxx
         core/impl/touch.cxx
         core/impl/transaction_error_category.cxx
+        core/impl/transaction_get_result.cxx
         core/impl/transaction_op_error_category.cxx
+        core/impl/unlock.cxx
         core/impl/upsert.cxx
         core/impl/view_error_category.cxx
+        core/impl/watch_query_indexes.cxx
+        core/io/dns_client.cxx
         core/io/dns_config.cxx
         core/io/http_parser.cxx
         core/io/mcbp_message.cxx
@@ -328,11 +331,12 @@ set(couchbase_cxx_client_FILES
         core/transactions/atr_cleanup_entry.cxx
         core/transactions/atr_ids.cxx
         core/transactions/attempt_context_impl.cxx
+        core/transactions/attempt_context_testing_hooks.cxx
         core/transactions/binary.cxx
+        core/transactions/cleanup_testing_hooks.cxx
         core/transactions/exceptions.cxx
         core/transactions/result.cxx
         core/transactions/staged_mutation.cxx
-        core/transactions/utils.cxx
         core/transactions/transaction_attempt.cxx
         core/transactions/transaction_context.cxx
         core/transactions/transaction_get_result.cxx
@@ -341,7 +345,8 @@ set(couchbase_cxx_client_FILES
         core/transactions/transactions.cxx
         core/transactions/transactions_cleanup.cxx
         core/transactions/transactions_config.cxx
-        core/transactions/uid_generator.cxx)
+        core/transactions/uid_generator.cxx
+        core/transactions/utils.cxx)
 
 if (COUCHBASE_CXX_CLIENT_BUILD_SHARED)
     add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
@@ -398,7 +403,11 @@ if (WIN32)
 endif ()
 
 if (NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
-    target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
+    if (TARGET PkgConfig::PKG_CONFIG_OPENSSL)
+        target_link_libraries(couchbase_cxx_client PUBLIC PkgConfig::PKG_CONFIG_OPENSSL)
+    else()
+        target_link_libraries(couchbase_cxx_client PUBLIC OpenSSL::SSL OpenSSL::Crypto)
+    endif()
 endif ()
 
 option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" TRUE)

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

@@ -105,3 +105,6 @@ ${CB_CMAKE}  \
     -S "${PROJECT_ROOT}"
 
 ${CB_CMAKE} --build "${BUILD_DIR}" --parallel ${CB_NUMBER_OF_JOBS} --verbose ${CB_CMAKE_BUILD_EXTRAS}
+
+${CB_CMAKE} --build "${BUILD_DIR}" --parallel ${CB_NUMBER_OF_JOBS} --verbose --target cbc
+${BUILD_DIR}/tools/cbc version --json

package/deps/couchbase-cxx-client/bin/build-tests.rb

@@ -105,3 +105,12 @@ Dir.chdir(BUILD_DIR) do
       "--config", CB_CMAKE_BUILD_TYPE,
       "--verbose")
 end
+
+if RUBY_PLATFORM =~ /mswin|mingw/
+  cbc = Dir["#{BUILD_DIR}/**/cbc.exe"].first
+  if File.exist?(cbc)
+    run("#{cbc} version --json")
+  end
+else
+  run("#{BUILD_DIR}/tools/cbc version --json")
+end

package/deps/couchbase-cxx-client/bin/init-cluster

@@ -31,8 +31,9 @@ options = {
   password: ENV.fetch("CB_PASSWORD", "password"),
   bucket: ENV.fetch("CB_BUCKET", "default"),
   sec_bucket: ENV.fetch("CB_SEC_BUCKET", ""),
-  server_quota: ENV.fetch("CB_SERVER_QUOTA", 2048).to_i,
+  server_quota: ENV.fetch("CB_SERVER_QUOTA", 3072).to_i,
   index_quota: ENV.fetch("CB_INDEX_QUOTA", 256).to_i,
+  fts_quota: ENV.fetch("CB_FTS_QUOTA", 512).to_i,
   bucket_quota: ENV.fetch("CB_BUCKET_QUOTA", 256).to_i,
   enable_developer_preview: ENV.fetch("CB_DEVELOPER_PREVIEW", false).to_b,
   cluster_run_nodes: ENV.fetch("CB_CLUSTER_RUN_NODES", 0).to_i,
@@ -90,6 +91,10 @@ class API
   rescue EOFError
     connect
     retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
   end
 
   def post_form(path, fields = {})
@@ -102,6 +107,10 @@ class API
   rescue EOFError
     connect
     retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
   end
 
   def post_json(path, object)
@@ -114,19 +123,29 @@ class API
   rescue EOFError
     connect
     retry
+  rescue => ex
+    puts "#{__method__}: #{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
   end
 end
 
-sleep(1)
-
-api = API.new(options)
+api = 
+  begin
+    API.new(options)
+  rescue => ex
+    puts "#{ex}, sleep for 1 second and retry"
+    sleep(1)
+    retry
+  end
 
 resp = api.get("/pools")
 services = resp['allowedServices']
 
 api.post_form("/pools/default",
               memoryQuota: options[:server_quota],
-              indexMemoryQuota: options[:index_quota])
+              indexMemoryQuota: options[:index_quota],
+              ftsMemoryQuota: options[:fts_quota])
 api.post_form("/node/controller/setupServices", services: services.join(","))
 
 if options[:strict_encryption]
@@ -200,13 +219,21 @@ api.post_json("/sampleBuckets/install", options[:sample_buckets].to_a) if option
 
 api.post_form("/settings/developerPreview", enabled: true) if options[:enable_developer_preview]
 
-query_port = 0
-while query_port.zero?
+def query_port_for_bucket(api, name, options)
   query_port_key = options[:strict_encryption] ? "n1qlSSL" : "n1ql"
-  config = api.get("/pools/default/b/#{options[:bucket]}")
-  query_port = config["nodesExt"][0]["services"][query_port_key].to_i
-  sleep 1
+  query_port = 0
+  while query_port.zero?
+    config = api.get("/pools/default/b/#{name}")
+    query_port = config["nodesExt"][0]["services"][query_port_key].to_i
+    sleep 1
+  end
+  query_port
 end
 
-query_api = API.new(options.merge(port: query_port))
+
+query_api = API.new(options.merge(port: query_port_for_bucket(api, options[:bucket], options)))
 query_api.post_form("/query/service", statement: "CREATE PRIMARY INDEX ON `#{options[:bucket]}` USING GSI")
+options[:sample_buckets].each do |bucket|
+  query_port_for_bucket(api, bucket, options)
+  query_api.post_form("/query/service", statement: "CREATE PRIMARY INDEX ON `#{bucket}` USING GSI")
+end

package/deps/couchbase-cxx-client/bin/run-unit-tests

@@ -21,6 +21,7 @@ echo "NODE_NAME=${NODE_NAME}"
 echo "CONTAINER_TAG=${CONTAINER_TAG}"
 echo "JENKINS_SLAVE_LABELS=${JENKINS_SLAVE_LABELS}"
 echo "NODE_LABELS=${NODE_LABELS}"
+echo "TEST_DEPLOYMENT_TYPE=${TEST_DEPLOYMENT_TYPE}"
 
 CB_CTEST=${CB_CTEST:-$(which ctest)}
 CB_SANITIZER=${CB_SANITIZER:-""}
@@ -70,16 +71,15 @@ then
              rm -rf $crash /tmp/the_crash
            fi
         done
-    else
-        for core in /tmp/core.* "${PWD}/core*"
-        do
-            echo $core
-            executable=$(file $core | ruby -e "print ARGF.read[/execfn: '([^']+)'/, 1]")
-            echo $executable
-            gdb $executable $core --batch -ex "thread apply all bt"
-            rm -f $core
-        done
     fi
+    for core in /tmp/core.* "${PWD}/core*"
+    do
+        echo $core
+        executable=$(file $core | ruby -e "print ARGF.read[/execfn: '([^']+)'/, 1]")
+        echo $executable
+        gdb $executable $core --batch -ex "thread apply all bt"
+        rm -f $core
+    done
 fi
 
 exit $STATUS

package/deps/couchbase-cxx-client/cmake/CompilerWarnings.cmake

@@ -67,8 +67,8 @@ function(set_project_warnings project_name)
       -Wuseless-cast # warn if you perform a cast to the same type
       -Wdeprecated-declarations # warn if [[deprecated]] elements being used
   )
-  set(CLANG_WARNINGS ${COMMON_WARNINGS}
-      -Wshadow # warn the user if a variable declaration shadows one from a parent context
+  set(CLANG_WARNINGS ${COMMON_WARNINGS} -Wshadow # warn the user if a variable declaration shadows one from a parent
+                                                 # context
   )
 
   if(MSVC)
@@ -76,9 +76,17 @@ function(set_project_warnings project_name)
   elseif(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
     set(PROJECT_WARNINGS ${CLANG_WARNINGS})
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0.0" AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0"
+       AND NOT
+           CMAKE_BUILD_TYPE
+           STREQUAL
+           "Debug")
       # One of the occurrences: https://github.com/chriskohlhoff/asio/pull/1176
-      set(GCC_WARNINGS ${GCC_WARNINGS} -Wno-error=null-dereference -Wno-error=array-bounds)
+      set(GCC_WARNINGS
+          ${GCC_WARNINGS}
+          -Wno-error=null-dereference
+          -Wno-error=array-bounds
+          -Wno-error=stringop-overflow)
     endif()
     set(PROJECT_WARNINGS ${GCC_WARNINGS})
   else()

package/deps/couchbase-cxx-client/cmake/Documentation.cmake

@@ -11,11 +11,12 @@ if(DOXYGEN_FOUND AND DOT)
   file(
     GLOB_RECURSE
     COUCHBASE_CXX_CLIENT_PUBLIC_HEADERS
-    ${PROJECT_SOURCE_DIR}/couchbase/*.hxx
-    ${PROJECT_SOURCE_DIR}/docs/*.hxx)
+    ${PROJECT_SOURCE_DIR}/couchbase/**/*.hxx
+    ${PROJECT_SOURCE_DIR}/docs/*.hxx
+    ${PROJECT_SOURCE_DIR}/docs/*.md)
 
   set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/couchbase)
-  set(DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/couchbase-cxx-client-${couchbase_cxx_client_VERSION})
+  set(DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/couchbase-cxx-client-${COUCHBASE_CXX_CLIENT_SEMVER})
   set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/html/index.html)
   set(DOXYGEN_CONFIG_TEMPLATE ${PROJECT_SOURCE_DIR}/docs/Doxyfile.in)
   set(DOXYGEN_CONFIG ${PROJECT_BINARY_DIR}/Doxyfile)

package/deps/couchbase-cxx-client/cmake/OpenSSL.cmake

@@ -14,11 +14,21 @@ else()
   if(NOT OPENSSL_ROOT_DIR)
     if(APPLE AND COUCHBASE_CXX_CLIENT_USE_HOMEBREW_TO_DETECT_OPENSSL)
       execute_process(
-        COMMAND brew --prefix openssl@1.1
+        COMMAND brew --prefix openssl
         OUTPUT_VARIABLE OPENSSL_ROOT_DIR
+        ERROR_VARIABLE HOMEBREW_STDERR
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
       if(OPENSSL_ROOT_DIR)
-        message(STATUS "Found OpenSSL prefix using homebrew: ${OPENSSL_ROOT_DIR}")
+        message(STATUS "Found OpenSSL prefix using Homebrew: ${OPENSSL_ROOT_DIR}")
+      else()
+        execute_process(
+          COMMAND brew --prefix openssl@1.1
+          OUTPUT_VARIABLE OPENSSL_ROOT_DIR
+          ERROR_VARIABLE HOMEBREW_STDERR
+          ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(OPENSSL_ROOT_DIR)
+          message(STATUS "Found OpenSSL 1.1 prefix using Homebrew: ${OPENSSL_ROOT_DIR}")
+        endif()
       endif()
     endif()
     if(MSVC AND COUCHBASE_CXX_CLIENT_USE_SCOOP_TO_DETECT_OPENSSL)
@@ -32,11 +42,46 @@ else()
       endif()
     endif()
   endif()
-  include(FindOpenSSL)
-  if(OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIR)
-    message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
-    message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
-    message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
+
+  find_package(OpenSSL 1.1)
+  if(OpenSSL_FOUND)
+    try_compile(
+      OPENSSL_USABLE ${CMAKE_CURRENT_BINARY_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/test_openssl.cxx
+      LINK_LIBRARIES OpenSSL::SSL CXX_STANDARD 17)
+    if( OPENSSL_USABLE)
+      message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
+      message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
+      message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
+    else()
+      if(UNIX)
+        message(
+          STATUS
+            "Cannot use OpenSSL ${OPENSSL_VERSION} at \"${OPENSSL_INCLUDE_DIR}\" and \"${OPENSSL_LIBRARIES}\". Will try to use from pkg-config."
+        )
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+        if(PKG_CONFIG_OPENSSL_FOUND)
+          message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
+          message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
+          message(STATUS "PKG_CONFIG_OPENSSL_LIBRARIES: ${PKG_CONFIG_OPENSSL_LIBRARIES}")
+        else()
+          message(FATAL_ERROR "Cannot Find OpenSSL using pkg-config, find_package() returns unusable setup")
+        endif()
+      else()
+        message(FATAL_ERROR "OpenSSL discovered by find_package() returns unusable setup")
+      endif()
+    endif()
+  elseif(UNIX)
+    find_package(PkgConfig REQUIRED)
+    pkg_check_modules(PKG_CONFIG_OPENSSL REQUIRED IMPORTED_TARGET GLOBAL openssl11)
+    if(PKG_CONFIG_OPENSSL_FOUND)
+      message(STATUS "PKG_CONFIG_OPENSSL_VERSION: ${PKG_CONFIG_OPENSSL_VERSION}")
+      message(STATUS "PKG_CONFIG_OPENSSL_INCLUDE_DIRS: ${PKG_CONFIG_OPENSSL_INCLUDE_DIRS}")
+      message(STATUS "PKG_CONFIG_OPENSSL_LIBRARIES: ${PKG_CONFIG_OPENSSL_LIBRARIES}")
+    else()
+      message(FATAL_ERROR "Cannot Find OpenSSL using pkg-config")
+    endif()
   else()
     message(FATAL_ERROR "Cannot build Couchbase C++ SDK without OpenSSL")
   endif()

package/deps/couchbase-cxx-client/cmake/Testing.cmake

@@ -17,7 +17,7 @@ macro(integration_test name)
     test_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -44,7 +44,7 @@ macro(transaction_test name)
     test_transaction_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -70,7 +70,7 @@ macro(unit_test name)
     test_unit_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client
@@ -96,7 +96,7 @@ macro(integration_benchmark name)
     benchmark_integration_${name}
     project_options
     project_warnings
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     Threads::Threads
     snappy
     couchbase_cxx_client

package/deps/couchbase-cxx-client/cmake/ThirdPartyDependencies.cmake

@@ -18,6 +18,10 @@ set(PEGTL_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(PEGTL_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/snappy)
 set_target_properties(snappy PROPERTIES POSITION_INDEPENDENT_CODE ON)
+if(NOT MSVC)
+  # https://github.com/google/snappy/pull/156
+  target_compile_options(snappy PRIVATE -Wno-sign-compare)
+endif()
 
 set(HDR_LOG_REQUIRED OFF CACHE BOOL "" FORCE)
 set(HDR_HISTOGRAM_BUILD_SHARED OFF CACHE BOOL "" FORCE)

package/deps/couchbase-cxx-client/cmake/VersionInfo.cmake

@@ -25,6 +25,37 @@ if(NOT COUCHBASE_CXX_CLIENT_GIT_DESCRIBE)
 endif()
 
 string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_TIMESTAMP "%Y-%m-%d %H:%M:%S" UTC)
+string(TIMESTAMP COUCHBASE_CXX_CLIENT_BUILD_DATE "%Y-%m-%d" UTC)
+
+# set(couchbase_cxx_client_BUILD_NUMBER 142)
+# set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-beta.4-27-g6807da0") #-> "couchbase_cxx_client-1.0.0-beta.4+142.27.6807da0"
+# set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-beta.4-0-g6807da0")  #-> "couchbase_cxx_client-1.0.0-beta.4"
+# set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-27-g6807da0")        #-> "couchbase_cxx_client-1.0.0+142.27.6807da0"
+# set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0-0-g6807da0")         #-> "couchbase_cxx_client-1.0.0"
+# set(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE "1.0.0")                    #-> "couchbase_cxx_client-1.0.0"
+set(COUCHBASE_CXX_CLIENT_SEMVER "${couchbase_cxx_client_VERSION}")
+set(COUCHBASE_CXX_CLIENT_PACKAGE_VERSION "${couchbase_cxx_client_VERSION}")
+set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${couchbase_cxx_client_BUILD_NUMBER}")
+if(COUCHBASE_CXX_CLIENT_GIT_DESCRIBE MATCHES
+   "^([0-9]+\\.[0-9]+\\.[0-9]+)(-([a-zA-Z0-9\\.]+))?(-([0-9]+)-g([a-zA-Z0-9]+))?$")
+  set(COUCHBASE_CXX_CLIENT_SEMVER "${CMAKE_MATCH_1}")
+  set(COUCHBASE_CXX_CLIENT_PACKAGE_VERSION "${CMAKE_MATCH_1}")
+  if(CMAKE_MATCH_3) # pre-release
+    set(COUCHBASE_CXX_CLIENT_SEMVER "${COUCHBASE_CXX_CLIENT_SEMVER}-${CMAKE_MATCH_3}")
+    set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${CMAKE_MATCH_3}.${couchbase_cxx_client_BUILD_NUMBER}")
+  endif()
+  if(CMAKE_MATCH_5 AND CMAKE_MATCH_5 GREATER 0) # number_of_commits.build_number.sha1
+    set(COUCHBASE_CXX_CLIENT_SEMVER
+        "${COUCHBASE_CXX_CLIENT_SEMVER}+${CMAKE_MATCH_5}.${couchbase_cxx_client_BUILD_NUMBER}.${CMAKE_MATCH_6}")
+    if(CMAKE_MATCH_3) # pre-release
+      set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE
+          "${CMAKE_MATCH_3}.${CMAKE_MATCH_5}.${couchbase_cxx_client_BUILD_NUMBER}.${CMAKE_MATCH_6}")
+    else()
+      set(COUCHBASE_CXX_CLIENT_PACKAGE_RELEASE "${CMAKE_MATCH_5}.${couchbase_cxx_client_BUILD_NUMBER}.${CMAKE_MATCH_6}")
+    endif()
+  endif()
+endif()
+
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_version.hxx.in
                ${PROJECT_BINARY_DIR}/generated/couchbase/build_version.hxx @ONLY)
 configure_file(${PROJECT_SOURCE_DIR}/cmake/build_config.hxx.in
@@ -47,9 +78,14 @@ file(
 #define COUCHBASE_CXX_CLIENT_LINK_OPTIONS \"$<TARGET_PROPERTY:couchbase_cxx_client,LINK_OPTIONS>\"
 #define COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL \"${COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL}\"
 
-#define OPENSSL_CRYPTO_LIBRARIES \"${OPENSSL_CRYPTO_LIBRARIES}\"
-#define OPENSSL_SSL_LIBRARIES \"${OPENSSL_SSL_LIBRARIES}\"
-#define OPENSSL_INCLUDE_DIR \"${OPENSSL_INCLUDE_DIR}\"
+#define OPENSSL_SSL_IMPORTED_LOCATION \"$<$<TARGET_EXISTS:OpenSSL::SSL>:$<TARGET_PROPERTY:OpenSSL::SSL,IMPORTED_LOCATION>>\"
+#define OPENSSL_SSL_INTERFACE_INCLUDE_DIRECTORIES \"$<$<TARGET_EXISTS:OpenSSL::SSL>:$<TARGET_PROPERTY:OpenSSL::SSL,INTERFACE_INCLUDE_DIRECTORIES>>\"
+#define OPENSSL_SSL_INTERFACE_LINK_LIBRARIES \"$<$<TARGET_EXISTS:OpenSSL::SSL>:$<TARGET_PROPERTY:OpenSSL::SSL,INTERFACE_LINK_LIBRARIES>>\"
+#define OPENSSL_CRYPTO_IMPORTED_LOCATION \"$<$<TARGET_EXISTS:OpenSSL::Crypto>:$<TARGET_PROPERTY:OpenSSL::Crypto,IMPORTED_LOCATION>>\"
+#define OPENSSL_CRYPTO_INTERFACE_INCLUDE_DIRECTORIES \"$<$<TARGET_EXISTS:OpenSSL::Crypto>:$<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>>\"
+#define OPENSSL_CRYPTO_INTERFACE_LINK_LIBRARIES \"$<$<TARGET_EXISTS:OpenSSL::Crypto>:$<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_LINK_LIBRARIES>>\"
+#define OPENSSL_PKG_CONFIG_INTERFACE_INCLUDE_DIRECTORIES \"$<$<TARGET_EXISTS:PkgConfig::PKG_CONFIG_OPENSSL>:$<TARGET_PROPERTY:PkgConfig::PKG_CONFIG_OPENSSL,INTERFACE_INCLUDE_DIRECTORIES>>\"
+#define OPENSSL_PKG_CONFIG_INTERFACE_LINK_LIBRARIES \"$<$<TARGET_EXISTS:PkgConfig::PKG_CONFIG_OPENSSL>:$<TARGET_PROPERTY:PkgConfig::PKG_CONFIG_OPENSSL,INTERFACE_LINK_LIBRARIES>>\"
 
 #define CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\"
 #define CMAKE_VERSION \"${CMAKE_VERSION}\"

package/deps/couchbase-cxx-client/cmake/test_openssl.cxx

@@ -0,0 +1,7 @@
+#include <openssl/crypto.h>
+
+int
+main()
+{
+    return static_cast<int>(OpenSSL_version_num());
+}

package/deps/couchbase-cxx-client/core/bucket.cxx

@@ -315,11 +315,12 @@ class bucket_impl
         }
         {
             std::scoped_lock lock(config_mutex_);
-            if (!config_->has_node_with_hostname(hostname)) {
+            if (!config_->has_node(origin_.options().network, service_type::key_value, origin_.options().enable_tls, hostname, port)) {
                 CB_LOG_TRACE(
-                  R"({} requested to restart session, but the node has been ejected from current configuration already. idx={}, address="{}:{}")",
+                  R"({} requested to restart session, but the node has been ejected from current configuration already. idx={}, network={}, address="{}:{}")",
                   log_prefix_,
                   index,
+                  origin_.options().network,
                   hostname,
                   port);
                 return;