couchbase 4.1.1 → 4.1.2

package/deps/couchbase-cxx-client/test/test_integration_subdoc.cxx

@@ -92,10 +92,9 @@ TEST_CASE("integration: subdoc get & exists", "[integration]")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
-    std::string value_json{ R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})" };
-    auto value = couchbase::utils::json::parse(value_json);
 
     {
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -178,7 +177,7 @@ TEST_CASE("integration: subdoc get & exists", "[integration]")
     SECTION("non json")
     {
         couchbase::document_id non_json_id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("non_json") };
-        std::string non_json_doc{ "string" };
+        auto non_json_doc = couchbase::utils::to_binary("string");
 
         {
             couchbase::operations::insert_request req{ non_json_id, non_json_doc };
@@ -250,8 +249,7 @@ TEST_CASE("integration: subdoc store", "[integration]")
     couchbase::cas cas{};
 
     {
-        std::string value_json{ R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})" };
-        auto value = couchbase::utils::json::parse(value_json);
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -410,8 +408,7 @@ TEST_CASE("integration: subdoc unique", "[integration]")
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
 
     {
-        auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-        auto value = couchbase::utils::json::parse(value_json);
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -467,8 +464,7 @@ TEST_CASE("integration: subdoc counter", "[integration]")
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
 
     {
-        auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-        auto value = couchbase::utils::json::parse(value_json);
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -570,10 +566,9 @@ TEST_CASE("integration: subdoc multi lookup", "[integration]")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
-    auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-    auto value = couchbase::utils::json::parse(value_json);
 
     {
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -630,10 +625,9 @@ TEST_CASE("integration: subdoc multi mutation", "[integration]")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
-    auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-    auto value = couchbase::utils::json::parse(value_json);
 
     {
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -673,10 +667,9 @@ TEST_CASE("integration: subdoc expiry")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
-    auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-    auto value = couchbase::utils::json::parse(value_json);
 
     {
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -696,10 +689,9 @@ TEST_CASE("integration: subdoc get count", "[integration]")
     test::utils::integration_test_guard integration;
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("subdoc") };
-    auto value_json = R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})";
-    auto value = couchbase::utils::json::parse(value_json);
 
     {
+        auto value_json = couchbase::utils::to_binary(R"({"dictkey":"dictval","array":[1,2,3,4,[10,20,30,[100,200,300]]]})");
         couchbase::operations::insert_request req{ id, value_json };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -733,9 +725,9 @@ TEST_CASE("integration: subdoc insert error consistency", "[integration]")
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("sd_err") };
 
-    couchbase::cas cas;
+    couchbase::cas cas{};
     {
-        couchbase::operations::insert_request req{ id, "{}" };
+        couchbase::operations::insert_request req{ id, couchbase::utils::to_binary("{}") };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
         cas = resp.cas;
@@ -783,7 +775,7 @@ TEST_CASE("integration: subdoc remove with empty path", "[integration]")
 
     // create initial document
     {
-        std::string initial_value{ R"({"bar":"foo"})" };
+        auto initial_value = couchbase::utils::to_binary(R"({"bar":"foo"})");
         couchbase::operations::insert_request req{ id, initial_value };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
@@ -801,7 +793,7 @@ TEST_CASE("integration: subdoc remove with empty path", "[integration]")
         couchbase::operations::get_request req{ id };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
-        REQUIRE(resp.value == value);
+        REQUIRE(resp.value == couchbase::utils::to_binary(value));
     }
 
     // remove with empty path removes the document
@@ -839,7 +831,7 @@ TEST_CASE("integration: subdoc top level array", "[integration]")
         couchbase::operations::get_request req{ id };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
-        REQUIRE(resp.value == "[1]");
+        REQUIRE(resp.value == couchbase::utils::to_binary("[1]"));
     }
 
     // try to add number 1 but only if it is not in the array yet
@@ -862,7 +854,7 @@ TEST_CASE("integration: subdoc top level array", "[integration]")
         couchbase::operations::get_request req{ id };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
-        REQUIRE(resp.value == "[1,42]");
+        REQUIRE(resp.value == couchbase::utils::to_binary("[1,42]"));
     }
 
     // add number 2 to the end of the array
@@ -878,7 +870,7 @@ TEST_CASE("integration: subdoc top level array", "[integration]")
         couchbase::operations::get_request req{ id };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_FALSE(resp.ctx.ec);
-        REQUIRE(resp.value == "[1,42,2]");
+        REQUIRE(resp.value == couchbase::utils::to_binary("[1,42,2]"));
     }
 
     // check size of the top-level array

package/deps/couchbase-cxx-client/test/tools/tool_kv_loader.cxx

@@ -20,7 +20,6 @@
 #include "../utils/uniq_id.hxx"
 
 #include <couchbase/logger/logger.hxx>
-#include <couchbase/utils/json.hxx>
 
 #include <spdlog/details/os.h>
 
@@ -53,7 +52,7 @@ dump_stats(asio::steady_timer& timer, std::chrono::system_clock::time_point star
         }
         auto diff = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now() - start_time).count();
         std::uint64_t ops = total;
-        fmt::print(stderr, "\rrate: {} ops/s\r", diff == 0 ? ops : ops / static_cast<std::uint64_t>(diff));
+        fmt::print(stderr, "\rrate: {} ops/s, total: {}\r", diff == 0 ? ops : ops / static_cast<std::uint64_t>(diff), ops);
         return dump_stats(timer, start_time, total);
     });
 }
@@ -70,11 +69,24 @@ main()
 
     auto ctx = test::utils::test_context::load_from_environment();
 
+    bool send_queries = false;
+    if (auto val = spdlog::details::os::getenv("TEST_SEND_QUERIES"); !val.empty()) {
+        std::vector<std::string> truth = {
+            "YES", "Y", "TRUE", "T", "ON", "1", "yes", "y", "true", "t", "on",
+        };
+        send_queries = std::any_of(truth.begin(), truth.end(), [&val](auto& t) { return t == val; });
+    }
+
     std::size_t number_of_io_threads = 4;
     if (auto val = spdlog::details::os::getenv("TEST_NUMBER_OF_IO_THREADS"); !val.empty()) {
         number_of_io_threads = std::stoul(val, nullptr, 10);
     }
-    LOG_INFO("number_of_threads: {}, username: {}, connection_string: {}", number_of_io_threads, ctx.username, ctx.connection_string);
+    LOG_INFO("send_queries: {}, number_of_threads: {}, username: \"{}\", connection_string: \"{}\", bucket: \"{}\"",
+             send_queries,
+             number_of_io_threads,
+             ctx.username,
+             ctx.connection_string,
+             ctx.bucket);
 
     auto connstr = couchbase::utils::parse_connection_string(ctx.connection_string);
     couchbase::cluster_credentials auth{};
@@ -122,7 +134,8 @@ main()
              hit_chance_for_upsert,
              hit_chance_for_get);
 
-    const std::string json_doc = R"({
+    const auto json_doc = couchbase::utils::to_binary(R"({
+  "type": "fake_profile",
   "random": 91,
   "random float": 16.439,
   "bool": false,
@@ -160,7 +173,7 @@ main()
   "Mildrid": {
     "age": 33
   }
-})";
+})");
 
     const auto start_time = std::chrono::system_clock::now();
 
@@ -211,6 +224,16 @@ main()
                 });
             } break;
         }
+        if (send_queries) {
+            couchbase::operations::query_request req{ fmt::format("SELECT COUNT(*) FROM `{}` WHERE type = \"fake_profile\"", ctx.bucket) };
+            cluster->execute(req, [&total, &errors_mutex, &errors](const couchbase::operations::query_response&& resp) {
+                ++total;
+                if (resp.ctx.ec) {
+                    std::scoped_lock lock(errors_mutex);
+                    ++errors[resp.ctx.ec];
+                }
+            });
+        }
     }
     const auto finish_time = std::chrono::system_clock::now();
     stats_timer.cancel();
@@ -223,6 +246,7 @@ main()
                std::chrono::duration_cast<std::chrono::milliseconds>(total_time).count());
     auto diff = std::chrono::duration_cast<std::chrono::seconds>(total_time).count();
     fmt::print("total rate: {} ops/s\n", total / static_cast<std::uint64_t>(diff));
+    std::scoped_lock lock(errors_mutex);
     if (!errors.empty()) {
         fmt::print("error stats:\n");
         for (auto [ec, count] : errors) {

package/deps/couchbase-cxx-client/test/utils/server_version.hxx

@@ -114,7 +114,7 @@ struct server_version {
 
     [[nodiscard]] bool supports_analytics() const
     {
-        return is_alice() || is_mad_hatter() || is_cheshire_cat() || is_neo();
+        return is_enterprise() && (is_alice() || is_mad_hatter() || is_cheshire_cat() || is_neo());
     }
 
     [[nodiscard]] bool supports_analytics_pending_mutations() const
@@ -149,7 +149,7 @@ struct server_version {
 
     [[nodiscard]] bool supports_eventing_functions() const
     {
-        return (is_cheshire_cat() || is_neo()) && deployment == deployment_type::on_prem;
+        return is_enterprise() && (is_cheshire_cat() || is_neo()) && deployment == deployment_type::on_prem;
     }
 
     [[nodiscard]] bool is_enterprise() const

package/deps/couchbase-cxx-client/third_party/json/.github/workflows/macos.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ['11', '12']
+        xcode: ['11', '12', '13']
         build_type: [Debug, Release]
 
     runs-on: macos-latest

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

@@ -11,7 +11,7 @@ on:
       - 'doc/**'
 
 jobs:
-  vs2019:
+  vs2022:
     strategy:
       fail-fast: false
       matrix:
@@ -28,7 +28,7 @@ jobs:
 
     - shell: bash
       working-directory: build/
-      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 16 2019"
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022"
 
     - working-directory: build/
       run: cmake --build . --config ${{ matrix.build_type }}
@@ -36,7 +36,7 @@ jobs:
     - working-directory: build/
       run: ctest -C ${{ matrix.build_type }} --output-on-failure
 
-  vs2019-clang:
+  vs2022-clang:
     strategy:
       fail-fast: false
       matrix:
@@ -53,7 +53,32 @@ jobs:
 
     - shell: bash
       working-directory: build/
-      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 16 2019" -T ClangCL
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 17 2022" -T ClangCL
+
+    - working-directory: build/
+      run: cmake --build . --config ${{ matrix.build_type }}
+
+    - working-directory: build/
+      run: ctest -C ${{ matrix.build_type }} --output-on-failure
+
+  vs2019:
+    strategy:
+      fail-fast: false
+      matrix:
+        build_type: [Debug, Release]
+
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - run: cmake -E make_directory build
+
+    - shell: bash
+      working-directory: build/
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 16 2019"
 
     - working-directory: build/
       run: cmake --build . --config ${{ matrix.build_type }}
@@ -61,16 +86,13 @@ jobs:
     - working-directory: build/
       run: ctest -C ${{ matrix.build_type }} --output-on-failure
 
-  vs2017:
+  vs2019-clang:
     strategy:
       fail-fast: false
       matrix:
-        visual_studio:
-          - 'Visual Studio 15 2017'
-          - 'Visual Studio 15 2017 Win64'
         build_type: [Debug, Release]
 
-    runs-on: windows-2016
+    runs-on: windows-2019
 
     steps:
     - uses: actions/checkout@v2
@@ -81,7 +103,7 @@ jobs:
 
     - shell: bash
       working-directory: build/
-      run: cmake $GITHUB_WORKSPACE -G "${{ matrix.visual_studio }}"
+      run: cmake $GITHUB_WORKSPACE -G "Visual Studio 16 2019" -T ClangCL
 
     - working-directory: build/
       run: cmake --build . --config ${{ matrix.build_type }}

package/deps/couchbase-cxx-client/third_party/json/.gitmodules

@@ -1,4 +1,4 @@
 [submodule "external/PEGTL"]
 	path = external/PEGTL
-	url = https://github.com/taocpp/PEGTL
-	branch = 3.x
+	url = https://github.com/couchbasedeps/PEGTL
+	branch = 3.x-couchbase

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

@@ -68,6 +68,9 @@ if(TAOCPP_JSON_INSTALL)
   # Enable version checks in find_package
   write_basic_package_version_file(${PROJECT_NAME}-config-version.cmake COMPATIBILITY SameMajorVersion)
 
+  # keep taocpp::json target compatibility
+  set_target_properties(taocpp-json PROPERTIES EXPORT_NAME json)
+
   # install and export target
   install(TARGETS taocpp-json EXPORT ${PROJECT_NAME}-targets)
   install(FILES