couchbase 4.0.0 → 4.1.0

package/deps/{couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations → couchbase-cxx-client/couchbase}/management/rbac_fmt.hxx

@@ -17,12 +17,12 @@
 
 #pragma once
 
-#include <couchbase/operations/management/rbac.hxx>
+#include <couchbase/management/rbac.hxx>
 
 #include <fmt/core.h>
 
 template<>
-struct fmt::formatter<couchbase::operations::management::rbac::auth_domain> {
+struct fmt::formatter<couchbase::management::rbac::auth_domain> {
     template<typename ParseContext>
     constexpr auto parse(ParseContext& ctx)
     {
@@ -30,17 +30,17 @@ struct fmt::formatter<couchbase::operations::management::rbac::auth_domain> {
     }
 
     template<typename FormatContext>
-    auto format(couchbase::operations::management::rbac::auth_domain domain, FormatContext& ctx) const
+    auto format(couchbase::management::rbac::auth_domain domain, FormatContext& ctx) const
     {
         string_view name = "unknown";
         switch (domain) {
-            case couchbase::operations::management::rbac::auth_domain::unknown:
+            case couchbase::management::rbac::auth_domain::unknown:
                 name = "unknown";
                 break;
-            case couchbase::operations::management::rbac::auth_domain::local:
+            case couchbase::management::rbac::auth_domain::local:
                 name = "local";
                 break;
-            case couchbase::operations::management::rbac::auth_domain::external:
+            case couchbase::management::rbac::auth_domain::external:
                 name = "external";
                 break;
         }

package/deps/{couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations → couchbase-cxx-client/couchbase}/management/rbac_json.hxx

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <couchbase/operations/management/rbac.hxx>
+#include <couchbase/management/rbac.hxx>
 
 #include <couchbase/logger/logger.hxx>
 
@@ -26,15 +26,15 @@
 namespace tao::json
 {
 template<>
-struct traits<couchbase::operations::management::rbac::user_and_metadata> {
+struct traits<couchbase::management::rbac::user_and_metadata> {
     template<template<typename...> class Traits>
-    static couchbase::operations::management::rbac::user_and_metadata as(const tao::json::basic_value<Traits>& v)
+    static couchbase::management::rbac::user_and_metadata as(const tao::json::basic_value<Traits>& v)
     {
-        couchbase::operations::management::rbac::user_and_metadata result;
+        couchbase::management::rbac::user_and_metadata result;
         if (const std::string& domain = v.at("domain").get_string(); domain == "local") {
-            result.domain = couchbase::operations::management::rbac::auth_domain::local;
+            result.domain = couchbase::management::rbac::auth_domain::local;
         } else if (domain == "external") {
-            result.domain = couchbase::operations::management::rbac::auth_domain::external;
+            result.domain = couchbase::management::rbac::auth_domain::external;
         } else {
             LOG_ERROR(R"("unexpected domain for user with metadata: "{}")", domain);
         }
@@ -55,7 +55,7 @@ struct traits<couchbase::operations::management::rbac::user_and_metadata> {
         }
         if (const auto* roles = v.find("roles"); roles != nullptr) {
             for (const auto& entry : roles->get_array()) {
-                couchbase::operations::management::rbac::role_and_origins role{};
+                couchbase::management::rbac::role_and_origins role{};
                 role.name = entry.at("role").get_string();
                 if (const auto* bucket = entry.find("bucket_name"); bucket != nullptr && !bucket->get_string().empty()) {
                     role.bucket = bucket->get_string();
@@ -71,7 +71,7 @@ struct traits<couchbase::operations::management::rbac::user_and_metadata> {
                 if (const auto* origins = entry.find("origins"); origins != nullptr) {
                     bool has_user_origin = false;
                     for (const auto& ent : origins->get_array()) {
-                        couchbase::operations::management::rbac::origin origin{};
+                        couchbase::management::rbac::origin origin{};
                         origin.type = ent.at("type").get_string();
                         if (origin.type == "user") {
                             has_user_origin = true;
@@ -96,11 +96,11 @@ struct traits<couchbase::operations::management::rbac::user_and_metadata> {
 };
 
 template<>
-struct traits<couchbase::operations::management::rbac::role_and_description> {
+struct traits<couchbase::management::rbac::role_and_description> {
     template<template<typename...> class Traits>
-    static couchbase::operations::management::rbac::role_and_description as(const tao::json::basic_value<Traits>& v)
+    static couchbase::management::rbac::role_and_description as(const tao::json::basic_value<Traits>& v)
     {
-        couchbase::operations::management::rbac::role_and_description result;
+        couchbase::management::rbac::role_and_description result;
         result.name = v.at("role").get_string();
         result.display_name = v.at("name").get_string();
         result.description = v.at("desc").get_string();
@@ -127,11 +127,11 @@ struct traits<couchbase::operations::management::rbac::role_and_description> {
 };
 
 template<>
-struct traits<couchbase::operations::management::rbac::group> {
+struct traits<couchbase::management::rbac::group> {
     template<template<typename...> class Traits>
-    static couchbase::operations::management::rbac::group as(const tao::json::basic_value<Traits>& v)
+    static couchbase::management::rbac::group as(const tao::json::basic_value<Traits>& v)
     {
-        couchbase::operations::management::rbac::group result;
+        couchbase::management::rbac::group result;
         result.name = v.at("id").get_string();
         {
             const auto* desc = v.find("description");
@@ -149,7 +149,7 @@ struct traits<couchbase::operations::management::rbac::group> {
             const auto* roles = v.find("roles");
             if (roles != nullptr) {
                 for (const auto& entry : roles->get_array()) {
-                    couchbase::operations::management::rbac::role role{};
+                    couchbase::management::rbac::role role{};
                     role.name = entry.at("role").get_string();
                     {
                         const auto* bucket = entry.find("bucket_name");

package/deps/{couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations → couchbase-cxx-client/couchbase}/management/search_index.hxx

@@ -17,9 +17,11 @@
 
 #pragma once
 
-namespace couchbase::operations::management
+#include <string>
+
+namespace couchbase::management::search
 {
-struct search_index {
+struct index {
     std::string uuid;
     std::string name;
     std::string type;
@@ -33,4 +35,4 @@ struct search_index {
     std::string plan_params_json;
 };
 
-} // namespace couchbase::operations::management
+} // namespace couchbase::management::search

package/deps/couchbase-cxx-client/couchbase/{operations/management → management}/search_index_json.hxx

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <couchbase/operations/management/search_index.hxx>
+#include <couchbase/management/search_index.hxx>
 
 #include <couchbase/utils/json.hxx>
 
@@ -26,11 +26,11 @@
 namespace tao::json
 {
 template<>
-struct traits<couchbase::operations::management::search_index> {
+struct traits<couchbase::management::search::index> {
     template<template<typename...> class Traits>
-    static couchbase::operations::management::search_index as(const tao::json::basic_value<Traits>& v)
+    static couchbase::management::search::index as(const tao::json::basic_value<Traits>& v)
     {
-        couchbase::operations::management::search_index result;
+        couchbase::management::search::index result;
         result.uuid = v.at("uuid").get_string();
         result.name = v.at("name").get_string();
         result.type = v.at("type").get_string();

package/deps/{couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol → couchbase-cxx-client/couchbase}/mutation_token.hxx

@@ -17,6 +17,9 @@
 
 #pragma once
 
+#include <cstdint>
+#include <string>
+
 namespace couchbase
 {
 struct mutation_token {

package/deps/couchbase-cxx-client/couchbase/{protocol/mutation_token_fmt.hxx → mutation_token_fmt.hxx}

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include <couchbase/protocol/mutation_token.hxx>
+#include <couchbase/mutation_token.hxx>
 
 #include <fmt/core.h>
 

package/deps/couchbase-cxx-client/couchbase/operations/document_analytics.cxx

@@ -52,10 +52,10 @@ analytics_request::encode_to(analytics_request::encoded_request_type& encoded, h
     }
     if (scan_consistency) {
         switch (scan_consistency.value()) {
-            case scan_consistency_type::not_bounded:
+            case couchbase::analytics_scan_consistency::not_bounded:
                 body["scan_consistency"] = "not_bounded";
                 break;
-            case scan_consistency_type::request_plus:
+            case couchbase::analytics_scan_consistency::request_plus:
                 body["scan_consistency"] = "request_plus";
                 break;
         }

package/deps/couchbase-cxx-client/couchbase/operations/document_analytics.hxx

@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <couchbase/analytics_scan_consistency.hxx>
 #include <couchbase/error_context/analytics.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
@@ -63,8 +64,6 @@ struct analytics_request {
     using encoded_response_type = io::http_response;
     using error_context_type = error_context::analytics;
 
-    enum class scan_consistency_type { not_bounded, request_plus };
-
     static const inline service_type type = service_type::analytics;
 
     std::string statement;
@@ -75,7 +74,7 @@ struct analytics_request {
     std::optional<std::string> scope_name{};
     std::optional<std::string> scope_qualifier{};
 
-    std::optional<scan_consistency_type> scan_consistency{};
+    std::optional<couchbase::analytics_scan_consistency> scan_consistency{};
 
     std::map<std::string, couchbase::json_string> raw{};
     std::vector<couchbase::json_string> positional_parameters{};

package/deps/couchbase-cxx-client/couchbase/operations/document_append.cxx

@@ -28,9 +28,6 @@ append_request::encode_to(protocol::client_request<protocol::append_request_body
     encoded.partition(partition);
     encoded.body().id(id);
     encoded.body().content(value);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     return {};
 }
 

package/deps/couchbase-cxx-client/couchbase/operations/document_append.hxx

@@ -19,18 +19,19 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
-#include <couchbase/timeout_defaults.hxx>
-#include <couchbase/protocol/durability_level.hxx>
 #include <couchbase/protocol/cmd_append.hxx>
+#include <couchbase/protocol/durability_level.hxx>
+#include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
 {
 
 struct append_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -44,7 +45,6 @@ struct append_request {
     uint16_t partition{};
     uint32_t opaque{};
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
 
@@ -54,3 +54,10 @@ struct append_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::append_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_decrement.cxx

@@ -35,9 +35,6 @@ decrement_request::encode_to(decrement_request::encoded_request_type& encoded, m
         encoded.body().initial_value(0);
         encoded.body().expiry(0xffff'ffff);
     }
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     if (preserve_expiry) {
         encoded.body().preserve_expiry();
     }

package/deps/couchbase-cxx-client/couchbase/operations/document_decrement.hxx

@@ -19,11 +19,12 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
-#include <couchbase/timeout_defaults.hxx>
-#include <couchbase/protocol/durability_level.hxx>
 #include <couchbase/protocol/cmd_decrement.hxx>
+#include <couchbase/protocol/durability_level.hxx>
+#include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
 {
@@ -31,7 +32,7 @@ namespace couchbase::operations
 struct decrement_response {
     error_context::key_value ctx;
     std::uint64_t content{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -47,7 +48,6 @@ struct decrement_request {
     std::uint64_t delta{ 1 };
     std::optional<std::uint64_t> initial_value{};
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
     bool preserve_expiry{ false };
@@ -58,3 +58,10 @@ struct decrement_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::decrement_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_exists.hxx

@@ -21,8 +21,8 @@
 #include <couchbase/io/mcbp_context.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
-#include <couchbase/timeout_defaults.hxx>
 #include <couchbase/protocol/cmd_get_meta.hxx>
+#include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
 {
@@ -30,7 +30,7 @@ namespace couchbase::operations
 struct exists_response {
     error_context::key_value ctx;
     bool deleted{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::uint32_t flags{};
     std::uint32_t expiry{};
     std::uint64_t sequence_number{};

package/deps/couchbase-cxx-client/couchbase/operations/document_get.hxx

@@ -30,7 +30,7 @@ namespace couchbase::operations
 struct get_response {
     error_context::key_value ctx;
     std::string value{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::uint32_t flags{};
 };
 

package/deps/couchbase-cxx-client/couchbase/operations/document_get_and_lock.hxx

@@ -30,7 +30,7 @@ namespace couchbase::operations
 struct get_and_lock_response {
     error_context::key_value ctx;
     std::string value{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::uint32_t flags{};
 };
 

package/deps/couchbase-cxx-client/couchbase/operations/document_get_and_touch.hxx

@@ -30,7 +30,7 @@ namespace couchbase::operations
 struct get_and_touch_response {
     error_context::key_value ctx;
     std::string value{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::uint32_t flags{};
 };
 

package/deps/couchbase-cxx-client/couchbase/operations/document_get_projected.hxx

@@ -30,7 +30,7 @@ namespace couchbase::operations
 struct get_projected_response {
     error_context::key_value ctx;
     std::string value{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::uint32_t flags{};
     std::optional<std::uint32_t> expiry{};
 };

package/deps/couchbase-cxx-client/couchbase/operations/document_increment.cxx

@@ -35,9 +35,6 @@ increment_request::encode_to(increment_request::encoded_request_type& encoded, m
         encoded.body().initial_value(0);
         encoded.body().expiry(0xffff'ffff);
     }
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     if (preserve_expiry) {
         encoded.body().preserve_expiry();
     }

package/deps/couchbase-cxx-client/couchbase/operations/document_increment.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_increment.hxx>
@@ -31,7 +32,7 @@ namespace couchbase::operations
 struct increment_response {
     error_context::key_value ctx;
     std::uint64_t content{};
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -47,7 +48,6 @@ struct increment_request {
     std::uint64_t delta{ 1 };
     std::optional<std::uint64_t> initial_value{};
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
     bool preserve_expiry{ false };
@@ -58,3 +58,10 @@ struct increment_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::increment_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_insert.cxx

@@ -30,9 +30,6 @@ insert_request::encode_to(insert_request::encoded_request_type& encoded, mcbp_co
     encoded.body().expiry(expiry);
     encoded.body().flags(flags);
     encoded.body().content(value);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     return {};
 }
 

package/deps/couchbase-cxx-client/couchbase/operations/document_insert.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_insert.hxx>
@@ -30,7 +31,7 @@ namespace couchbase::operations
 
 struct insert_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -46,7 +47,6 @@ struct insert_request {
     uint32_t flags{ 0 };
     uint32_t expiry{ 0 };
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
 
@@ -56,3 +56,10 @@ struct insert_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::insert_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_lookup_in.hxx

@@ -38,7 +38,7 @@ struct lookup_in_response {
         std::error_code ec{};
     };
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     std::vector<field> fields{};
     bool deleted{ false };
 };

package/deps/couchbase-cxx-client/couchbase/operations/document_mutate_in.cxx

@@ -51,9 +51,6 @@ mutate_in_request::encode_to(mutate_in_request::encoded_request_type& encoded, m
     encoded.body().create_as_deleted(create_as_deleted);
     encoded.body().store_semantics(store_semantics);
     encoded.body().specs(specs);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     if (preserve_expiry) {
         encoded.body().preserve_expiry();
     }

package/deps/couchbase-cxx-client/couchbase/operations/document_mutate_in.hxx

@@ -19,11 +19,12 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
-#include <couchbase/timeout_defaults.hxx>
-#include <couchbase/protocol/durability_level.hxx>
 #include <couchbase/protocol/cmd_mutate_in.hxx>
+#include <couchbase/protocol/durability_level.hxx>
+#include <couchbase/timeout_defaults.hxx>
 
 namespace couchbase::operations
 {
@@ -38,7 +39,7 @@ struct mutate_in_response {
         std::error_code ec{};
     };
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
     std::vector<field> fields{};
     std::optional<std::size_t> first_error_index{};
@@ -53,7 +54,7 @@ struct mutate_in_request {
     document_id id;
     uint16_t partition{};
     uint32_t opaque{};
-    protocol::cas cas{ 0 };
+    couchbase::cas cas{ 0 };
     bool access_deleted{ false };
     bool create_as_deleted{ false };
     std::optional<std::uint32_t> expiry{};
@@ -62,7 +63,6 @@ struct mutate_in_request {
     };
     protocol::mutate_in_request_body::mutate_in_specs specs{};
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
     bool preserve_expiry{ false };
@@ -73,3 +73,10 @@ struct mutate_in_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::mutate_in_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_prepend.cxx

@@ -28,9 +28,6 @@ prepend_request::encode_to(prepend_request::encoded_request_type& encoded, mcbp_
     encoded.partition(partition);
     encoded.body().id(id);
     encoded.body().content(value);
-    if (durability_level != protocol::durability_level::none) {
-        encoded.body().durability(durability_level, durability_timeout);
-    }
     return {};
 }
 

package/deps/couchbase-cxx-client/couchbase/operations/document_prepend.hxx

@@ -19,6 +19,7 @@
 
 #include <couchbase/error_context/key_value.hxx>
 #include <couchbase/io/mcbp_context.hxx>
+#include <couchbase/io/mcbp_traits.hxx>
 #include <couchbase/io/retry_context.hxx>
 #include <couchbase/protocol/client_request.hxx>
 #include <couchbase/protocol/cmd_prepend.hxx>
@@ -30,7 +31,7 @@ namespace couchbase::operations
 
 struct prepend_response {
     error_context::key_value ctx;
-    protocol::cas cas{};
+    couchbase::cas cas{};
     mutation_token token{};
 };
 
@@ -44,7 +45,6 @@ struct prepend_request {
     uint16_t partition{};
     uint32_t opaque{};
     protocol::durability_level durability_level{ protocol::durability_level::none };
-    std::optional<std::uint16_t> durability_timeout{};
     std::optional<std::chrono::milliseconds> timeout{};
     io::retry_context<io::retry_strategy::best_effort> retries{ false };
 
@@ -54,3 +54,10 @@ struct prepend_request {
 };
 
 } // namespace couchbase::operations
+
+namespace couchbase::io::mcbp_traits
+{
+template<>
+struct supports_durability<couchbase::operations::prepend_request> : public std::true_type {
+};
+} // namespace couchbase::io::mcbp_traits

package/deps/couchbase-cxx-client/couchbase/operations/document_query.cxx

@@ -74,13 +74,13 @@ query_request::encode_to(query_request::encoded_request_type& encoded, http_cont
         body["args"] = std::move(parameters);
     }
     switch (profile) {
-        case profile_mode::phases:
+        case couchbase::query_profile_mode::phases:
             body["profile"] = "phases";
             break;
-        case profile_mode::timings:
+        case couchbase::query_profile_mode::timings:
             body["profile"] = "timings";
             break;
-        case profile_mode::off:
+        case couchbase::query_profile_mode::off:
             break;
     }
     if (max_parallelism) {
@@ -110,10 +110,10 @@ query_request::encode_to(query_request::encoded_request_type& encoded, http_cont
     bool check_scan_wait = false;
     if (scan_consistency) {
         switch (scan_consistency.value()) {
-            case scan_consistency_type::not_bounded:
+            case couchbase::query_scan_consistency::not_bounded:
                 body["scan_consistency"] = "not_bounded";
                 break;
-            case scan_consistency_type::request_plus:
+            case couchbase::query_scan_consistency::request_plus:
                 check_scan_wait = true;
                 body["scan_consistency"] = "request_plus";
                 break;
@@ -190,7 +190,7 @@ query_request::make_response(error_context::query&& ctx, const encoded_response_
     query_response response{ std::move(ctx) };
     response.ctx.statement = statement;
     response.ctx.parameters = body_str;
-    response.served_by_node = response.ctx.last_dispatched_to.value_or("");
+    response.served_by_node = fmt::format("{}:{}", response.ctx.hostname, response.ctx.port);
     if (!response.ctx.ec) {
         tao::json::value payload;
         try {