couchbase 3.0.0.alpha.1 → 3.0.0.alpha.2

data/ext/couchbase/protocol/cmd_mutate_in.hxx

@@ -20,7 +20,7 @@
 #include <protocol/unsigned_leb128.h>
 
 #include <protocol/client_opcode.hxx>
-#include <operations/document_id.hxx>
+#include <document_id.hxx>
 
 namespace couchbase::protocol
 {
@@ -38,6 +38,7 @@ class mutate_in_response_body
 
   private:
     std::vector<mutate_in_field> fields_;
+    mutation_token token_;
 
   public:
     std::vector<mutate_in_field>& fields()
@@ -45,13 +46,35 @@ class mutate_in_response_body
         return fields_;
     }
 
-    bool parse(protocol::status status, const header_buffer& header, const std::vector<uint8_t>& body, const cmd_info&)
+    mutation_token& token()
+    {
+        return token_;
+    }
+
+    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 || status == protocol::status::subdoc_multi_path_failure) {
             using offset_type = std::vector<uint8_t>::difference_type;
-            uint8_t ext_size = header[4];
-            offset_type offset = ext_size;
+            offset_type offset = framing_extras_size;
+            if (extras_size == 16) {
+                memcpy(&token_.partition_uuid, body.data() + offset, sizeof(token_.partition_uuid));
+                token_.partition_uuid = utils::byte_swap_64(token_.partition_uuid);
+                offset += 8;
+
+                memcpy(&token_.sequence_number, body.data() + offset, sizeof(token_.sequence_number));
+                token_.sequence_number = utils::byte_swap_64(token_.sequence_number);
+                offset += 8;
+            } else {
+                offset += extras_size;
+            }
+            offset += key_size;
             fields_.reserve(16); /* we won't have more than 16 entries anyway */
             while (static_cast<std::size_t>(offset) < body.size()) {
                 mutate_in_field field;
@@ -162,16 +185,21 @@ class mutate_in_request_body
 
   private:
     std::string key_;
-    std::vector<std::uint8_t> ext_{};
+    std::vector<std::uint8_t> extras_{};
     std::vector<std::uint8_t> value_{};
 
     std::uint8_t flags_{ 0 };
     mutate_in_specs specs_;
+    std::vector<std::uint8_t> framing_extras_{};
 
   public:
-    void id(const operations::document_id& id)
+    void id(const document_id& id)
     {
         key_ = id.key;
+        if (id.collection_uid) {
+            unsigned_leb128<uint32_t> encoded(*id.collection_uid);
+            key_.insert(0, encoded.get());
+        }
     }
 
     void access_deleted(bool value)
@@ -188,17 +216,41 @@ class mutate_in_request_body
         specs_ = specs;
     }
 
+    void durability(protocol::durability_level level, std::optional<std::uint16_t> timeout)
+    {
+        if (level == protocol::durability_level::none) {
+            return;
+        }
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        if (timeout) {
+            framing_extras_.resize(4);
+            framing_extras_[0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+            uint16_t val = htons(*timeout);
+            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+        } else {
+            framing_extras_.resize(2);
+            framing_extras_[0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+        }
+    }
+
     const std::string& key()
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& extension()
+    const std::vector<std::uint8_t>& framing_extras()
+    {
+        return framing_extras_;
+    }
+
+    const std::vector<std::uint8_t>& extras()
     {
-        if (ext_.empty()) {
+        if (extras_.empty()) {
             fill_extention();
         }
-        return ext_;
+        return extras_;
     }
 
     const std::vector<std::uint8_t>& value()
@@ -211,21 +263,21 @@ class mutate_in_request_body
 
     std::size_t size()
     {
-        if (ext_.empty()) {
+        if (extras_.empty()) {
             fill_extention();
         }
         if (value_.empty()) {
             fill_value();
         }
-        return key_.size() + ext_.size() + value_.size();
+        return framing_extras_.size() + extras_.size() + key_.size() + value_.size();
     }
 
   private:
     void fill_extention()
     {
         if (flags_ != 0) {
-            ext_.resize(sizeof(flags_));
-            ext_[0] = flags_;
+            extras_.resize(sizeof(flags_));
+            extras_[0] = flags_;
         }
     }
 

data/ext/couchbase/protocol/cmd_remove.hxx

@@ -20,7 +20,7 @@
 #include <protocol/unsigned_leb128.h>
 
 #include <protocol/client_opcode.hxx>
-#include <operations/document_id.hxx>
+#include <document_id.hxx>
 
 namespace couchbase::protocol
 {
@@ -30,10 +30,36 @@ class remove_response_body
   public:
     static const inline client_opcode opcode = client_opcode::remove;
 
+    mutation_token token_;
+
   public:
-    bool parse(protocol::status, const header_buffer& header, const std::vector<uint8_t>&, const cmd_info&)
+    mutation_token& token()
+    {
+        return token_;
+    }
+
+    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) {
+            using offset_type = std::vector<uint8_t>::difference_type;
+            offset_type offset = framing_extras_size;
+            if (extras_size == 16) {
+                memcpy(&token_.partition_uuid, body.data() + offset, sizeof(token_.partition_uuid));
+                token_.partition_uuid = utils::byte_swap_64(token_.partition_uuid);
+                offset += 8;
+
+                memcpy(&token_.sequence_number, body.data() + offset, sizeof(token_.sequence_number));
+                token_.sequence_number = utils::byte_swap_64(token_.sequence_number);
+            }
+            return true;
+        }
         return false;
     }
 };
@@ -46,11 +72,35 @@ class remove_request_body
 
   private:
     std::string key_;
+    std::vector<std::uint8_t> framing_extras_{};
 
   public:
-    void id(const operations::document_id& id)
+    void id(const document_id& id)
     {
         key_ = id.key;
+        if (id.collection_uid) {
+            unsigned_leb128<uint32_t> encoded(*id.collection_uid);
+            key_.insert(0, encoded.get());
+        }
+    }
+
+    void durability(protocol::durability_level level, std::optional<std::uint16_t> timeout)
+    {
+        if (level == protocol::durability_level::none) {
+            return;
+        }
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        if (timeout) {
+            framing_extras_.resize(4);
+            framing_extras_[0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+            uint16_t val = htons(*timeout);
+            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+        } else {
+            framing_extras_.resize(2);
+            framing_extras_[0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+        }
     }
 
     const std::string& key()
@@ -58,7 +108,12 @@ class remove_request_body
         return key_;
     }
 
-    const std::vector<std::uint8_t>& extension()
+    const std::vector<std::uint8_t>& framing_extras()
+    {
+        return framing_extras_;
+    }
+
+    const std::vector<std::uint8_t>& extras()
     {
         static std::vector<std::uint8_t> empty;
         return empty;

data/ext/couchbase/protocol/cmd_replace.hxx

@@ -0,0 +1,172 @@
+/* -*- 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 <protocol/status.hxx>
+#include <protocol/client_opcode.hxx>
+#include <protocol/frame_info_id.hxx>
+#include <protocol/unsigned_leb128.h>
+#include <protocol/durability_level.hxx>
+#include <mutation_token.hxx>
+#include <utils/byteswap.hxx>
+
+namespace couchbase::protocol
+{
+
+class replace_response_body
+{
+  public:
+    static const inline client_opcode opcode = client_opcode::replace;
+
+  private:
+    mutation_token token_;
+
+  public:
+    mutation_token& token()
+    {
+        return token_;
+    }
+
+    bool parse(protocol::status status,
+               const header_buffer& header,
+               std::uint8_t framing_extras_size,
+               std::uint16_t,
+               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) {
+            std::vector<uint8_t>::difference_type offset = framing_extras_size;
+            if (extras_size == 16) {
+                memcpy(&token_.partition_uuid, body.data() + offset, sizeof(token_.partition_uuid));
+                token_.partition_uuid = utils::byte_swap_64(token_.partition_uuid);
+                offset += 8;
+
+                memcpy(&token_.sequence_number, body.data() + offset, sizeof(token_.sequence_number));
+                token_.sequence_number = utils::byte_swap_64(token_.sequence_number);
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+class replace_request_body
+{
+  public:
+    using response_body_type = replace_response_body;
+    static const inline client_opcode opcode = client_opcode::replace;
+
+  private:
+    std::string key_{};
+    std::vector<std::uint8_t> extras_{};
+    std::vector<std::uint8_t> content_{};
+    std::uint32_t flags_{};
+    std::uint32_t expiration_{};
+    std::vector<std::uint8_t> framing_extras_{};
+
+  public:
+    void id(const document_id& id)
+    {
+        key_ = id.key;
+        if (id.collection_uid) {
+            unsigned_leb128<uint32_t> encoded(*id.collection_uid);
+            key_.insert(0, encoded.get());
+        }
+    }
+
+    void durability(protocol::durability_level level, std::optional<std::uint16_t> timeout)
+    {
+        if (level == protocol::durability_level::none) {
+            return;
+        }
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        if (timeout) {
+            framing_extras_.resize(4);
+            framing_extras_[0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+            uint16_t val = htons(*timeout);
+            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+        } else {
+            framing_extras_.resize(2);
+            framing_extras_[0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[1] = static_cast<std::uint8_t>(level);
+        }
+    }
+
+    void content(const std::string& content)
+    {
+        content_ = { content.begin(), content.end() };
+    }
+
+    void flags(uint32_t flags)
+    {
+        flags_ = flags;
+    }
+
+    void expiration(uint32_t value)
+    {
+        expiration_ = value;
+    }
+
+    const std::string& key()
+    {
+        return key_;
+    }
+
+    const std::vector<std::uint8_t>& framing_extras()
+    {
+        return framing_extras_;
+    }
+
+    const std::vector<std::uint8_t>& extras()
+    {
+        if (extras_.empty()) {
+            fill_extention();
+        }
+        return extras_;
+    }
+
+    const std::vector<std::uint8_t>& value()
+    {
+        return content_;
+    }
+
+    std::size_t size()
+    {
+        if (extras_.empty()) {
+            fill_extention();
+        }
+        return framing_extras_.size() + extras_.size() + key_.size() + content_.size();
+    }
+
+  private:
+    void fill_extention()
+    {
+        extras_.resize(sizeof(flags_) + sizeof(expiration_));
+
+        uint32_t field = htonl(flags_);
+        memcpy(extras_.data(), &field, sizeof(field));
+
+        field = htonl(expiration_);
+        memcpy(extras_.data() + sizeof(flags_), &field, sizeof(field));
+    }
+};
+
+} // namespace couchbase::protocol

data/ext/couchbase/protocol/cmd_sasl_auth.hxx

@@ -32,11 +32,17 @@ class sasl_auth_response_body
     std::string value_;
 
   public:
-    bool parse(protocol::status status, const header_buffer& header, const std::vector<uint8_t>& body, const cmd_info&)
+    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 || status == protocol::status::auth_continue) {
-            value_ = { body.begin(), body.end() };
+            value_.assign(body.begin() + framing_extras_size + extras_size + key_size, body.end());
             return true;
         }
         return false;
@@ -74,7 +80,13 @@ class sasl_auth_request_body
         return key_;
     }
 
-    const std::vector<std::uint8_t>& extension()
+    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;