couchbase 3.0.0.alpha.2-universal-darwin-19 → 3.0.0-universal-darwin-19

data/ext/couchbase/protocol/client_response.hxx

@@ -60,7 +60,7 @@ class client_response
     client_response() = default;
     explicit client_response(io::mcbp_message& msg)
     {
-        std::memcpy(header_.data(), &msg.header, sizeof(msg.header));
+        header_ = msg.header_data();
         data_ = std::move(msg.body);
         verify_header();
         parse_body();

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));
     }
 };

data/ext/couchbase/protocol/cmd_get_and_touch.hxx

@@ -79,7 +79,7 @@ class get_and_touch_request_body
 
   private:
     std::string key_;
-    std::uint32_t expiration_;
+    std::uint32_t expiry_;
     std::vector<std::uint8_t> extras_{};
 
   public:
@@ -92,9 +92,9 @@ class get_and_touch_request_body
         }
     }
 
-    void expiration(std::uint32_t seconds)
+    void expiry(std::uint32_t seconds)
     {
-        expiration_ = seconds;
+        expiry_ = seconds;
     }
 
     const std::string& key()
@@ -133,8 +133,8 @@ class get_and_touch_request_body
   private:
     void fill_extras()
     {
-        extras_.resize(sizeof(expiration_));
-        uint32_t field = htonl(expiration_);
+        extras_.resize(sizeof(expiry_));
+        uint32_t field = htonl(expiry_);
         memcpy(extras_.data(), &field, sizeof(field));
     }
 };

data/ext/couchbase/protocol/cmd_get_cluster_config.hxx

@@ -47,6 +47,11 @@ struct deduplicate_keys : Consumer {
 };
 } // namespace
 
+template<typename Iterator>
+configuration parse_config(Iterator begin, Iterator end) {
+    return tao::json::from_string<deduplicate_keys>(std::string(begin, end)).as<configuration>();
+}
+
 class get_cluster_config_response_body
 {
   public:
@@ -67,17 +72,12 @@ class get_cluster_config_response_body
                std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info& info)
+               const cmd_info&)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success) {
             std::vector<uint8_t>::difference_type offset = framing_extras_size + key_size + extras_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();
-                }
-            }
+            config_ = parse_config(body.begin() + offset, body.end());
             return true;
         }
         return false;

data/ext/couchbase/protocol/cmd_get_collection_id.hxx

@@ -0,0 +1,117 @@
+/* -*- 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 <gsl/gsl_assert>
+
+#include <protocol/client_opcode.hxx>
+#include <protocol/status.hxx>
+#include <protocol/cmd_info.hxx>
+
+namespace couchbase::protocol
+{
+
+class get_collection_id_response_body
+{
+  public:
+    static const inline client_opcode opcode = client_opcode::get_collection_id;
+
+  private:
+    std::uint64_t manifest_uid_;
+    std::uint32_t collection_uid_;
+
+  public:
+    [[nodiscard]] std::uint64_t manifest_uid()
+    {
+        return manifest_uid_;
+    }
+
+    [[nodiscard]] std::uint32_t collection_uid()
+    {
+        return collection_uid_;
+    }
+
+    bool parse(protocol::status status,
+               const header_buffer& header,
+               std::uint8_t framing_extras_size,
+               std::uint16_t key_size,
+               std::uint8_t extras_size,
+               const std::vector<uint8_t>& body,
+               const cmd_info&)
+    {
+        Expects(header[1] == static_cast<uint8_t>(opcode));
+        if (status == protocol::status::success && extras_size == 12) {
+            std::vector<uint8_t>::difference_type offset = framing_extras_size + key_size;
+
+            memcpy(&manifest_uid_, body.data() + offset, sizeof(manifest_uid_));
+            manifest_uid_ = utils::byte_swap_64(manifest_uid_);
+            offset += 8;
+
+            memcpy(&collection_uid_, body.data() + offset, sizeof(collection_uid_));
+            collection_uid_ = ntohl(collection_uid_);
+            return true;
+        }
+        return false;
+    }
+};
+
+class get_collection_id_request_body
+{
+  public:
+    using response_body_type = get_collection_id_response_body;
+    static const inline client_opcode opcode = client_opcode::get_collection_id;
+
+  private:
+    std::string key_;
+
+  public:
+    void collection_path(const std::string& path)
+    {
+        key_ = path;
+    }
+
+    const std::string& key()
+    {
+        return key_;
+    }
+
+    const std::vector<std::uint8_t>& framing_extras()
+    {
+        static std::vector<std::uint8_t> empty;
+        return empty;
+    }
+
+    const std::vector<std::uint8_t>& extras()
+    {
+        static std::vector<std::uint8_t> empty;
+        return empty;
+    }
+
+    const std::vector<std::uint8_t>& value()
+    {
+        static std::vector<std::uint8_t> empty;
+        return empty;
+    }
+
+    std::size_t size()
+    {
+        return key_.size();
+    }
+};
+
+} // namespace couchbase::protocol

data/ext/couchbase/protocol/cmd_hello.hxx

@@ -99,6 +99,16 @@ class hello_request_body
         key_ = std::move(val);
     }
 
+    [[nodiscard]] const std::string& user_agent() const
+    {
+        return key_;
+    }
+
+    [[nodiscard]] const std::vector<hello_feature>& features() const
+    {
+        return features_;
+    }
+
     const std::string& key()
     {
         return key_;

data/ext/couchbase/protocol/cmd_increment.hxx

@@ -85,7 +85,7 @@ class increment_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 increment_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 increment_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 increment_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));
     }
 };

data/ext/couchbase/protocol/cmd_info.hxx

@@ -20,17 +20,6 @@
 namespace couchbase::protocol
 {
 struct cmd_info {
-    asio::ip::tcp::endpoint local_endpoint{};
-    asio::ip::tcp::endpoint remote_endpoint{};
     double server_duration_us{ 0 };
-
-    template<class AsyncStream>
-    void extract_from_stream(AsyncStream& stream)
-    {
-        std::error_code err;
-        local_endpoint = stream.local_endpoint(err);
-        remote_endpoint = stream.remote_endpoint(err);
-        (void)err;
-    }
 };
 } // namespace couchbase::protocol

data/ext/couchbase/protocol/cmd_insert.hxx

@@ -78,7 +78,7 @@ class insert_request_body
     std::vector<std::uint8_t> extras_{};
     std::vector<std::uint8_t> content_{};
     std::uint32_t flags_{};
-    std::uint32_t expiration_{};
+    std::uint32_t expiry_{};
     std::vector<std::uint8_t> framing_extras_{};
 
   public:
@@ -120,9 +120,9 @@ class insert_request_body
         flags_ = flags;
     }
 
-    void expiration(uint32_t value)
+    void expiry(uint32_t value)
     {
-        expiration_ = value;
+        expiry_ = value;
     }
 
     const std::string& key()
@@ -159,12 +159,12 @@ class insert_request_body
   private:
     void fill_extention()
     {
-        extras_.resize(sizeof(flags_) + sizeof(expiration_));
+        extras_.resize(sizeof(flags_) + sizeof(expiry_));
 
         uint32_t field = htonl(flags_);
         memcpy(extras_.data(), &field, sizeof(field));
 
-        field = htonl(expiration_);
+        field = htonl(expiry_);
         memcpy(extras_.data() + sizeof(flags_), &field, sizeof(field));
     }
 };

data/ext/couchbase/protocol/cmd_lookup_in.hxx

@@ -100,6 +100,7 @@ class lookup_in_request_body
             std::uint8_t opcode;
             std::uint8_t flags;
             std::string path;
+            std::size_t original_index{};
         };
         std::vector<entry> entries;
 

data/ext/couchbase/protocol/cmd_mutate_in.hxx

@@ -116,7 +116,26 @@ class mutate_in_request_body
     using response_body_type = mutate_in_response_body;
     static const inline client_opcode opcode = client_opcode::subdoc_multi_mutation;
 
-    static const inline uint8_t doc_flag_access_deleted = 0x04;
+    enum class store_semantics_type {
+        /**
+         * Replace the document, fail if it does not exist. This is the default.
+         */
+        replace,
+
+        /**
+         * Replace the document or create it if it does not exist.
+         */
+        upsert,
+
+        /**
+         * Replace the document or create it if it does not exist.
+         */
+        insert,
+    };
+
+    static const inline uint8_t doc_flag_access_deleted = 0b0000'0100;
+    static const inline uint8_t doc_flag_mkdoc = 0b0000'0001;
+    static const inline uint8_t doc_flag_add = 0b0000'0010;
 
     struct mutate_in_specs {
         static const inline uint8_t path_flag_create_parents = 0x01;
@@ -128,6 +147,7 @@ class mutate_in_request_body
             std::uint8_t flags;
             std::string path;
             std::string param;
+            std::size_t original_index{};
         };
         std::vector<entry> entries;
 
@@ -188,6 +208,7 @@ class mutate_in_request_body
     std::vector<std::uint8_t> extras_{};
     std::vector<std::uint8_t> value_{};
 
+    std::uint32_t expiry_{ 0 };
     std::uint8_t flags_{ 0 };
     mutate_in_specs specs_;
     std::vector<std::uint8_t> framing_extras_{};
@@ -202,12 +223,33 @@ class mutate_in_request_body
         }
     }
 
+    void expiry(uint32_t value)
+    {
+        expiry_ = value;
+    }
+
     void access_deleted(bool value)
     {
         if (value) {
-            flags_ = doc_flag_access_deleted;
+            flags_ |= doc_flag_access_deleted;
         } else {
-            flags_ = 0;
+            flags_ &= static_cast<std::uint8_t>(~doc_flag_access_deleted);
+        }
+    }
+
+    void store_semantics(store_semantics_type semantics)
+    {
+        flags_ &= 0b1111'1100; /* reset first two bits */
+        switch (semantics) {
+            case store_semantics_type::replace:
+                /* leave bits as zeros */
+                break;
+            case store_semantics_type::upsert:
+                flags_ |= doc_flag_mkdoc;
+                break;
+            case store_semantics_type::insert:
+                flags_ |= doc_flag_add;
+                break;
         }
     }
 
@@ -275,9 +317,15 @@ class mutate_in_request_body
   private:
     void fill_extention()
     {
+        if (expiry_ != 0) {
+            extras_.resize(sizeof(expiry_));
+            std::uint32_t field = htonl(expiry_);
+            memcpy(extras_.data(), &field, sizeof(field));
+        }
         if (flags_ != 0) {
-            extras_.resize(sizeof(flags_));
-            extras_[0] = flags_;
+            std::size_t offset = extras_.size();
+            extras_.resize(offset + sizeof(flags_));
+            extras_[offset] = flags_;
         }
     }