couchbase 4.1.1 → 4.1.3

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

@@ -68,24 +68,209 @@ include(cmake/OpenSSL.cmake)
 
 include(cmake/VersionInfo.cmake)
 
-add_subdirectory(couchbase/meta)
-add_subdirectory(couchbase/platform)
-add_subdirectory(couchbase/logger)
-add_subdirectory(couchbase/crypto)
-add_subdirectory(couchbase/sasl)
-add_subdirectory(couchbase/topology)
-add_subdirectory(couchbase/utils)
-add_subdirectory(couchbase/protocol)
-add_subdirectory(couchbase/io)
-add_subdirectory(couchbase/management)
-add_subdirectory(couchbase/operations)
-add_subdirectory(couchbase/tracing)
-add_subdirectory(couchbase/metrics)
+add_subdirectory(core/meta)
+add_subdirectory(core/platform)
+add_subdirectory(core/logger)
+add_subdirectory(core/crypto)
+add_subdirectory(core/sasl)
+add_subdirectory(core/io)
+add_subdirectory(core/tracing)
+add_subdirectory(core/metrics)
+
+set(couchbase_cxx_client_FILES
+    core/cluster.cxx
+    core/cluster_options.cxx
+    core/document_id.cxx
+    core/error_context/key_value.cxx
+    core/management/analytics_link_azure_blob_external.cxx
+    core/management/analytics_link_couchbase_remote.cxx
+    core/management/analytics_link_s3_external.cxx
+    core/operations/document_analytics.cxx
+    core/operations/document_append.cxx
+    core/operations/document_decrement.cxx
+    core/operations/document_exists.cxx
+    core/operations/document_get.cxx
+    core/operations/document_get_and_lock.cxx
+    core/operations/document_get_and_touch.cxx
+    core/operations/document_get_projected.cxx
+    core/operations/document_increment.cxx
+    core/operations/document_insert.cxx
+    core/operations/document_lookup_in.cxx
+    core/operations/document_mutate_in.cxx
+    core/operations/document_prepend.cxx
+    core/operations/document_query.cxx
+    core/operations/document_remove.cxx
+    core/operations/document_replace.cxx
+    core/operations/document_search.cxx
+    core/operations/document_touch.cxx
+    core/operations/document_unlock.cxx
+    core/operations/document_upsert.cxx
+    core/operations/document_view.cxx
+    core/operations/http_noop.cxx
+    core/operations/management/analytics_dataset_create.cxx
+    core/operations/management/analytics_dataset_drop.cxx
+    core/operations/management/analytics_dataset_get_all.cxx
+    core/operations/management/analytics_dataverse_create.cxx
+    core/operations/management/analytics_dataverse_drop.cxx
+    core/operations/management/analytics_get_pending_mutations.cxx
+    core/operations/management/analytics_index_create.cxx
+    core/operations/management/analytics_index_drop.cxx
+    core/operations/management/analytics_index_get_all.cxx
+    core/operations/management/analytics_link_connect.cxx
+    core/operations/management/analytics_link_create.cxx
+    core/operations/management/analytics_link_disconnect.cxx
+    core/operations/management/analytics_link_drop.cxx
+    core/operations/management/analytics_link_get_all.cxx
+    core/operations/management/analytics_link_replace.cxx
+    core/operations/management/bucket_create.cxx
+    core/operations/management/bucket_describe.cxx
+    core/operations/management/bucket_drop.cxx
+    core/operations/management/bucket_flush.cxx
+    core/operations/management/bucket_get.cxx
+    core/operations/management/bucket_get_all.cxx
+    core/operations/management/bucket_update.cxx
+    core/operations/management/cluster_describe.cxx
+    core/operations/management/cluster_developer_preview_enable.cxx
+    core/operations/management/collection_create.cxx
+    core/operations/management/collection_drop.cxx
+    core/operations/management/collections_manifest_get.cxx
+    core/operations/management/error_utils.cxx
+    core/operations/management/eventing_deploy_function.cxx
+    core/operations/management/eventing_drop_function.cxx
+    core/operations/management/eventing_get_all_functions.cxx
+    core/operations/management/eventing_get_function.cxx
+    core/operations/management/eventing_get_status.cxx
+    core/operations/management/eventing_pause_function.cxx
+    core/operations/management/eventing_resume_function.cxx
+    core/operations/management/eventing_undeploy_function.cxx
+    core/operations/management/eventing_upsert_function.cxx
+    core/operations/management/freeform.cxx
+    core/operations/management/group_drop.cxx
+    core/operations/management/group_get.cxx
+    core/operations/management/group_get_all.cxx
+    core/operations/management/group_upsert.cxx
+    core/operations/management/query_index_build.cxx
+    core/operations/management/query_index_create.cxx
+    core/operations/management/query_index_drop.cxx
+    core/operations/management/query_index_get_all.cxx
+    core/operations/management/query_index_get_all_deferred.cxx
+    core/operations/management/role_get_all.cxx
+    core/operations/management/scope_create.cxx
+    core/operations/management/scope_drop.cxx
+    core/operations/management/scope_get_all.cxx
+    core/operations/management/search_get_stats.cxx
+    core/operations/management/search_index_analyze_document.cxx
+    core/operations/management/search_index_control_ingest.cxx
+    core/operations/management/search_index_control_plan_freeze.cxx
+    core/operations/management/search_index_control_query.cxx
+    core/operations/management/search_index_drop.cxx
+    core/operations/management/search_index_get.cxx
+    core/operations/management/search_index_get_all.cxx
+    core/operations/management/search_index_get_documents_count.cxx
+    core/operations/management/search_index_get_stats.cxx
+    core/operations/management/search_index_upsert.cxx
+    core/operations/management/user_drop.cxx
+    core/operations/management/user_get.cxx
+    core/operations/management/user_get_all.cxx
+    core/operations/management/user_upsert.cxx
+    core/operations/management/view_index_drop.cxx
+    core/operations/management/view_index_get.cxx
+    core/operations/management/view_index_get_all.cxx
+    core/operations/management/view_index_upsert.cxx
+    core/operations/mcbp_noop.cxx
+    core/protocol/client_request.cxx
+    core/protocol/client_response.cxx
+    core/protocol/cmd_append.cxx
+    core/protocol/cmd_cluster_map_change_notification.cxx
+    core/protocol/cmd_decrement.cxx
+    core/protocol/cmd_get.cxx
+    core/protocol/cmd_get_and_lock.cxx
+    core/protocol/cmd_get_and_touch.cxx
+    core/protocol/cmd_get_cluster_config.cxx
+    core/protocol/cmd_get_collection_id.cxx
+    core/protocol/cmd_get_collections_manifest.cxx
+    core/protocol/cmd_get_error_map.cxx
+    core/protocol/cmd_get_meta.cxx
+    core/protocol/cmd_get_replica.cxx
+    core/protocol/cmd_hello.cxx
+    core/protocol/cmd_increment.cxx
+    core/protocol/cmd_insert.cxx
+    core/protocol/cmd_lookup_in.cxx
+    core/protocol/cmd_mutate_in.cxx
+    core/protocol/cmd_noop.cxx
+    core/protocol/cmd_observe_seqno.cxx
+    core/protocol/cmd_prepend.cxx
+    core/protocol/cmd_remove.cxx
+    core/protocol/cmd_replace.cxx
+    core/protocol/cmd_sasl_auth.cxx
+    core/protocol/cmd_sasl_list_mechs.cxx
+    core/protocol/cmd_sasl_step.cxx
+    core/protocol/cmd_select_bucket.cxx
+    core/protocol/cmd_touch.cxx
+    core/protocol/cmd_unlock.cxx
+    core/protocol/cmd_upsert.cxx
+    core/protocol/frame_info_utils.cxx
+    core/protocol/status.cxx
+    core/topology/configuration.cxx
+    core/utils/binary.cxx
+    core/utils/connection_string.cxx
+    core/utils/duration_parser.cxx
+    core/utils/json.cxx
+    core/utils/json_streaming_lexer.cxx
+    core/utils/mutation_token.cxx
+    core/utils/url_codec.cxx
+    core/impl/analytics_error_category.cxx
+    core/impl/append.cxx
+    core/impl/build_deferred_query_indexes.cxx
+    core/impl/common_error_category.cxx
+    core/impl/decrement.cxx
+    core/impl/expiry.cxx
+    core/impl/field_level_encryption_error_category.cxx
+    core/impl/get.cxx
+    core/impl/get_all_replicas.cxx
+    core/impl/get_and_touch.cxx
+    core/impl/get_any_replica.cxx
+    core/impl/get_replica.cxx
+    core/impl/increment.cxx
+    core/impl/insert.cxx
+    core/impl/key_value_error_category.cxx
+    core/impl/lookup_in.cxx
+    core/impl/management_error_category.cxx
+    core/impl/mutate_in.cxx
+    core/impl/network_error_category.cxx
+    core/impl/observe_poll.cxx
+    core/impl/observe_seqno.cxx
+    core/impl/prepend.cxx
+    core/impl/query_error_category.cxx
+    core/impl/remove.cxx
+    core/impl/replace.cxx
+    core/impl/search_error_category.cxx
+    core/impl/streaming_json_lexter_error_category.cxx
+    core/impl/subdoc/array_add_unique.cxx
+    core/impl/subdoc/array_append.cxx
+    core/impl/subdoc/array_insert.cxx
+    core/impl/subdoc/array_prepend.cxx
+    core/impl/subdoc/count.cxx
+    core/impl/subdoc/counter.cxx
+    core/impl/subdoc/exists.cxx
+    core/impl/subdoc/get.cxx
+    core/impl/subdoc/insert.cxx
+    core/impl/subdoc/join_values.cxx
+    core/impl/subdoc/lookup_in_macro.cxx
+    core/impl/subdoc/lookup_in_specs.cxx
+    core/impl/subdoc/mutate_in_macro.cxx
+    core/impl/subdoc/mutate_in_specs.cxx
+    core/impl/subdoc/remove.cxx
+    core/impl/subdoc/replace.cxx
+    core/impl/subdoc/upsert.cxx
+    core/impl/touch.cxx
+    core/impl/upsert.cxx
+    core/impl/view_error_category.cxx)
 
 if(COUCHBASE_CXX_CLIENT_BUILD_SHARED)
-  add_library(couchbase_cxx_client SHARED couchbase/cluster.cxx couchbase/document_id.cxx couchbase/cluster_options.cxx)
+  add_library(couchbase_cxx_client SHARED ${couchbase_cxx_client_FILES})
 else()
-  add_library(couchbase_cxx_client STATIC couchbase/cluster.cxx couchbase/document_id.cxx couchbase/cluster_options.cxx)
+  add_library(couchbase_cxx_client STATIC ${couchbase_cxx_client_FILES})
 endif()
 set_target_properties(couchbase_cxx_client PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(couchbase_cxx_client PUBLIC ${PROJECT_SOURCE_DIR})
@@ -101,7 +286,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()
@@ -112,6 +302,9 @@ target_link_libraries(
   couchbase_cxx_client
   PUBLIC fmt::fmt
          spdlog::spdlog
+         snappy
+         jsonsl
+         hdr_histogram_static
          couchbase_backtrace
          couchbase_logger
          couchbase_platform
@@ -119,12 +312,6 @@ target_link_libraries(
          couchbase_meta
          couchbase_crypto
          couchbase_sasl
-         couchbase_topology
-         couchbase_utils
-         couchbase_protocol
-         couchbase_management
-         couchbase_operations
-         couchbase_operations_management
          couchbase_tracing
          couchbase_metrics)
 if(NOT COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
@@ -135,3 +322,8 @@ option(COUCHBASE_CXX_CLIENT_BUILD_TESTS "Build test programs" TRUE)
 if(COUCHBASE_CXX_CLIENT_BUILD_TESTS)
   include(cmake/Testing.cmake)
 endif()
+
+option(COUCHBASE_CXX_CLIENT_BUILD_DOCS "Build API documentation" TRUE)
+if(COUCHBASE_CXX_CLIENT_BUILD_DOCS)
+  include(cmake/Documentation.cmake)
+endif()

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+# Code of Conduct
+
+Please refer to the [Couchbase Community Guidelines](https://www.couchbase.com/community-guidelines)
+which applies to community members as well as employees.

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/CONTRIBUTING.md

@@ -0,0 +1,35 @@
+# Contributing
+
+Welcome, and thanks for lending a hand! Before we get started, please read the
+[Couchbase Code of Conduct](CODE_OF_CONDUCT.md).
+
+## Discussion
+
+We'd love for you to join us on the [Couchbase Forum](https://forums.couchbase.com).
+For more interactive discussions we have `#c-and-cplusplus` channel on our [Discord](https://discord.com/invite/sQ5qbPZuTh).
+
+## Reporting Issues
+
+The simplest way to help is to report bugs or request new features.
+
+We use Jira for issue tracking: [https://issues.couchbase.com/projects/CXXCBC/](https://issues.couchbase.com/projects/CXXCBC/)
+
+To create an issue, or comment on an existing issue, you'll need to sign up
+for an account. It's quick and painless (or if it's not, click on the
+"Report a problem" link on the signup page or get in touch via the forum).
+
+## Pull Requests
+
+We use Github for code review. But to allow us to integrate your changes, you need to register for a Gerrit account and
+sign a Contributor License Agreement (CLA).
+
+> We acknowledge Gerrit can be intimidating for new users.
+> We're considering alternates that will make it easier for GitHub
+> natives to contribute.
+
+  1. Visit [https://review.couchbase.org](https://review.couchbase.org) and register for an account.
+  2. Review our [Contributor Licence Agreement (CLA)](https://review.couchbase.org/static/individual_agreement.html).
+  3. Agree to the CLA by visiting [https://review.couchbase.org/settings/#Agreements](https://review.couchbase.org/settings/#Agreements)
+     Otherwise, we won't be able to merge your changes.
+
+If you need any help along the way, please contact us on the [Couchbase Forum](https://forums.couchbase.com).

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

@@ -16,6 +16,12 @@
 
 PROJECT_ROOT="$( cd "$(dirname "$0"/..)" >/dev/null 2>&1 ; pwd -P )"
 
+echo "HOSTNAME=${HOSTNAME}"
+echo "NODE_NAME=${NODE_NAME}"
+echo "CONTAINER_TAG=${CONTAINER_TAG}"
+echo "JENKINS_SLAVE_LABELS=${JENKINS_SLAVE_LABELS}"
+echo "NODE_LABELS=${NODE_LABELS}"
+
 CB_DEFAULT_CC=cc
 CB_DEFAULT_CXX=c++
 CB_CLANG=${CB_CLANG:-clang}
@@ -32,12 +38,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
@@ -77,8 +85,10 @@ ${CB_CMAKE}  \
     -DCMAKE_BUILD_TYPE=${CB_CMAKE_BUILD_TYPE} \
     -DCMAKE_C_COMPILER="${CB_CC}" \
     -DCMAKE_CXX_COMPILER="${CB_CXX}" \
+    -DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF \
     -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}"

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

@@ -48,6 +48,7 @@ CB_CC = ENV.fetch("CB_CC", which(CB_DEFAULT_CC))
 CB_CXX = ENV.fetch("CB_CXX", which(CB_DEFAULT_CXX))
 CB_NUMBER_OF_JOBS = ENV.fetch("CB_NUMBER_OF_JOBS", "1").to_i
 CB_CMAKE_BUILD_TYPE = ENV.fetch("CB_CMAKE_BUILD_TYPE", "Debug")
+CB_CACHE_OPTION = ENV.fetch("CB_CACHE_OPTION", "ccache")
 
 puts "RUBY_PLATFORM=#{RUBY_PLATFORM}"
 puts "CB_CMAKE=#{CB_CMAKE}"
@@ -58,6 +59,7 @@ if RUBY_PLATFORM !~ /mswin|mingw/
   puts "CB_CC=#{CB_CC}"
   puts "CB_CXX=#{CB_CXX}"
 end
+puts "CB_CACHE_OPTION=#{CB_CACHE_OPTION}"
 
 CB_CMAKE_EXTRAS = []
 case CB_SANITIZER
@@ -90,7 +92,9 @@ Dir.chdir(BUILD_DIR) do
   end
   run(CB_CMAKE,
       "-DCMAKE_BUILD_TYPE=#{CB_CMAKE_BUILD_TYPE}",
+      "-DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF",
       "-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=ON",
+      "-DCACHE_OPTION=#{CB_CACHE_OPTION}",
       *CB_CMAKE_EXTRAS,
       "-B", BUILD_DIR,
       "-S", PROJECT_ROOT)

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

@@ -30,7 +30,7 @@ options = {
   username: ENV.fetch("CB_USERNAME", "Administrator"),
   password: ENV.fetch("CB_PASSWORD", "password"),
   bucket: ENV.fetch("CB_BUCKET", "default"),
-  server_quota: ENV.fetch("CB_SERVER_QUOTA", 1024).to_i,
+  server_quota: ENV.fetch("CB_SERVER_QUOTA", 2048).to_i,
   index_quota: ENV.fetch("CB_INDEX_QUOTA", 256).to_i,
   bucket_quota: ENV.fetch("CB_BUCKET_QUOTA", 256).to_i,
   enable_developer_preview: ENV.fetch("CB_DEVELOPER_PREVIEW", false).to_b,

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

@@ -16,6 +16,12 @@
 
 PROJECT_ROOT="$( cd "$(dirname "$0"/..)" >/dev/null 2>&1 ; pwd -P )"
 
+echo "HOSTNAME=${HOSTNAME}"
+echo "NODE_NAME=${NODE_NAME}"
+echo "CONTAINER_TAG=${CONTAINER_TAG}"
+echo "JENKINS_SLAVE_LABELS=${JENKINS_SLAVE_LABELS}"
+echo "NODE_LABELS=${NODE_LABELS}"
+
 CB_CTEST=${CB_CTEST:-$(which ctest)}
 CB_SANITIZER=${CB_SANITIZER:-""}
 
@@ -30,4 +36,4 @@ fi
 
 cd "${BUILD_DIR}"
 
-${CB_CTEST} --output-on-failure --label-regex 'integration|unit'
+${CB_CTEST} --output-on-failure --label-regex 'integration|unit' --output-junit results.xml

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

@@ -7,6 +7,7 @@ function(set_project_warnings project_name)
 
   set(MSVC_WARNINGS
       /W4 # Baseline reasonable warnings
+      /wd4189 # 'identifier': local variable is initialized but not referenced
       /wd4242 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
       /wd4244 # 'identifier': conversion from 'type1' to 'type1', possible loss of data
       /w14254 # 'operator': conversion from 'type1:field_bits' to 'type2:field_bits', possible loss of data

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

@@ -0,0 +1,35 @@
+find_package(Doxygen)
+find_program(DOT dot)
+if(DOXYGEN_FOUND AND DOT)
+  message(STATUS "Using doxygen: ${DOXYGEN_VERSION} (with ${DOT})")
+  find_package(Java COMPONENTS Runtime)
+  if(Java_Runtime_FOUND)
+    include(UseJava)
+    find_jar(PLANTUML_JAR_PATH NAMES plantuml)
+    message(STATUS "Found plantuml: ${PLANTUML_JAR_PATH}")
+  endif()
+  file(
+    GLOB_RECURSE
+    COUCHBASE_CXX_CLIENT_PUBLIC_HEADERS
+    ${PROJECT_SOURCE_DIR}/couchbase/*.hxx
+    ${PROJECT_SOURCE_DIR}/docs/*.hxx)
+
+  set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR}/couchbase)
+  set(DOXYGEN_OUTPUT_DIR ${PROJECT_BINARY_DIR}/couchbase-cxx-client-${couchbase_cxx_client_VERSION})
+  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)
+  file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR})
+  configure_file(${DOXYGEN_CONFIG_TEMPLATE} ${DOXYGEN_CONFIG})
+  add_custom_command(
+    OUTPUT ${DOXYGEN_INDEX_FILE}
+    DEPENDS ${COUCHBASE_CXX_CLIENT_PUBLIC_HEADERS}
+    COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_CONFIG}
+    WORKING_DIRECTORY ${DOXYGEN_OUTPUT_DIR}
+    MAIN_DEPENDENCY ${DOXYGEN_CONFIG}
+    ${DOXYGEN_CONFIG_TEMPLATE}
+    COMMENT "Generating documentation with Doxygen: ${DOXYGEN_INDEX_FILE}")
+  add_custom_target(doxygen ALL DEPENDS ${DOXYGEN_INDEX_FILE} ${COUCHBASE_CXX_CLIENT_PUBLIC_HEADERS})
+else()
+  message(STATUS "Could not find doxygen executable. Documentation generation will be disabled.")
+endif()

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

@@ -1,4 +1,5 @@
 option(COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL "Rely on application to link OpenSSL library" FALSE)
+option(COUCHBASE_CXX_CLIENT_USE_HOMEBREW_TO_DETECT_OPENSSL "Use homebrew to determine OpenSSL root directory" TRUE)
 
 if(COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL)
   message(
@@ -9,6 +10,13 @@ else()
   if(COUCHBASE_CXX_CLIENT_STATIC_OPENSSL)
     set(OPENSSL_USE_STATIC_LIBS ON)
   endif()
+  if(APPLE AND COUCHBASE_CXX_CLIENT_USE_HOMEBREW_TO_DETECT_OPENSSL)
+    execute_process(
+      COMMAND brew --prefix openssl@1.1
+      OUTPUT_VARIABLE OPENSSL_ROOT_DIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    message(STATUS "Found OpenSSL prefix using homebrew: ${OPENSSL_ROOT_DIR}")
+  endif()
   include(FindOpenSSL)
   if(OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIR)
     message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/cmake/StandardProjectSettings.cmake

@@ -39,7 +39,7 @@ else()
   message(STATUS "No colored compiler diagnostic set for '${CMAKE_CXX_COMPILER_ID}' compiler.")
 endif()
 
-if(WIN32)
+if(MSVC)
   add_definitions(/bigobj)
 endif()
 

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/core/analytics_scan_consistency.hxx

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-2021 Couchbase, Inc.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+#pragma once
+
+namespace couchbase::core
+{
+enum class analytics_scan_consistency {
+    not_bounded = 0,
+    request_plus,
+};
+} // namespace couchbase::core