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

data/ext/couchbase/operations/scope_create.hxx

@@ -0,0 +1,81 @@
+/* -*- 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 <tao/json.hpp>
+
+#include <version.hxx>
+#include <operations/bucket_settings.hxx>
+#include <utils/url_codec.hxx>
+
+namespace couchbase::operations
+{
+
+struct scope_create_response {
+    std::error_code ec;
+    std::uint64_t uid{ 0 };
+};
+
+struct scope_create_request {
+    using response_type = scope_create_response;
+    using encoded_request_type = io::http_request;
+    using encoded_response_type = io::http_response;
+
+    static const inline service_type type = service_type::management;
+
+    std::string bucket_name;
+    std::string scope_name;
+
+    void encode_to(encoded_request_type& encoded)
+    {
+        encoded.method = "POST";
+        encoded.path = fmt::format("/pools/default/buckets/{}/collections", bucket_name);
+        encoded.headers["content-type"] = "application/x-www-form-urlencoded";
+        encoded.body = fmt::format("name={}", utils::string_codec::form_encode(scope_name));
+    }
+};
+
+scope_create_response
+make_response(std::error_code ec, scope_create_request&, scope_create_request::encoded_response_type encoded)
+{
+    scope_create_response response{ ec };
+    if (!ec) {
+        switch (encoded.status_code) {
+            case 400:
+                if (encoded.body.find("Not allowed on this version") != std::string::npos) {
+                    response.ec = std::make_error_code(error::common_errc::unsupported_operation);
+                } else {
+                    response.ec = std::make_error_code(error::management_errc::scope_exists);
+                }
+                break;
+            case 404:
+                response.ec = std::make_error_code(error::common_errc::bucket_not_found);
+                break;
+            case 200: {
+                tao::json::value payload = tao::json::from_string(encoded.body);
+                response.uid = std::stoull(payload.at("uid").get_string(), 0, 16);
+            } break;
+            default:
+                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                break;
+        }
+    }
+    return response;
+}
+
+} // namespace couchbase::operations

data/ext/couchbase/operations/scope_drop.hxx

@@ -0,0 +1,79 @@
+/* -*- 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 <tao/json.hpp>
+
+#include <version.hxx>
+#include <operations/bucket_settings.hxx>
+#include <utils/url_codec.hxx>
+
+namespace couchbase::operations
+{
+
+struct scope_drop_response {
+    std::error_code ec;
+    std::uint64_t uid{ 0 };
+};
+
+struct scope_drop_request {
+    using response_type = scope_drop_response;
+    using encoded_request_type = io::http_request;
+    using encoded_response_type = io::http_response;
+
+    static const inline service_type type = service_type::management;
+
+    std::string bucket_name;
+    std::string scope_name;
+
+    void encode_to(encoded_request_type& encoded)
+    {
+        encoded.method = "DELETE";
+        encoded.path = fmt::format("/pools/default/buckets/{}/collections/{}", bucket_name, scope_name);
+    }
+};
+
+scope_drop_response
+make_response(std::error_code ec, scope_drop_request&, scope_drop_request::encoded_response_type encoded)
+{
+    scope_drop_response response{ ec };
+    if (!ec) {
+        switch (encoded.status_code) {
+            case 400:
+                response.ec = std::make_error_code(error::common_errc::unsupported_operation);
+                break;
+            case 404:
+                if (encoded.body.find("Scope with this name is not found") != std::string::npos) {
+                    response.ec = std::make_error_code(error::common_errc::scope_not_found);
+                } else {
+                    response.ec = std::make_error_code(error::common_errc::bucket_not_found);
+                }
+                break;
+            case 200: {
+                tao::json::value payload = tao::json::from_string(encoded.body);
+                response.uid = std::stoull(payload.at("uid").get_string(), 0, 16);
+            } break;
+            default:
+                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                break;
+        }
+    }
+    return response;
+}
+
+} // namespace couchbase::operations

data/ext/couchbase/operations/scope_get_all.hxx

@@ -0,0 +1,72 @@
+/* -*- 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 <tao/json.hpp>
+
+#include <version.hxx>
+#include <operations/bucket_settings.hxx>
+
+namespace couchbase::operations
+{
+
+struct scope_get_all_response {
+    std::error_code ec;
+    collections_manifest manifest{};
+};
+
+struct scope_get_all_request {
+    using response_type = scope_get_all_response;
+    using encoded_request_type = io::http_request;
+    using encoded_response_type = io::http_response;
+
+    static const inline service_type type = service_type::management;
+
+    std::string bucket_name;
+
+    void encode_to(encoded_request_type& encoded)
+    {
+        encoded.method = "GET";
+        encoded.path = fmt::format("/pools/default/buckets/{}/collections", bucket_name);
+    }
+};
+
+scope_get_all_response
+make_response(std::error_code ec, scope_get_all_request&, scope_get_all_request::encoded_response_type encoded)
+{
+    scope_get_all_response response{ ec };
+    if (!ec) {
+        switch (encoded.status_code) {
+            case 400:
+                response.ec = std::make_error_code(error::common_errc::unsupported_operation);
+                break;
+            case 404:
+                response.ec = std::make_error_code(error::common_errc::bucket_not_found);
+                break;
+            case 200:
+                response.manifest = tao::json::from_string(encoded.body).as<collections_manifest>();
+                break;
+            default:
+                response.ec = std::make_error_code(error::common_errc::internal_server_failure);
+                break;
+        }
+    }
+    return response;
+}
+
+} // namespace couchbase::operations

data/ext/couchbase/protocol/client_opcode.hxx

@@ -28,11 +28,18 @@ enum class client_opcode : uint8_t {
     insert = 0x02,
     replace = 0x03,
     remove = 0x04,
+    increment = 0x05,
+    decrement = 0x06,
+    touch = 0x1c,
+    get_and_touch = 0x1d,
     hello = 0x1f,
     sasl_list_mechs = 0x20,
     sasl_auth = 0x21,
     sasl_step = 0x22,
     select_bucket = 0x89,
+    observe = 0x92,
+    get_and_lock = 0x94,
+    unlock = 0x95,
     get_collections_manifest = 0xba,
     subdoc_multi_lookup = 0xd0,
     subdoc_multi_mutation = 0xd1,
@@ -79,6 +86,13 @@ is_valid_client_opcode(uint8_t code)
         case client_opcode::get_error_map:
         case client_opcode::invalid:
         case client_opcode::get_collections_manifest:
+        case client_opcode::touch:
+        case client_opcode::observe:
+        case client_opcode::get_and_lock:
+        case client_opcode::unlock:
+        case client_opcode::get_and_touch:
+        case client_opcode::increment:
+        case client_opcode::decrement:
             return true;
     }
     return false;
@@ -161,6 +175,27 @@ struct fmt::formatter : formatter
             case couchbase::protocol::client_opcode::get_collections_manifest:
                 name = "get_collections_manifest";
                 break;
+            case couchbase::protocol::client_opcode::touch:
+                name = "touch";
+                break;
+            case couchbase::protocol::client_opcode::observe:
+                name = "observe";
+                break;
+            case couchbase::protocol::client_opcode::get_and_lock:
+                name = "get_and_lock";
+                break;
+            case couchbase::protocol::client_opcode::unlock:
+                name = "unlock";
+                break;
+            case couchbase::protocol::client_opcode::get_and_touch:
+                name = "get_and_touch";
+                break;
+            case couchbase::protocol::client_opcode::increment:
+                name = "increment";
+                break;
+            case couchbase::protocol::client_opcode::decrement:
+                name = "decrement";
+                break;
         }
         return formatter<string_view>::format(name, ctx);
     }

data/ext/couchbase/protocol/client_request.hxx

@@ -21,6 +21,8 @@
 #include <arpa/inet.h>
 #endif
 
+#include <snappy.h>
+
 #include <gsl/gsl_util>
 #include <protocol/client_opcode.hxx>
 #include <protocol/magic.hxx>
@@ -37,12 +39,12 @@ class client_request
     using response_type = client_response<response_body_type>;
 
   private:
-    static const size_t header_size = 24;
-    static const magic magic_ = magic::client_request;
+    magic magic_{ magic::client_request };
 
     client_opcode opcode_{ Body::opcode };
     std::uint16_t partition_{ 0 };
     std::uint32_t opaque_{ 0 };
+    std::uint64_t cas_{ 0 };
     Body body_;
     std::vector<std::uint8_t> payload_;
 
@@ -57,6 +59,11 @@ class client_request
         opaque_ = val;
     }
 
+    void cas(std::uint64_t val)
+    {
+        cas_ = val;
+    }
+
     std::uint32_t opaque()
     {
         return opaque_;
@@ -77,23 +84,42 @@ class client_request
         return body_;
     }
 
-    std::vector<std::uint8_t>& data()
+    std::vector<std::uint8_t>& data(bool try_to_compress = false)
     {
-        write_payload();
+        switch (opcode_) {
+            case protocol::client_opcode::insert:
+            case protocol::client_opcode::upsert:
+            case protocol::client_opcode::replace:
+                write_payload(try_to_compress);
+                break;
+            default:
+                write_payload(false);
+                break;
+        }
         return payload_;
     }
 
   private:
-    void write_payload()
+    void write_payload(bool try_to_compress)
     {
         payload_.resize(header_size + body_.size(), 0);
         payload_[0] = static_cast<uint8_t>(magic_);
         payload_[1] = static_cast<uint8_t>(opcode_);
 
-        uint16_t key_size = htons(gsl::narrow_cast<uint16_t>(body_.key().size()));
-        memcpy(payload_.data() + 2, &key_size, sizeof(key_size));
+        auto framing_extras = body_.framing_extras();
+
+        uint16_t key_size = gsl::narrow_cast<uint16_t>(body_.key().size());
+        if (framing_extras.size() == 0) {
+            key_size = htons(key_size);
+            memcpy(payload_.data() + 2, &key_size, sizeof(key_size));
+        } else {
+            magic_ = protocol::magic::alt_client_request;
+            payload_[0] = static_cast<uint8_t>(magic_);
+            payload_[2] = gsl::narrow_cast<std::uint8_t>(framing_extras.size());
+            payload_[3] = gsl::narrow_cast<std::uint8_t>(key_size);
+        }
 
-        uint8_t ext_size = gsl::narrow_cast<uint8_t>(body_.extension().size());
+        uint8_t ext_size = gsl::narrow_cast<uint8_t>(body_.extras().size());
         memcpy(payload_.data() + 4, &ext_size, sizeof(ext_size));
 
         uint16_t vbucket = ntohs(gsl::narrow_cast<uint16_t>(partition_));
@@ -103,10 +129,31 @@ class client_request
         memcpy(payload_.data() + 8, &body_size, sizeof(body_size));
 
         memcpy(payload_.data() + 12, &opaque_, sizeof(opaque_));
+        memcpy(payload_.data() + 16, &cas_, sizeof(cas_));
 
         auto body_itr = payload_.begin() + header_size;
-        body_itr = std::copy(body_.extension().begin(), body_.extension().end(), body_itr);
+        if (framing_extras.size() > 0) {
+            body_itr = std::copy(framing_extras.begin(), framing_extras.end(), body_itr);
+        }
+        body_itr = std::copy(body_.extras().begin(), body_.extras().end(), body_itr);
         body_itr = std::copy(body_.key().begin(), body_.key().end(), body_itr);
+
+        static const std::size_t min_size_to_compress = 32;
+        static const double min_ratio = 0.83;
+        if (try_to_compress && body_.value().size() > min_size_to_compress) {
+            std::string compressed;
+            std::size_t compressed_size =
+              snappy::Compress(reinterpret_cast<const char*>(body_.value().data()), body_.value().size(), &compressed);
+            if (gsl::narrow_cast<double>(compressed_size) / gsl::narrow_cast<double>(body().value().size()) < min_ratio) {
+                std::copy(compressed.begin(), compressed.end(), body_itr);
+                payload_[5] |= static_cast<uint8_t>(protocol::datatype::snappy);
+                size_t new_body_size = body_.size() - (body_.value().size() - compressed_size);
+                body_size = htonl(gsl::narrow_cast<uint32_t>(new_body_size));
+                memcpy(payload_.data() + 8, &body_size, sizeof(body_size));
+                payload_.resize(header_size + new_body_size);
+                return;
+            }
+        }
         std::copy(body_.value().begin(), body_.value().end(), body_itr);
     }
 };

data/ext/couchbase/protocol/client_response.hxx

@@ -26,6 +26,7 @@
 #include <protocol/status.hxx>
 #include <protocol/datatype.hxx>
 #include <protocol/cmd_info.hxx>
+#include <protocol/frame_info_id.hxx>
 
 namespace couchbase::protocol
 {
@@ -39,27 +40,29 @@ template
 class client_response
 {
   private:
-    static const inline magic magic_ = magic::client_response;
-
     Body body_;
+    magic magic_{ magic::client_response };
     client_opcode opcode_{ client_opcode::invalid };
-    header_buffer header_;
-    uint8_t data_type_;
-    std::vector<std::uint8_t> data_;
-    std::size_t body_size_;
-    protocol::status status_;
+    header_buffer header_{};
+    uint8_t data_type_{ 0 };
+    std::vector<std::uint8_t> data_{};
+    std::uint16_t key_size_{ 0 };
+    std::uint8_t framing_extras_size_{ 0 };
+    std::uint8_t extras_size_{ 0 };
+    std::size_t body_size_{ 0 };
+    protocol::status status_{};
     std::optional<enhanced_error> error_;
-    std::uint32_t opaque_;
-    std::uint64_t cas_;
-    cmd_info info_;
+    std::uint32_t opaque_{};
+    std::uint64_t cas_{};
+    cmd_info info_{};
 
   public:
     client_response() = default;
-    explicit client_response(io::binary_message& msg)
+    explicit client_response(io::mcbp_message& msg)
     {
         std::memcpy(header_.data(), &msg.header, sizeof(msg.header));
-        verify_header();
         data_ = std::move(msg.body);
+        verify_header();
         parse_body();
     }
 
@@ -105,8 +108,10 @@ class client_response
 
     void verify_header()
     {
-        Expects(header_[0] == static_cast<std::uint8_t>(magic_));
+        Expects(header_[0] == static_cast<std::uint8_t>(magic::alt_client_response) ||
+                header_[0] == static_cast<std::uint8_t>(magic::client_response));
         Expects(header_[1] == static_cast<std::uint8_t>(Body::opcode));
+        magic_ = static_cast<magic>(header_[0]);
         opcode_ = static_cast<client_opcode>(header_[1]);
         data_type_ = header_[5];
 
@@ -116,6 +121,15 @@ class client_response
         Expects(protocol::is_valid_status(status));
         status_ = static_cast<protocol::status>(status);
 
+        extras_size_ = header_[4];
+        if (magic_ == magic::alt_client_response) {
+            framing_extras_size_ = header_[2];
+            key_size_ = header_[3];
+        } else {
+            memcpy(&key_size_, header_.data() + 2, sizeof(key_size_));
+            key_size_ = ntohs(key_size_);
+        }
+
         uint32_t field = 0;
         memcpy(&field, header_.data() + 8, sizeof(field));
         body_size_ = ntohl(field);
@@ -136,9 +150,10 @@ class client_response
 
     void parse_body()
     {
-        bool parsed = body_.parse(status_, header_, data_, info_);
+        parse_framing_extras();
+        bool parsed = body_.parse(status_, header_, framing_extras_size_, key_size_, extras_size_, data_, info_);
         if (status_ != protocol::status::success && !parsed && has_json_datatype(data_type_)) {
-            auto error = tao::json::from_string(std::string(data_.begin(), data_.end()));
+            auto error = tao::json::from_string(std::string(data_.begin() + framing_extras_size_ + extras_size_ + key_size_, data_.end()));
             if (error.is_object()) {
                 auto& err_obj = error["error"];
                 if (err_obj.is_object()) {
@@ -157,6 +172,28 @@ class client_response
         }
     }
 
+    void parse_framing_extras()
+    {
+        if (framing_extras_size_ == 0) {
+            return;
+        }
+        size_t offset = 0;
+        while (offset < framing_extras_size_) {
+            std::uint8_t frame_size = data_[offset] & 0xfU;
+            std::uint8_t frame_id = (static_cast<std::uint32_t>(data_[offset]) >> 4U) & 0xfU;
+            offset++;
+            if (frame_id == static_cast<std::uint8_t>(response_frame_info_id::server_duration)) {
+                if (frame_size == 2 && framing_extras_size_ - offset >= frame_size) {
+                    std::uint16_t encoded_duration{};
+                    std::memcpy(&encoded_duration, data_.data() + offset, sizeof(encoded_duration));
+                    encoded_duration = ntohs(encoded_duration);
+                    info_.server_duration_us = std::pow(encoded_duration, 1.74) / 2;
+                }
+            }
+            offset += frame_size;
+        }
+    }
+
     [[nodiscard]] std::vector<std::uint8_t>& data()
     {
         return data_;