From fce1eb2afd421ac6a155a6e9360fa92b8372f74d Mon Sep 17 00:00:00 2001 From: Sergey Avseyev Date: Mon, 16 Sep 2024 15:30:52 -0700 Subject: [PATCH] Update core to 1.0.2 --- .github/workflows/linters.yml | 2 +- Rakefile | 1 + bin/check-clang-static-analyzer | 2 ++ ext/CMakeLists.txt | 9 +++++++-- ext/couchbase | 2 +- ext/extconf.rb | 3 +++ ext/rcb_backend.cxx | 1 - ext/rcb_crud.cxx | 2 ++ ext/rcb_version.cxx | 3 ++- 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 7dce7257..dfff66c7 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -71,7 +71,7 @@ jobs: CB_SCAN_BUILD: /usr/bin/scan-build-18 - name: Upload scan-build report if: ${{ failure() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: report path: ext/cmake-build-report.tar.gz diff --git a/Rakefile b/Rakefile index 59ac6d20..bda52d9e 100644 --- a/Rakefile +++ b/Rakefile @@ -137,6 +137,7 @@ task :cache_cxx_dependencies do "asio/*/asio/COPYING", "asio/*/asio/asio/include/*.hpp", "asio/*/asio/asio/include/asio/**/*.[hi]pp", + "asio/*/asio/asio/src/*.cpp", "boringssl/*/boringssl/**/*.{cc,h,c,asm,S}", "boringssl/*/boringssl/**/CMakeLists.txt", "boringssl/*/boringssl/LICENSE", diff --git a/bin/check-clang-static-analyzer b/bin/check-clang-static-analyzer index 2975e9c8..1e115e39 100755 --- a/bin/check-clang-static-analyzer +++ b/bin/check-clang-static-analyzer @@ -44,6 +44,8 @@ ${CB_SCAN_BUILD} ${SCAN_BUILD_ARGS} ${CB_CMAKE} \ -DENABLE_CACHE=OFF \ -DRUBY_HDR_DIR="${RUBY_HDR_DIR}" \ -DRUBY_ARCH_HDR_DIR="${RUBY_ARCH_HDR_DIR}" \ + -DCOUCHBASE_CXX_CLIENT_INSTALL=ON \ + -DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=ON \ -DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF \ -DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF \ -DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF \ diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 94fce090..5ed8d36c 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -61,15 +61,20 @@ add_library( rcb_version.cxx rcb_views.cxx) target_include_directories(couchbase PRIVATE ${PROJECT_BINARY_DIR}/generated) -target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR}) +target_include_directories(couchbase PRIVATE SYSTEM ${RUBY_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/couchbase + ${PROJECT_SOURCE_DIR}/couchbase/third_party/cxx_function + ${PROJECT_SOURCE_DIR}/couchbase/third_party/expected/include) target_link_libraries( couchbase PRIVATE project_options project_warnings - couchbase_cxx_client + couchbase_cxx_client_static Microsoft.GSL::GSL asio taocpp::json + fmt::fmt + spdlog::spdlog snappy) if(RUBY_LIBRUBY) target_link_directories(couchbase PRIVATE "${RUBY_LIBRARY_DIR}") diff --git a/ext/couchbase b/ext/couchbase index 58d46d79..51f4775e 160000 --- a/ext/couchbase +++ b/ext/couchbase @@ -1 +1 @@ -Subproject commit 58d46d79578c8e4ca88e934c3ae8982abaa89ff9 +Subproject commit 51f4775e56fb9ba975f92d7791d4d9feca336f05 diff --git a/ext/extconf.rb b/ext/extconf.rb index ff6d40e7..4459e906 100644 --- a/ext/extconf.rb +++ b/ext/extconf.rb @@ -84,10 +84,13 @@ def sys(*cmd) "-DRUBY_ARCH_HDR_DIR=#{RbConfig::CONFIG['rubyarchhdrdir']}", "-DRUBY_LIBRARY_DIR=#{RbConfig::CONFIG['libdir']}", "-DRUBY_LIBRUBYARG=#{RbConfig::CONFIG['LIBRUBYARG_SHARED']}", + "-DCOUCHBASE_CXX_CLIENT_BUILD_STATIC=ON", + "-DCOUCHBASE_CXX_CLIENT_BUILD_SHARED=OFF", "-DCOUCHBASE_CXX_CLIENT_BUILD_TESTS=OFF", "-DCOUCHBASE_CXX_CLIENT_BUILD_DOCS=OFF", "-DCOUCHBASE_CXX_CLIENT_BUILD_TOOLS=OFF", "-DCOUCHBASE_CXX_CLIENT_BUILD_EXAMPLES=OFF", + "-DCOUCHBASE_CXX_CLIENT_INSTALL=OFF", ] extconf_include = File.expand_path("cache/extconf_include.rb", __dir__) diff --git a/ext/rcb_backend.cxx b/ext/rcb_backend.cxx index c0432c07..4c162ccb 100644 --- a/ext/rcb_backend.cxx +++ b/ext/rcb_backend.cxx @@ -206,7 +206,6 @@ initialize_cluster_options(const core::utils::connection_string& connstr, static const auto sym_network = rb_id2sym(rb_intern("network")); if (auto param = options::get_string(options, sym_network); param) { cluster_options.network().preferred_network(param.value()); - cluster_options.behavior().network(param.value()); } static const auto sym_use_ip_protocol = rb_id2sym(rb_intern("use_ip_protocol")); diff --git a/ext/rcb_crud.cxx b/ext/rcb_crud.cxx index d6891859..cfbd7760 100644 --- a/ext/rcb_crud.cxx +++ b/ext/rcb_crud.cxx @@ -30,8 +30,10 @@ #include #include #include + #include #include +#include #include #include diff --git a/ext/rcb_version.cxx b/ext/rcb_version.cxx index 49807c5b..925d562f 100644 --- a/ext/rcb_version.cxx +++ b/ext/rcb_version.cxx @@ -120,7 +120,8 @@ init_version(VALUE mCouchbase) name == "mozilla_ca_bundle_size") { rb_hash_aset(cb_CoreInfo, rb_id2sym(rb_intern(name.c_str())), INT2FIX(std::stoi(value))); } else if (name == "snapshot" || name == "static_stdlib" || name == "static_openssl" || - name == "static_boringssl" || name == "mozilla_ca_bundle_embedded") { + name == "static_boringssl" || name == "columnar" || name == "static_target" || + name == "mozilla_ca_bundle_embedded") { rb_hash_aset( cb_CoreInfo, rb_id2sym(rb_intern(name.c_str())), value == "true" ? Qtrue : Qfalse); } else {