couchbase 3.1.1-universal-darwin-20 → 3.2.0-universal-darwin-20

data/ext/couchbase/protocol/cmd_lookup_in.hxx

@@ -19,8 +19,8 @@
 
 #include <protocol/unsigned_leb128.h>
 
-#include <protocol/client_opcode.hxx>
 #include <document_id.hxx>
+#include <protocol/client_opcode.hxx>
 
 namespace couchbase::protocol
 {
@@ -31,7 +31,7 @@ class lookup_in_response_body
     static const inline client_opcode opcode = client_opcode::subdoc_multi_lookup;
 
     struct lookup_in_field {
-        protocol::status status;
+        protocol::status status{};
         std::string value;
     };
 
@@ -39,7 +39,7 @@ class lookup_in_response_body
     std::vector<lookup_in_field> fields_;
 
   public:
-    std::vector<lookup_in_field>& fields()
+    [[nodiscard]] const std::vector<lookup_in_field>& fields() const
     {
         return fields_;
     }
@@ -50,7 +50,7 @@ class lookup_in_response_body
                std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success || status == protocol::status::subdoc_multi_path_failure ||
@@ -65,7 +65,7 @@ class lookup_in_response_body
                 memcpy(&entry_status, body.data() + offset, sizeof(entry_status));
                 entry_status = ntohs(entry_status);
                 Expects(is_valid_status(entry_status));
-                field.status = static_cast<protocol::status>(entry_status);
+                field.status = protocol::status(entry_status);
                 offset += static_cast<offset_type>(sizeof(entry_status));
 
                 std::uint32_t entry_size = 0;
@@ -156,18 +156,17 @@ class lookup_in_request_body
         specs_ = specs;
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras()
     {
         if (extras_.empty()) {
             fill_extention();
@@ -175,7 +174,7 @@ class lookup_in_request_body
         return extras_;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value()
     {
         if (value_.empty()) {
             fill_value();
@@ -183,7 +182,7 @@ class lookup_in_request_body
         return value_;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size()
     {
         if (extras_.empty()) {
             fill_extention();
@@ -206,7 +205,7 @@ class lookup_in_request_body
     void fill_value()
     {
         size_t value_size = 0;
-        for (auto& spec : specs_.entries) {
+        for (const auto& spec : specs_.entries) {
             value_size += sizeof(spec.opcode) + sizeof(spec.flags) + sizeof(std::uint16_t) + spec.path.size();
         }
         Expects(value_size > 0);

data/ext/couchbase/protocol/cmd_mutate_in.hxx

@@ -19,8 +19,8 @@
 
 #include <protocol/unsigned_leb128.h>
 
-#include <protocol/client_opcode.hxx>
 #include <document_id.hxx>
+#include <protocol/client_opcode.hxx>
 
 namespace couchbase::protocol
 {
@@ -41,12 +41,12 @@ class mutate_in_response_body
     mutation_token token_;
 
   public:
-    std::vector<mutate_in_field>& fields()
+    [[nodiscard]] const std::vector<mutate_in_field>& fields() const
     {
         return fields_;
     }
 
-    mutation_token& token()
+    [[nodiscard]] const mutation_token& token() const
     {
         return token_;
     }
@@ -57,7 +57,7 @@ class mutate_in_response_body
                std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success || status == protocol::status::subdoc_multi_path_failure) {
@@ -86,7 +86,7 @@ class mutate_in_response_body
                 memcpy(&entry_status, body.data() + offset, sizeof(entry_status));
                 entry_status = ntohs(entry_status);
                 Expects(is_valid_status(entry_status));
-                field.status = static_cast<protocol::status>(entry_status);
+                field.status = protocol::status(entry_status);
                 offset += static_cast<offset_type>(sizeof(entry_status));
 
                 if (field.status == protocol::status::success) {
@@ -327,17 +327,17 @@ class mutate_in_request_body
         framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 0U);
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
         return framing_extras_;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras()
     {
         if (extras_.empty()) {
             fill_extention();
@@ -345,7 +345,7 @@ class mutate_in_request_body
         return extras_;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value()
     {
         if (value_.empty()) {
             fill_value();
@@ -353,7 +353,7 @@ class mutate_in_request_body
         return value_;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size()
     {
         if (extras_.empty()) {
             fill_extention();
@@ -382,7 +382,7 @@ class mutate_in_request_body
     void fill_value()
     {
         size_t value_size = 0;
-        for (auto& spec : specs_.entries) {
+        for (const auto& spec : specs_.entries) {
             value_size += sizeof(spec.opcode) + sizeof(spec.flags) + sizeof(std::uint16_t) + spec.path.size() + sizeof(std::uint32_t) +
                           spec.param.size();
         }

data/ext/couchbase/protocol/cmd_noop.hxx

@@ -19,8 +19,8 @@
 
 #include <protocol/unsigned_leb128.h>
 
-#include <protocol/client_opcode.hxx>
 #include <document_id.hxx>
+#include <protocol/client_opcode.hxx>
 
 namespace couchbase::protocol
 {
@@ -30,13 +30,13 @@ class mcbp_noop_response_body
   public:
     static const inline client_opcode opcode = client_opcode::noop;
 
-    bool parse(protocol::status,
+    bool parse(protocol::status /* status */,
                const header_buffer& header,
-               std::uint8_t,
-               std::uint16_t,
-               std::uint8_t,
-               const std::vector<uint8_t>&,
-               const cmd_info&)
+               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& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         return false;
@@ -49,31 +49,27 @@ class mcbp_noop_request_body
     using response_body_type = mcbp_noop_response_body;
     static const inline client_opcode opcode = client_opcode::noop;
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
-        static std::string empty;
-        return empty;
+        return empty_string;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size() const
     {
         return 0;
     }

data/ext/couchbase/protocol/cmd_prepend.hxx

@@ -39,7 +39,7 @@ class prepend_response_body
     mutation_token token_;
 
   public:
-    mutation_token& token()
+    [[nodiscard]] const mutation_token& token() const
     {
         return token_;
     }
@@ -50,7 +50,7 @@ class prepend_response_body
                std::uint16_t,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success) {
@@ -110,33 +110,32 @@ class prepend_request_body
         }
     }
 
-    void content(const std::string& content)
+    void content(const std::string_view& content)
     {
         content_ = { content.begin(), content.end() };
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
         return framing_extras_;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value() const
     {
         return content_;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size() const
     {
         return framing_extras_.size() + key_.size() + content_.size();
     }

data/ext/couchbase/protocol/cmd_remove.hxx

@@ -19,8 +19,8 @@
 
 #include <protocol/unsigned_leb128.h>
 
-#include <protocol/client_opcode.hxx>
 #include <document_id.hxx>
+#include <protocol/client_opcode.hxx>
 
 namespace couchbase::protocol
 {
@@ -32,8 +32,7 @@ class remove_response_body
 
     mutation_token token_;
 
-  public:
-    mutation_token& token()
+    [[nodiscard]] const mutation_token& token() const
     {
         return token_;
     }
@@ -44,7 +43,7 @@ class remove_response_body
                std::uint16_t /* key_size */,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success) {
@@ -103,29 +102,27 @@ class remove_request_body
         }
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
         return framing_extras_;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size() const
     {
         return key_.size();
     }

data/ext/couchbase/protocol/cmd_replace.hxx

@@ -48,7 +48,7 @@ class replace_response_body
                std::uint16_t,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success) {
@@ -119,7 +119,7 @@ class replace_request_body
         framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 0U);
     }
 
-    void content(const std::string& content)
+    void content(const std::string_view& content)
     {
         content_ = { content.begin(), content.end() };
     }
@@ -134,17 +134,17 @@ class replace_request_body
         expiry_ = value;
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
         return framing_extras_;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras()
     {
         if (extras_.empty()) {
             fill_extention();
@@ -152,12 +152,12 @@ class replace_request_body
         return extras_;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value() const
     {
         return content_;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size()
     {
         if (extras_.empty()) {
             fill_extention();

data/ext/couchbase/protocol/cmd_sasl_auth.hxx

@@ -38,7 +38,7 @@ class sasl_auth_response_body
                std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
-               const cmd_info&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         if (status == protocol::status::success || status == protocol::status::auth_continue) {
@@ -75,29 +75,27 @@ class sasl_auth_request_body
         value_.assign(data.begin(), data.end());
     }
 
-    const std::string& key()
+    [[nodiscard]] const std::string& key() const
     {
         return key_;
     }
 
-    const std::vector<std::uint8_t>& framing_extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& framing_extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& extras()
+    [[nodiscard]] const std::vector<std::uint8_t>& extras() const
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return empty_buffer;
     }
 
-    const std::vector<std::uint8_t>& value()
+    [[nodiscard]] const std::vector<std::uint8_t>& value() const
     {
         return value_;
     }
 
-    std::size_t size()
+    [[nodiscard]] std::size_t size() const
     {
         return key_.size() + value_.size();
     }