couchbase 3.0.0.alpha.5 → 3.0.0.beta.1

data/ext/couchbase/operations/query_index_get_all.hxx

@@ -36,7 +36,7 @@ struct query_index_get_all_response {
         std::vector<std::string> index_key{};
         std::optional<std::string> condition{};
     };
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::vector<query_index> indexes{};
@@ -49,7 +49,7 @@ struct query_index_get_all_request {
 
     static const inline service_type type = service_type::query;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::string bucket_name;
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
@@ -61,7 +61,7 @@ struct query_index_get_all_request {
               fmt::format(
                 R"(SELECT idx.* FROM system:indexes AS idx WHERE keyspace_id = "{}" AND `using`="gsi" ORDER BY is_primary DESC, name ASC)",
                 bucket_name) },
-            { "client_context_id", uuid::to_string(client_context_id) }
+            { "client_context_id", client_context_id }
         };
         encoded.method = "POST";
         encoded.path = "/query/service";

data/ext/couchbase/operations/scope_create.hxx

@@ -27,6 +27,7 @@ namespace couchbase::operations
 {
 
 struct scope_create_response {
+    std::string client_context_id;
     std::error_code ec;
     std::uint64_t uid{ 0 };
 };
@@ -41,6 +42,7 @@ struct scope_create_request {
     std::string bucket_name;
     std::string scope_name;
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
 
     void encode_to(encoded_request_type& encoded)
     {
@@ -52,9 +54,9 @@ struct scope_create_request {
 };
 
 scope_create_response
-make_response(std::error_code ec, scope_create_request&, scope_create_request::encoded_response_type encoded)
+make_response(std::error_code ec, scope_create_request& request, scope_create_request::encoded_response_type encoded)
 {
-    scope_create_response response{ ec };
+    scope_create_response response{ request.client_context_id, ec };
     if (!ec) {
         switch (encoded.status_code) {
             case 400:

data/ext/couchbase/operations/scope_drop.hxx

@@ -27,6 +27,7 @@ namespace couchbase::operations
 {
 
 struct scope_drop_response {
+    std::string client_context_id;
     std::error_code ec;
     std::uint64_t uid{ 0 };
 };
@@ -41,6 +42,7 @@ struct scope_drop_request {
     std::string bucket_name;
     std::string scope_name;
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
 
     void encode_to(encoded_request_type& encoded)
     {
@@ -50,9 +52,9 @@ struct scope_drop_request {
 };
 
 scope_drop_response
-make_response(std::error_code ec, scope_drop_request&, scope_drop_request::encoded_response_type encoded)
+make_response(std::error_code ec, scope_drop_request& request, scope_drop_request::encoded_response_type encoded)
 {
-    scope_drop_response response{ ec };
+    scope_drop_response response{ request.client_context_id, ec };
     if (!ec) {
         switch (encoded.status_code) {
             case 400:

data/ext/couchbase/operations/scope_get_all.hxx

@@ -27,6 +27,7 @@ namespace couchbase::operations
 {
 
 struct scope_get_all_response {
+    std::string client_context_id;
     std::error_code ec;
     collections_manifest manifest{};
 };
@@ -40,6 +41,7 @@ struct scope_get_all_request {
 
     std::string bucket_name;
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
 
     void encode_to(encoded_request_type& encoded)
     {
@@ -49,9 +51,9 @@ struct scope_get_all_request {
 };
 
 scope_get_all_response
-make_response(std::error_code ec, scope_get_all_request&, scope_get_all_request::encoded_response_type encoded)
+make_response(std::error_code ec, scope_get_all_request& request, scope_get_all_request::encoded_response_type encoded)
 {
-    scope_get_all_response response{ ec };
+    scope_get_all_response response{ request.client_context_id, ec };
     if (!ec) {
         switch (encoded.status_code) {
             case 400:

data/ext/couchbase/operations/search_index_analyze_document.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_analyze_document_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -38,7 +38,7 @@ struct search_index_analyze_document_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_control_ingest.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_control_ingest_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -37,7 +37,7 @@ struct search_index_control_ingest_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_control_plan_freeze.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_control_plan_freeze_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -37,7 +37,7 @@ struct search_index_control_plan_freeze_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_control_query.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_control_query_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -37,7 +37,7 @@ struct search_index_control_query_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_drop.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_drop_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -37,7 +37,7 @@ struct search_index_drop_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_get.hxx

@@ -25,7 +25,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     search_index index{};
@@ -39,7 +39,7 @@ struct search_index_get_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_get_all.hxx

@@ -25,7 +25,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_all_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string impl_version{};
@@ -39,7 +39,7 @@ struct search_index_get_all_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_get_documents_count.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_get_documents_count_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::uint64_t count{ 0 };
@@ -38,7 +38,7 @@ struct search_index_get_documents_count_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     std::string index_name;

data/ext/couchbase/operations/search_index_upsert.hxx

@@ -24,7 +24,7 @@
 namespace couchbase::operations
 {
 struct search_index_upsert_response {
-    uuid::uuid_t client_context_id;
+    std::string client_context_id;
     std::error_code ec;
     std::string status{};
     std::string error{};
@@ -37,7 +37,7 @@ struct search_index_upsert_request {
 
     static const inline service_type type = service_type::search;
 
-    uuid::uuid_t client_context_id{ uuid::random() };
+    std::string client_context_id{ uuid::to_string(uuid::random()) };
     std::chrono::milliseconds timeout{ timeout_defaults::management_timeout };
 
     search_index index;

data/ext/couchbase/origin.hxx

@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *     Copyright 2020 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
+
+#include <string>
+
+#include <utils/connection_string.hxx>
+
+namespace couchbase
+{
+struct origin {
+    using node_entry = std::pair<std::string, std::string>;
+    using node_list = std::vector<node_entry>;
+
+    origin() = default;
+
+    origin(origin&& other) = default;
+
+    origin(const origin& other)
+      : options_(other.options_)
+      , username_(other.username_)
+      , password_(other.password_)
+      , nodes_(other.nodes_)
+      , next_node_(nodes_.begin())
+    {
+    }
+
+    origin(std::string username, std::string password, const std::string& hostname, std::uint16_t port, const cluster_options& options)
+      : options_(options)
+      , username_(std::move(username))
+      , password_(std::move(password))
+      , nodes_{ { hostname, std::to_string(port) } }
+      , next_node_(nodes_.begin())
+    {
+    }
+
+    origin(std::string username, std::string password, const utils::connection_string& connstr)
+      : options_(connstr.options)
+      , username_(std::move(username))
+      , password_(std::move(password))
+    {
+        nodes_.reserve(connstr.bootstrap_nodes.size());
+        for (const auto& node : connstr.bootstrap_nodes) {
+            nodes_.emplace_back(
+              std::make_pair(node.address, node.port > 0 ? std::to_string(node.port) : std::to_string(connstr.default_port)));
+        }
+        next_node_ = nodes_.begin();
+    }
+
+    origin& operator=(const origin& other)
+    {
+        if (this != &other) {
+            options_ = other.options_;
+            username_ = other.username_;
+            password_ = other.password_;
+            nodes_ = other.nodes_;
+            next_node_ = nodes_.begin();
+            exhausted_ = false;
+        }
+        return *this;
+    }
+
+    [[nodiscard]] const std::string& get_username() const
+    {
+        return username_;
+    }
+
+    [[nodiscard]] const std::string& get_password() const
+    {
+        return password_;
+    }
+
+    [[nodiscard]] std::vector<std::string> get_nodes() const
+    {
+        std::vector<std::string> res;
+        res.reserve(nodes_.size());
+        for (const auto &node : nodes_) {
+            res.emplace_back(fmt::format("\"{}:{}\"", node.first, node.second));
+        }
+        return res;
+    }
+
+    void set_nodes(node_list nodes)
+    {
+        nodes_ = std::move(nodes);
+        next_node_ = nodes_.begin();
+        exhausted_ = false;
+    }
+
+    [[nodiscard]] std::pair<std::string, std::string> next_address()
+    {
+        if (exhausted_) {
+            restart();
+        }
+
+        auto address = *next_node_;
+        if (++next_node_ == nodes_.end()) {
+            exhausted_ = true;
+        }
+        return address;
+    }
+
+    [[nodiscard]] bool exhausted() const
+    {
+        return exhausted_;
+    }
+
+    void restart()
+    {
+        exhausted_ = false;
+        next_node_ = nodes_.begin();
+    }
+
+    [[nodiscard]] const couchbase::cluster_options& options() const
+    {
+        return options_;
+    }
+
+    [[nodiscard]] couchbase::cluster_options& options()
+    {
+        return options_;
+    }
+
+  private:
+    couchbase::cluster_options options_{};
+    std::string username_{};
+    std::string password_{};
+    node_list nodes_{};
+    node_list::iterator next_node_{};
+    bool exhausted_{ false };
+};
+
+} // namespace couchbase

data/ext/couchbase/protocol/cmd_cluster_map_change_notification.hxx

@@ -53,7 +53,7 @@ class cluster_map_change_notification_request_body
         return config_;
     }
 
-    bool parse(const header_buffer& header, const std::vector<uint8_t>& body, const cmd_info& info)
+    bool parse(const header_buffer& header, const std::vector<uint8_t>& body, const cmd_info&)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         using offset_type = std::vector<uint8_t>::difference_type;
@@ -69,11 +69,6 @@ class cluster_map_change_notification_request_body
         bucket_.assign(body.begin() + offset, body.begin() + offset + key_size);
         offset += key_size;
         config_ = tao::json::from_string<deduplicate_keys>(std::string(body.begin() + offset, body.end())).as<configuration>();
-        for (auto& node : config_.nodes) {
-            if (node.this_node && node.hostname.empty()) {
-                node.hostname = info.remote_endpoint.address().to_string();
-            }
-        }
         return true;
     }
 };

data/ext/couchbase/protocol/cmd_decrement.hxx

@@ -85,7 +85,7 @@ class decrement_request_body
     std::vector<std::uint8_t> framing_extras_{};
     std::uint64_t delta_{ 1 };
     std::uint64_t initial_value_{ 0 };
-    std::uint32_t expiration_{ 0 };
+    std::uint32_t expiry_{ 0 };
     std::vector<std::uint8_t> extras_{};
 
   public:
@@ -108,9 +108,9 @@ class decrement_request_body
         initial_value_ = value;
     }
 
-    void expiration(std::uint32_t value)
+    void expiry(std::uint32_t value)
     {
-        expiration_ = value;
+        expiry_ = value;
     }
 
     void durability(protocol::durability_level level, std::optional<std::uint16_t> timeout)
@@ -167,7 +167,7 @@ class decrement_request_body
   private:
     void fill_extras()
     {
-        extras_.resize(sizeof(delta_) + sizeof(initial_value_) + sizeof(expiration_));
+        extras_.resize(sizeof(delta_) + sizeof(initial_value_) + sizeof(expiry_));
         using offset_type = std::vector<uint8_t>::difference_type;
         offset_type offset = 0;
 
@@ -179,7 +179,7 @@ class decrement_request_body
         memcpy(extras_.data() + offset, &num, sizeof(num));
         offset += static_cast<offset_type>(sizeof(delta_));
 
-        std::uint32_t ttl = htonl(expiration_);
+        std::uint32_t ttl = htonl(expiry_);
         memcpy(extras_.data() + offset, &ttl, sizeof(ttl));
     }
 };