couchbase 3.0.0.alpha.1-universal-darwin-19 → 3.0.0.beta.1-universal-darwin-19

data/ext/couchbase/protocol/hello_feature.hxx

@@ -22,20 +22,129 @@
 namespace couchbase::protocol
 {
 enum class hello_feature : uint16_t {
+    /**
+     * The client wants to TLS and send STARTTLS
+     */
     tls = 0x02,
+
+    /**
+     * The client requests the server to set TCP NODELAY on the socket used by this connection.
+     */
     tcp_nodelay = 0x03,
+
+    /**
+     * The client requests the server to add the sequence number for a mutation to the response packet used in mutations.
+     */
     mutation_seqno = 0x04,
+
+    /**
+     * The client requests the server to set TCP DELAY on the socket used by this connection
+     */
+    tcp_delay = 0x05,
+
+    /**
+     * The client requests the server to add XATTRs to the stream for commands where it makes sense (GetWithMeta, SetWithMeta, DcpMutation
+     * etc)
+     */
     xattr = 0x06,
+
+    /**
+     * The client requests the server to send extended error codes instead of disconnecting the client when new errors occur (note that some
+     * errors may be remapped to more generic error codes instead of disconnecting)
+     */
     xerror = 0x07,
+
+    /**
+     * This is purely informational (it does not enable/disable anything on the server). It may be used from the client to know if it should
+     * be able to run select bucket or not (select bucket was a privileged command pre-spock. In spock all users may run select bucket, but
+     * only to a bucket they have access to).
+     */
     select_bucket = 0x08,
+
+    /**
+     * The client wants to enable support for Snappy compression. A client with support for Snappy compression must update the datatype
+     * filed in the requests with the bit representing SNAPPY when sending snappy compressed data to the server. It must be able to receive
+     * data from the server compressed with SNAPPY identified by the bit being set in the datatype field
+     */
     snappy = 0x0a,
+
+    /**
+     * The client wants to enable support for JSON. The client must set this bit when storing JSON documents on the server. The server will
+     * set the appropriate bit in the datatype field when returning such documents to the client
+     */
     json = 0x0b,
+
+    /**
+     * The client allows for full duplex on the socket. This means that the server may send requests back to the client. These messages is
+     * identified by the magic values of 0x82 (request) and 0x83 (response). See the document Duplex for more information.
+     *
+     * https://github.com/couchbase/kv_engine/blob/master/docs/Duplex.md
+     */
     duplex = 0x0c,
+
+    /**
+     * The client wants the server to notify the client with new cluster maps whenever ns_server push them to memcached. (note that this
+     * notification is subject to deduplication of the vbucket map received as part of not my vbucket)
+     */
     clustermap_change_notification = 0x0d,
+
+    /**
+     * The client allows the server to reorder the execution of commands. See the document UnorderedExecution for more information
+     *
+     * https://github.com/couchbase/kv_engine/blob/master/docs/UnorderedExecution.md
+     */
     unordered_execution = 0x0e,
+
+    /**
+     * The client wants the server to include tracing information in the response packet
+     */
+    tracing = 0x0f,
+
+    /**
+     * This is purely informational (it does not enable/disable anything on the server). It may be used from the client to know if it may
+     * send the alternative request packet (magic 0x08) containing FrameInfo segments.
+     */
     alt_request_support = 0x10,
+
+    /**
+     * This is purely informational (it does not enable/disable anything on the server). It may be used from the client to know if it may
+     * use synchronous replication tags in the mutation requests.
+     */
     sync_replication = 0x11,
+
+    /**
+     * The client wants to enable support for Collections
+     */
+    collections = 0x12,
+
+    /**
+     * This is purely informational (it does not enable / disable anything on the server). It may be used from the client to figure out if
+     * the server supports OpenTracing or not.)
+     */
+    open_tracing = 0x13,
+
+    /**
+     * This is purely informational (it does not enable / disable anything on the server). It may be used from the client to know if it may
+     * use PreserveTtl in the operations who carries the TTL for a document
+     */
+    preserve_ttl = 0x14,
+
+    /**
+     * This is purely information (it does not enable / disable anything on the server). It may be used from the client to determine if the
+     * server supports VATTRs in a generic way (can request $ and will either succeed or fail with SubdocXattrUnknownVattr). Requires XATTR.
+     */
     vattr = 0x15,
+
+    /**
+     * This is purely information (it does not enable / disable anything on the server). It may be used from the client to determine if the
+     * server supports Point in Time Recovery
+     */
+    point_in_time_recovery = 0x16,
+
+    /**
+     * Does the server support the subdoc mutation flag create_as_deleted
+     */
+    subdoc_create_as_deleted = 0x17,
 };
 
 constexpr inline bool
@@ -56,6 +165,13 @@ is_valid_hello_feature(uint16_t code)
         case hello_feature::alt_request_support:
         case hello_feature::sync_replication:
         case hello_feature::vattr:
+        case hello_feature::collections:
+        case hello_feature::open_tracing:
+        case hello_feature::preserve_ttl:
+        case hello_feature::point_in_time_recovery:
+        case hello_feature::tcp_delay:
+        case hello_feature::tracing:
+        case hello_feature::subdoc_create_as_deleted:
             return true;
     }
     return false;
@@ -112,6 +228,27 @@ struct fmt::formatter<couchbase::protocol::hello_feature> : formatter<string_vie
             case couchbase::protocol::hello_feature::vattr:
                 name = "vattr";
                 break;
+            case couchbase::protocol::hello_feature::collections:
+                name = "collections";
+                break;
+            case couchbase::protocol::hello_feature::open_tracing:
+                name = "open_tracing";
+                break;
+            case couchbase::protocol::hello_feature::preserve_ttl:
+                name = "preserve_ttl";
+                break;
+            case couchbase::protocol::hello_feature::point_in_time_recovery:
+                name = "point_in_time_recovery";
+                break;
+            case couchbase::protocol::hello_feature::tcp_delay:
+                name = "tcp_delay";
+                break;
+            case couchbase::protocol::hello_feature::tracing:
+                name = "tracing";
+                break;
+            case couchbase::protocol::hello_feature::subdoc_create_as_deleted:
+                name = "subdoc_create_as_deleted";
+                break;
         }
         return formatter<string_view>::format(name, ctx);
     }

data/ext/couchbase/protocol/server_opcode.hxx

@@ -0,0 +1,57 @@
+/* -*- 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
+
+namespace couchbase::protocol
+{
+enum class server_opcode : uint8_t {
+    cluster_map_change_notification = 0x01,
+    invalid = 0xff,
+};
+
+constexpr inline bool
+is_valid_server_request_opcode(uint8_t code)
+{
+    switch (static_cast<server_opcode>(code)) {
+        case server_opcode::cluster_map_change_notification:
+            return true;
+        case server_opcode::invalid:
+            break;
+    }
+    return false;
+}
+
+} // namespace couchbase::protocol
+
+template<>
+struct fmt::formatter<couchbase::protocol::server_opcode> : formatter<string_view> {
+    template<typename FormatContext>
+    auto format(couchbase::protocol::server_opcode opcode, FormatContext& ctx)
+    {
+        string_view name = "unknown";
+        switch (opcode) {
+            case couchbase::protocol::server_opcode::cluster_map_change_notification:
+                name = "cluster_map_change_notification";
+                break;
+            case couchbase::protocol::server_opcode::invalid:
+                name = "invalid";
+                break;
+        }
+        return formatter<string_view>::format(name, ctx);
+    }
+};

data/ext/couchbase/protocol/server_request.hxx

@@ -0,0 +1,122 @@
+/* -*- 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 <tao/json.hpp>
+#include <tao/json/contrib/traits.hpp>
+
+#include <protocol/server_opcode.hxx>
+#include <protocol/magic.hxx>
+#include <protocol/status.hxx>
+#include <protocol/datatype.hxx>
+#include <protocol/cmd_info.hxx>
+
+namespace couchbase::protocol
+{
+
+template<typename Body>
+class server_request
+{
+  private:
+    static const inline magic magic_ = magic::server_request;
+
+    Body body_;
+    server_opcode opcode_{ server_opcode::invalid };
+    header_buffer header_;
+    uint8_t data_type_;
+    std::vector<std::uint8_t> data_;
+    std::size_t body_size_;
+    std::uint32_t opaque_;
+    std::uint64_t cas_;
+    cmd_info info_;
+
+  public:
+    server_request() = default;
+    explicit server_request(io::mcbp_message& msg)
+    {
+        std::memcpy(header_.data(), &msg.header, sizeof(msg.header));
+        verify_header();
+        data_ = std::move(msg.body);
+        parse_body();
+    }
+
+    [[nodiscard]] server_opcode opcode() const
+    {
+        return opcode_;
+    }
+
+    [[nodiscard]] std::size_t body_size() const
+    {
+        return body_size_;
+    }
+
+    [[nodiscard]] std::uint64_t cas() const
+    {
+        return cas_;
+    }
+
+    [[nodiscard]] std::uint32_t opaque() const
+    {
+        return opaque_;
+    }
+
+    Body& body()
+    {
+        return body_;
+    }
+
+    cmd_info& info()
+    {
+        return info_;
+    }
+
+    [[nodiscard]] header_buffer& header()
+    {
+        return header_;
+    }
+
+    void verify_header()
+    {
+        Expects(header_[0] == static_cast<std::uint8_t>(magic_));
+        Expects(header_[1] == static_cast<std::uint8_t>(Body::opcode));
+        opcode_ = static_cast<server_opcode>(header_[1]);
+        data_type_ = header_[5];
+
+        uint32_t field = 0;
+        memcpy(&field, header_.data() + 8, sizeof(field));
+        body_size_ = ntohl(field);
+        data_.resize(body_size_);
+
+        memcpy(&opaque_, header_.data() + 12, sizeof(opaque_));
+
+        memcpy(&cas_, header_.data() + 16, sizeof(cas_));
+    }
+
+    void parse_body()
+    {
+        body_.parse(header_, data_, info_);
+    }
+
+    [[nodiscard]] std::vector<std::uint8_t>& data()
+    {
+        return data_;
+    }
+};
+} // namespace couchbase::protocol

data/ext/couchbase/protocol/unsigned_leb128.h

@@ -49,14 +49,14 @@ template<class T>
 typename std::enable_if<std::is_unsigned<T>::value, std::pair<T, std::string_view>>::type
 decode_unsigned_leb128(std::string_view buf, struct Leb128NoThrow)
 {
-    T rv = static_cast<uint8_t>(buf[0]) & 0x7full;
+    T rv = static_cast<uint8_t>(buf[0]) & 0x7fULL;
     size_t end = 0;
-    if ((buf[0] & 0x80) == 0x80ull) {
+    if ((buf[0] & 0x80) == 0x80ULL) {
         T shift = 7;
         // shift in the remaining data
         for (end = 1; end < buf.size(); end++) {
-            rv |= (buf[end] & 0x7full) << shift;
-            if ((static_cast<uint8_t>(buf[end]) & 0x80ull) == 0) {
+            rv |= (buf[end] & 0x7fULL) << shift;
+            if ((static_cast<uint8_t>(buf[end]) & 0x80ULL) == 0) {
                 break; // no more
             }
             shift += 7;
@@ -112,7 +112,7 @@ unsigned_leb128_get_stop_byte_index(std::string_view buf)
     // If buf does not contain a stop-byte, invalid
     size_t stopByte = 0;
     for (auto c : buf) {
-        if ((static_cast<uint8_t>(c) & 0x80ull) == 0) {
+        if ((static_cast<uint8_t>(c) & 0x80ULL) == 0) {
             return stopByte;
         }
         stopByte++;
@@ -134,45 +134,45 @@ template<class T>
 class unsigned_leb128<T, typename std::enable_if<std::is_unsigned<T>::value>::type>
 {
   public:
-    unsigned_leb128(T in)
+    explicit unsigned_leb128(T in)
     {
         while (in > 0) {
-            auto byte = gsl::narrow_cast<uint8_t>(in & 0x7full);
+            auto byte = gsl::narrow_cast<uint8_t>(in & 0x7fULL);
             in >>= 7;
 
             // In has more data?
             if (in > 0) {
                 byte |= 0x80;
-                encodedData[encodedSize - 1] = byte;
+                encodedData[encodedSize - 1U] = byte;
                 // Increase the size
                 encodedSize++;
             } else {
-                encodedData[encodedSize - 1] = byte;
+                encodedData[encodedSize - 1U] = byte;
             }
         }
     }
 
-    std::string_view get() const
+    [[nodiscard]] std::string get() const
     {
-        return { encodedData.data(), encodedSize };
+        return { begin(), end() };
     }
 
-    const uint8_t* begin() const
+    [[nodiscard]] const uint8_t* begin() const
     {
         return encodedData.data();
     }
 
-    const uint8_t* end() const
+    [[nodiscard]] const uint8_t* end() const
     {
         return encodedData.data() + encodedSize;
     }
 
-    const uint8_t* data() const
+    [[nodiscard]] const uint8_t* data() const
     {
         return encodedData.data();
     }
 
-    size_t size() const
+    [[nodiscard]] size_t size() const
     {
         return encodedSize;
     }

data/ext/couchbase/service_type.hxx

@@ -19,5 +19,42 @@
 
 namespace couchbase
 {
-enum class service_type { kv, query, analytics, search, views, management };
+enum class service_type {
+    kv,
+    query,
+    analytics,
+    search,
+    views,
+    management,
+};
 }
+
+template<>
+struct fmt::formatter<couchbase::service_type> : formatter<std::string_view> {
+    template<typename FormatContext>
+    auto format(couchbase::service_type type, FormatContext& ctx)
+    {
+        string_view name = "unknown";
+        switch (type) {
+            case couchbase::service_type::kv:
+                name = "kv";
+                break;
+            case couchbase::service_type::query:
+                name = "query";
+                break;
+            case couchbase::service_type::analytics:
+                name = "analytics";
+                break;
+            case couchbase::service_type::search:
+                name = "search";
+                break;
+            case couchbase::service_type::views:
+                name = "views";
+                break;
+            case couchbase::service_type::management:
+                name = "management";
+                break;
+        }
+        return formatter<string_view>::format(name, ctx);
+    }
+};