couchbase 4.1.1 → 4.1.3

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_json_streaming_lexer.cxx

@@ -15,11 +15,12 @@
  *   limitations under the License.
  */
 
-#include "couchbase/logger/logger.hxx"
+#include "core/logger/logger.hxx"
+
+#include "test/utils/logger.hxx"
 #include "test_helper.hxx"
-#include "utils/logger.hxx"
 
-#include <couchbase/utils/json_streaming_lexer.hxx>
+#include "core/utils/json_streaming_lexer.hxx"
 
 struct query_result {
     std::error_code ec{};
@@ -45,11 +46,11 @@ null,1,false
 "status": "success"
 }
 )";
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -94,11 +95,11 @@ TEST_CASE("unit: json_streaming_lexer parse query result", "[unit]")
         R"(], "status": "success", "metrics": {"elapsedTime": "1.284307ms","executionTime": "1.231972ms","resultCount": 3,"resultSize": 1658,"serviceLoad": 3} })"
     };
 
-    couchbase::utils::json::streaming_lexer lexer("/results/^", 4);
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
     query_result result{};
     lexer.on_row([&result](std::string&& row) {
         result.rows.emplace_back(std::move(row));
-        return couchbase::utils::json::stream_control::next_row;
+        return couchbase::core::utils::json::stream_control::next_row;
     });
     lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
         result.ec = ec;
@@ -113,3 +114,122 @@ TEST_CASE("unit: json_streaming_lexer parse query result", "[unit]")
     REQUIRE(result.rows.size() == 3);
     REQUIRE(result.meta == chunks[0] + chunks[4]);
 }
+
+TEST_CASE("unit: json_streaming_lexer parse query result in multiple chunks", "[unit]")
+{
+    test::utils::init_logger();
+
+    const std::vector<std::string> chunks{
+        /* 0 */
+        R"({"requestID": "34a4e4b2-3f69-4bf8-a6e2-ae06798de3d9","clientContextID": "dfea5193-ead9-4ac2-5558-8fd5c4631959","signature": {"greeting":"string"},"results": [{"greeting":"ruby rules"}],"status": "success","profile": {"phaseTimes": {"authorize":"10.473µs","instantiate":"10.29µs","parse":"183.413µs","plan":"19.155µs","project":"5.712µs","run":"43.258µs","stream":"7.078µs"},"phaseOperators": {"authorize":1,"project":1,"stream":1},"requestTime": "2022-05-11T11:01:14.943Z","servicingHost": "10.112.220.101:8091","executionTimings": {"#operator":"Authorize","#stats":{"#phaseSwitches":4,"execTime":"1.372µs","servTime":"9.101µs"},"privileges":{"List":[]},"~child":{"#operator":"Sequence","#stats":{"#phaseSwitches":2,"execTime":"838ns"},"~children":[{"#operator":"DummyScan","#stats":{"#itemsOut":1,"#phaseSwitches":3,"execTime":"794ns","kernTime":"514ns"},"optimizer_estimates":{"cardinality":1,"cost":1.0842021724855044e-19,"fr_cost":1.0842021724855044e-19,"size":1}},{"#operator":"InitialProject","#stats":{"#itemsIn":1,"#itemsOut":1,"#phaseSwitches":8,"execTime":"110.717µs","kernTime":"4.786µs","state":"running"},"optimizer_estimates":{"cardinality":1,"cost":0.001,"fr_cost":0.001,"size":1},"result_terms":[{"as":"greeting","expr":"\"ruby rules\""}]},{"#operator":"Stream","#stats":{"#itemsIn":)",
+        /* 1 */
+        R"(1,"#itemsOut":1,"#phaseSwitches":2,"execTime":"7.078µs"},"optimizer_estimates":{"cardinality":1,"cost":0.001,"fr_cost":0.001,"size":1}}]},"~versions":["7.1.0-N1QL","7.1.0-2534-enterprise"]},"optimizerEstimates": {"cardinality":1,"cost":0.001}}})"
+    };
+
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
+    query_result result{};
+    lexer.on_row([&result](std::string&& row) {
+        result.rows.emplace_back(std::move(row));
+        return couchbase::core::utils::json::stream_control::next_row;
+    });
+    lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
+        result.ec = ec;
+        result.number_of_rows = number_of_rows;
+        result.meta = std::move(meta);
+    });
+    for (const auto& chunk : chunks) {
+        lexer.feed(chunk);
+    }
+    REQUIRE_FALSE(result.ec);
+    REQUIRE(result.number_of_rows == 1);
+    REQUIRE(result.rows.size() == 1);
+
+    const auto* expected_meta =
+      R"({"requestID": "34a4e4b2-3f69-4bf8-a6e2-ae06798de3d9","clientContextID": "dfea5193-ead9-4ac2-5558-8fd5c4631959","signature": {"greeting":"string"},"results": [],"status": "success","profile": {"phaseTimes": {"authorize":"10.473µs","instantiate":"10.29µs","parse":"183.413µs","plan":"19.155µs","project":"5.712µs","run":"43.258µs","stream":"7.078µs"},"phaseOperators": {"authorize":1,"project":1,"stream":1},"requestTime": "2022-05-11T11:01:14.943Z","servicingHost": "10.112.220.101:8091","executionTimings": {"#operator":"Authorize","#stats":{"#phaseSwitches":4,"execTime":"1.372µs","servTime":"9.101µs"},"privileges":{"List":[]},"~child":{"#operator":"Sequence","#stats":{"#phaseSwitches":2,"execTime":"838ns"},"~children":[{"#operator":"DummyScan","#stats":{"#itemsOut":1,"#phaseSwitches":3,"execTime":"794ns","kernTime":"514ns"},"optimizer_estimates":{"cardinality":1,"cost":1.0842021724855044e-19,"fr_cost":1.0842021724855044e-19,"size":1}},{"#operator":"InitialProject","#stats":{"#itemsIn":1,"#itemsOut":1,"#phaseSwitches":8,"execTime":"110.717µs","kernTime":"4.786µs","state":"running"},"optimizer_estimates":{"cardinality":1,"cost":0.001,"fr_cost":0.001,"size":1},"result_terms":[{"as":"greeting","expr":"\"ruby rules\""}]},{"#operator":"Stream","#stats":{"#itemsIn":1,"#itemsOut":1,"#phaseSwitches":2,"execTime":"7.078µs"},"optimizer_estimates":{"cardinality":1,"cost":0.001,"fr_cost":0.001,"size":1}}]},"~versions":["7.1.0-N1QL","7.1.0-2534-enterprise"]},"optimizerEstimates": {"cardinality":1,"cost":0.001}}})";
+
+    REQUIRE(result.meta == expected_meta);
+}
+
+TEST_CASE("unit: json_streaming_lexer parse chunked metadata trailer", "[unit]")
+{
+    test::utils::init_logger();
+
+    const std::vector<std::string> chunks{
+        /* 0 */
+        R"({"requestID": "2640a5b5-2e67-44e7-86ec-31cc388b7427","results": [42],)",
+        /* 1 */
+        R"("clientContextID":)",
+        /* 2 */
+        R"("730ecac3-e8d0-4d6e-4ed9-e2d4abd1d7b9",)",
+        /* 3 */
+        R"("status": "success"})",
+    };
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
+    query_result result{};
+    lexer.on_row([&result](std::string&& row) {
+        result.rows.emplace_back(std::move(row));
+        return couchbase::core::utils::json::stream_control::next_row;
+    });
+    lexer.on_complete([&result](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
+        result.ec = ec;
+        result.number_of_rows = number_of_rows;
+        result.meta = std::move(meta);
+    });
+    for (const auto& chunk : chunks) {
+        lexer.feed(chunk);
+    }
+    REQUIRE_FALSE(result.ec);
+    REQUIRE(result.number_of_rows == 1);
+    REQUIRE(result.rows.size() == 1);
+    const auto* expected_meta =
+      R"({"requestID": "2640a5b5-2e67-44e7-86ec-31cc388b7427","results": [],"clientContextID":"730ecac3-e8d0-4d6e-4ed9-e2d4abd1d7b9","status": "success"})";
+    REQUIRE(result.meta == expected_meta);
+    REQUIRE(result.rows[0] == R"(42)");
+}
+
+TEST_CASE("unit: json_streaming_lexer parse payload with missing results", "[unit]")
+{
+    test::utils::init_logger();
+
+    std::string chunk = R"(
+{
+
+	"requestID": "d07c0cde-cd80-4620-bb6b-d0641f272420",
+	"clientContextID": "a7bbe750-20a2-4e46-eb67-315e3733b2a8",
+	"signature": {
+		"*": "*"
+	},
+	"plans":{},
+	"status": "success",
+	"metrics": {
+		"elapsedTime": "6.56579ms",
+		"executionTime": "5.552905ms",
+		"resultCount": 0,
+		"resultSize": 0,
+		"processedObjects": 0
+	}
+}
+)";
+    couchbase::core::utils::json::streaming_lexer lexer("/results/^", 4);
+    query_result result{};
+    bool on_row_handler_executed = false;
+    lexer.on_row([&result, &on_row_handler_executed](std::string&& row) {
+        on_row_handler_executed = true;
+        result.rows.emplace_back(std::move(row));
+        return couchbase::core::utils::json::stream_control::next_row;
+    });
+    bool on_complete_handler_excecuted = false;
+    lexer.on_complete([&result, &on_complete_handler_excecuted](std::error_code ec, std::size_t number_of_rows, std::string&& meta) {
+        on_complete_handler_excecuted = true;
+        result.ec = ec;
+        result.number_of_rows = number_of_rows;
+        result.meta = std::move(meta);
+    });
+    lexer.feed(chunk);
+    REQUIRE_FALSE(on_row_handler_executed);
+    REQUIRE(on_complete_handler_excecuted);
+    REQUIRE_FALSE(result.ec);
+    REQUIRE(result.number_of_rows == 0);
+    REQUIRE(result.rows.empty());
+    REQUIRE(result.meta == chunk);
+}

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_json_transcoder.cxx

@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 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.
+ */
+
+#include "test_helper.hxx"
+
+#include <couchbase/codec/json_transcoder.hxx>
+
+#include <tao/json.hpp>
+
+TEST_CASE("unit: json_transcoder encodes primitives", "[unit]")
+{
+    {
+        /*
+         * echo -n '"hello, world"' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> expected_data{
+            std::byte{ 0x22 }, std::byte{ 0x68 }, std::byte{ 0x65 }, std::byte{ 0x6c }, std::byte{ 0x6c },
+            std::byte{ 0x6f }, std::byte{ 0x2c }, std::byte{ 0x20 }, std::byte{ 0x77 }, std::byte{ 0x6f },
+            std::byte{ 0x72 }, std::byte{ 0x6c }, std::byte{ 0x64 }, std::byte{ 0x22 },
+        };
+        auto encoded = couchbase::codec::json_transcoder::encode("hello, world");
+        REQUIRE(encoded.data == expected_data);
+        REQUIRE(encoded.flags == couchbase::codec::codec_flags::json_common_flags);
+    }
+
+    {
+        /*
+         * echo -n '3.14' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> expected_data{
+            std::byte{ 0x33 },
+            std::byte{ 0x2e },
+            std::byte{ 0x31 },
+            std::byte{ 0x34 },
+        };
+        auto encoded = couchbase::codec::json_transcoder::encode(3.14);
+        REQUIRE(encoded.data == expected_data);
+        REQUIRE(encoded.flags == couchbase::codec::codec_flags::json_common_flags);
+    }
+
+    {
+        /*
+         * echo -n 'true' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> expected_data{
+            std::byte{ 0x74 },
+            std::byte{ 0x72 },
+            std::byte{ 0x75 },
+            std::byte{ 0x65 },
+        };
+        auto encoded = couchbase::codec::json_transcoder::encode(true);
+        REQUIRE(encoded.data == expected_data);
+        REQUIRE(encoded.flags == couchbase::codec::codec_flags::json_common_flags);
+    }
+}
+
+TEST_CASE("unit: json_transcoder decodes primitives", "[unit]")
+{
+    {
+        /*
+         * echo -n '"hello, world"' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> encoded_data{
+            std::byte{ 0x22 }, std::byte{ 0x68 }, std::byte{ 0x65 }, std::byte{ 0x6c }, std::byte{ 0x6c },
+            std::byte{ 0x6f }, std::byte{ 0x2c }, std::byte{ 0x20 }, std::byte{ 0x77 }, std::byte{ 0x6f },
+            std::byte{ 0x72 }, std::byte{ 0x6c }, std::byte{ 0x64 }, std::byte{ 0x22 },
+        };
+        auto decoded =
+          couchbase::codec::json_transcoder::decode<std::string>({ encoded_data, couchbase::codec::codec_flags::json_common_flags });
+        REQUIRE(decoded == "hello, world");
+    }
+
+    {
+        /*
+         * echo -n '3.14' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> encoded_data{
+            std::byte{ 0x33 },
+            std::byte{ 0x2e },
+            std::byte{ 0x31 },
+            std::byte{ 0x34 },
+        };
+        auto decoded =
+          couchbase::codec::json_transcoder::decode<double>({ encoded_data, couchbase::codec::codec_flags::json_common_flags });
+        REQUIRE(Approx(decoded) == 3.14);
+    }
+
+    {
+        /*
+         * echo -n 'true' \
+         *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+         */
+        std::vector<std::byte> encoded_data{
+            std::byte{ 0x74 },
+            std::byte{ 0x72 },
+            std::byte{ 0x75 },
+            std::byte{ 0x65 },
+        };
+        auto decoded = couchbase::codec::json_transcoder::decode<bool>({ encoded_data, couchbase::codec::codec_flags::json_common_flags });
+        REQUIRE(decoded == true);
+    }
+}
+
+struct profile {
+    std::string username{};
+    std::string full_name{};
+    std::uint32_t birth_year{};
+};
+
+template<>
+struct tao::json::traits<profile> {
+    template<template<typename...> class Traits>
+    static void assign(tao::json::basic_value<Traits>& v, const profile& p)
+    {
+        v = {
+            { "username", p.username },
+            { "full_name", p.full_name },
+            { "birth_year", p.birth_year },
+        };
+    }
+
+    template<template<typename...> class Traits>
+    static profile as(const tao::json::basic_value<Traits>& v)
+    {
+        profile result;
+        const auto& object = v.get_object();
+        result.username = object.at("username").template as<std::string>();
+        result.full_name = object.at("full_name").template as<std::string>();
+        result.birth_year = object.at("birth_year").template as<std::uint32_t>();
+        return result;
+    }
+};
+
+TEST_CASE("unit: json_transcoder encodes user data", "[unit]")
+{
+    profile albert{ "this_guy_again", "Albert Einstein", 1879 };
+
+    /*
+     * echo -n '{"birth_year":1879,"full_name":"Albert Einstein", "username":"this_guy_again"}' \
+     *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+     */
+    std::vector<std::byte> expected_data{
+        std::byte{ 0x7b }, std::byte{ 0x22 }, std::byte{ 0x62 }, std::byte{ 0x69 }, std::byte{ 0x72 }, std::byte{ 0x74 }, std::byte{ 0x68 },
+        std::byte{ 0x5f }, std::byte{ 0x79 }, std::byte{ 0x65 }, std::byte{ 0x61 }, std::byte{ 0x72 }, std::byte{ 0x22 }, std::byte{ 0x3a },
+        std::byte{ 0x31 }, std::byte{ 0x38 }, std::byte{ 0x37 }, std::byte{ 0x39 }, std::byte{ 0x2c }, std::byte{ 0x22 }, std::byte{ 0x66 },
+        std::byte{ 0x75 }, std::byte{ 0x6c }, std::byte{ 0x6c }, std::byte{ 0x5f }, std::byte{ 0x6e }, std::byte{ 0x61 }, std::byte{ 0x6d },
+        std::byte{ 0x65 }, std::byte{ 0x22 }, std::byte{ 0x3a }, std::byte{ 0x22 }, std::byte{ 0x41 }, std::byte{ 0x6c }, std::byte{ 0x62 },
+        std::byte{ 0x65 }, std::byte{ 0x72 }, std::byte{ 0x74 }, std::byte{ 0x20 }, std::byte{ 0x45 }, std::byte{ 0x69 }, std::byte{ 0x6e },
+        std::byte{ 0x73 }, std::byte{ 0x74 }, std::byte{ 0x65 }, std::byte{ 0x69 }, std::byte{ 0x6e }, std::byte{ 0x22 }, std::byte{ 0x2c },
+        std::byte{ 0x22 }, std::byte{ 0x75 }, std::byte{ 0x73 }, std::byte{ 0x65 }, std::byte{ 0x72 }, std::byte{ 0x6e }, std::byte{ 0x61 },
+        std::byte{ 0x6d }, std::byte{ 0x65 }, std::byte{ 0x22 }, std::byte{ 0x3a }, std::byte{ 0x22 }, std::byte{ 0x74 }, std::byte{ 0x68 },
+        std::byte{ 0x69 }, std::byte{ 0x73 }, std::byte{ 0x5f }, std::byte{ 0x67 }, std::byte{ 0x75 }, std::byte{ 0x79 }, std::byte{ 0x5f },
+        std::byte{ 0x61 }, std::byte{ 0x67 }, std::byte{ 0x61 }, std::byte{ 0x69 }, std::byte{ 0x6e }, std::byte{ 0x22 }, std::byte{ 0x7d },
+    };
+
+    auto encoded = couchbase::codec::json_transcoder::encode(albert);
+    REQUIRE(encoded.data == expected_data);
+    REQUIRE(encoded.flags == couchbase::codec::codec_flags::json_common_flags);
+}
+
+TEST_CASE("unit: json_transcoder decodes user data", "[unit]")
+{
+    /*
+     * echo -n '{"birth_year":1879,"full_name":"Albert Einstein", "username":"this_guy_again"}' \
+     *  | ruby -e 'puts ARGF.read.chars.map{|c| format("std::byte{0x%02x}", c.ord)}.join(", ")'
+     */
+    std::vector<std::byte> encoded_data{
+        std::byte{ 0x7b }, std::byte{ 0x22 }, std::byte{ 0x62 }, std::byte{ 0x69 }, std::byte{ 0x72 }, std::byte{ 0x74 }, std::byte{ 0x68 },
+        std::byte{ 0x5f }, std::byte{ 0x79 }, std::byte{ 0x65 }, std::byte{ 0x61 }, std::byte{ 0x72 }, std::byte{ 0x22 }, std::byte{ 0x3a },
+        std::byte{ 0x31 }, std::byte{ 0x38 }, std::byte{ 0x37 }, std::byte{ 0x39 }, std::byte{ 0x2c }, std::byte{ 0x22 }, std::byte{ 0x66 },
+        std::byte{ 0x75 }, std::byte{ 0x6c }, std::byte{ 0x6c }, std::byte{ 0x5f }, std::byte{ 0x6e }, std::byte{ 0x61 }, std::byte{ 0x6d },
+        std::byte{ 0x65 }, std::byte{ 0x22 }, std::byte{ 0x3a }, std::byte{ 0x22 }, std::byte{ 0x41 }, std::byte{ 0x6c }, std::byte{ 0x62 },
+        std::byte{ 0x65 }, std::byte{ 0x72 }, std::byte{ 0x74 }, std::byte{ 0x20 }, std::byte{ 0x45 }, std::byte{ 0x69 }, std::byte{ 0x6e },
+        std::byte{ 0x73 }, std::byte{ 0x74 }, std::byte{ 0x65 }, std::byte{ 0x69 }, std::byte{ 0x6e }, std::byte{ 0x22 }, std::byte{ 0x2c },
+        std::byte{ 0x22 }, std::byte{ 0x75 }, std::byte{ 0x73 }, std::byte{ 0x65 }, std::byte{ 0x72 }, std::byte{ 0x6e }, std::byte{ 0x61 },
+        std::byte{ 0x6d }, std::byte{ 0x65 }, std::byte{ 0x22 }, std::byte{ 0x3a }, std::byte{ 0x22 }, std::byte{ 0x74 }, std::byte{ 0x68 },
+        std::byte{ 0x69 }, std::byte{ 0x73 }, std::byte{ 0x5f }, std::byte{ 0x67 }, std::byte{ 0x75 }, std::byte{ 0x79 }, std::byte{ 0x5f },
+        std::byte{ 0x61 }, std::byte{ 0x67 }, std::byte{ 0x61 }, std::byte{ 0x69 }, std::byte{ 0x6e }, std::byte{ 0x22 }, std::byte{ 0x7d },
+    };
+
+    auto decoded = couchbase::codec::json_transcoder::decode<profile>({ encoded_data, couchbase::codec::codec_flags::json_common_flags });
+    REQUIRE(decoded.username == "this_guy_again");
+    REQUIRE(decoded.full_name == "Albert Einstein");
+    REQUIRE(decoded.birth_year == 1879);
+}

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_jsonsl.cxx

@@ -17,7 +17,7 @@
 
 #include "test_helper.hxx"
 
-#include <couchbase/utils/json_streaming_lexer.hxx>
+#include "core/utils/json_streaming_lexer.hxx"
 
 #include <jsonsl.h>
 #include <ostream>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_unit_utils.cxx

@@ -17,12 +17,13 @@
 
 #include "test_helper.hxx"
 
+#include "core/meta/version.hxx"
+#include "core/utils/join_strings.hxx"
+#include "core/utils/json.hxx"
+#include "core/utils/url_codec.hxx"
 #include <couchbase/build_version.hxx>
-#include <couchbase/errors.hxx>
-#include <couchbase/meta/version.hxx>
-#include <couchbase/utils/join_strings.hxx>
-#include <couchbase/utils/json.hxx>
-#include <couchbase/utils/url_codec.hxx>
+
+#include <couchbase/error_codes.hxx>
 
 #include <tao/json.hpp>
 
@@ -34,8 +35,8 @@ TEST_CASE("unit: transformer to deduplicate JSON keys", "[unit]")
 
     CHECK_THROWS_WITH(tao::json::from_string(input), Contains("duplicate JSON object key \"answer\""));
 
-    auto result = couchbase::utils::json::parse(input);
-    INFO(couchbase::utils::json::generate(result))
+    auto result = couchbase::core::utils::json::parse(input);
+    INFO(couchbase::core::utils::json::generate(result))
     CHECK(result.is_object());
     CHECK(result.find("answer") != nullptr);
     CHECK(result["answer"].is_integer());
@@ -44,7 +45,7 @@ TEST_CASE("unit: transformer to deduplicate JSON keys", "[unit]")
 
 TEST_CASE("unit: string representation of the error codes", "[unit]")
 {
-    std::error_code rc = couchbase::error::common_errc::authentication_failure;
+    std::error_code rc = couchbase::errc::common::authentication_failure;
     CHECK(rc.category().name() == std::string("couchbase.common"));
     CHECK(rc.value() == 6);
     std::stringstream ss;
@@ -54,29 +55,29 @@ TEST_CASE("unit: string representation of the error codes", "[unit]")
 
 TEST_CASE("unit: url path escape", "[unit]")
 {
-    REQUIRE(couchbase::utils::string_codec::v2::path_escape("a/b") == "a%2Fb");
+    REQUIRE(couchbase::core::utils::string_codec::v2::path_escape("a/b") == "a%2Fb");
 }
 
 TEST_CASE("unit: join strings", "[unit]")
 {
     std::vector<std::string> field_specs{ "testkey:string" };
 
-    REQUIRE(couchbase::utils::join_strings(field_specs, ",") == "testkey:string");
+    REQUIRE(couchbase::core::utils::join_strings(field_specs, ",") == "testkey:string");
 
     field_specs.emplace_back("volume:double");
     field_specs.emplace_back("id:integer");
-    REQUIRE(couchbase::utils::join_strings(field_specs, ",") == "testkey:string,volume:double,id:integer");
+    REQUIRE(couchbase::core::utils::join_strings(field_specs, ",") == "testkey:string,volume:double,id:integer");
 }
 
 TEST_CASE("unit: join strings (fmt version)", "[unit]")
 {
     std::vector<std::string> field_specs{ "testkey:string" };
 
-    REQUIRE(couchbase::utils::join_strings_fmt("{}", field_specs, ",") == "testkey:string");
+    REQUIRE(couchbase::core::utils::join_strings_fmt("{}", field_specs, ",") == "testkey:string");
 
     field_specs.emplace_back("volume:double");
     field_specs.emplace_back("id:integer");
-    REQUIRE(couchbase::utils::join_strings_fmt("{}", field_specs, ",") == "testkey:string,volume:double,id:integer");
+    REQUIRE(couchbase::core::utils::join_strings_fmt("{}", field_specs, ",") == "testkey:string,volume:double,id:integer");
 }
 
 TEST_CASE("unit: user_agent string", "[unit]")
@@ -87,11 +88,11 @@ TEST_CASE("unit: user_agent string", "[unit]")
                                            COUCHBASE_CXX_CLIENT_VERSION_PATCH,
                                            COUCHBASE_CXX_CLIENT_GIT_REVISION_SHORT);
 
-    auto simple_user_agent = couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE");
+    auto simple_user_agent = couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE");
     REQUIRE(simple_user_agent == fmt::format(R"({{"a":"{}","i":"0xDEADBEEF/0xCAFEBEBE"}})", core_version));
     REQUIRE(simple_user_agent.size() == 53);
 
-    REQUIRE(couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", "couchnode/1.2.3; openssl/1.1.1l") ==
+    REQUIRE(couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", "couchnode/1.2.3; openssl/1.1.1l") ==
             fmt::format(R"({{"a":"{};couchnode/1.2.3; openssl/1.1.1l","i":"0xDEADBEEF/0xCAFEBEBE"}})", core_version));
 
     std::string long_extra = "01234567890abcdef01234567890abcdef"
@@ -104,24 +105,25 @@ TEST_CASE("unit: user_agent string", "[unit]")
                              "01234567890abcdef01234567890abcdef";
     REQUIRE(long_extra.size() == 272);
 
-    REQUIRE(couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra) ==
+    REQUIRE(couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra) ==
             fmt::format(R"({{"a":"{};{}","i":"0xDEADBEEF/0xCAFEBEBE"}})", core_version, long_extra));
 
-    auto trimmed_user_agent = couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra, 250);
+    auto trimmed_user_agent = couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra, 250);
     REQUIRE(trimmed_user_agent.size() == 250);
     REQUIRE(250 - simple_user_agent.size() == 197);
     REQUIRE(trimmed_user_agent == fmt::format(R"({{"a":"{};{}","i":"0xDEADBEEF/0xCAFEBEBE"}})", core_version, long_extra.substr(0, 196)));
 
     auto long_extra_with_non_printable_characters = long_extra.substr(0, 193) + "\n\n";
-    trimmed_user_agent = couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra_with_non_printable_characters, 250);
+    trimmed_user_agent =
+      couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_extra_with_non_printable_characters, 250);
     REQUIRE(trimmed_user_agent.size() == 249);
     REQUIRE(trimmed_user_agent ==
             fmt::format(R"({{"a":"{};{}","i":"0xDEADBEEF/0xCAFEBEBE"}})", core_version, long_extra.substr(0, 193) + "\\n"));
 
     auto long_and_weird_extra = "hello" + std::string(300, '\n');
-    trimmed_user_agent = couchbase::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_and_weird_extra, 250);
+    trimmed_user_agent = couchbase::core::meta::user_agent_for_mcbp("0xDEADBEEF", "0xCAFEBEBE", long_and_weird_extra, 250);
     REQUIRE(trimmed_user_agent == simple_user_agent);
 
-    REQUIRE(fmt::format("{}; client/0xDEADBEEF; session/0xCAFEBEBE; {}; hello world", core_version, couchbase::meta::os()) ==
-            couchbase::meta::user_agent_for_http("0xDEADBEEF", "0xCAFEBEBE", "hello\nworld"));
+    REQUIRE(fmt::format("{}; client/0xDEADBEEF; session/0xCAFEBEBE; {}; hello world", core_version, couchbase::core::meta::os()) ==
+            couchbase::core::meta::user_agent_for_http("0xDEADBEEF", "0xCAFEBEBE", "hello\nworld"));
 }