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

data/ext/couchbase/protocol/cmd_sasl_list_mechs.hxx

@@ -42,7 +42,7 @@ class sasl_list_mechs_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) {
@@ -66,32 +66,27 @@ class sasl_list_mechs_request_body
     using response_body_type = sasl_list_mechs_response_body;
     static const inline client_opcode opcode = client_opcode::sasl_list_mechs;
 
-  public:
-    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_sasl_step.hxx

@@ -36,7 +36,7 @@ class sasl_step_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) {
@@ -59,8 +59,8 @@ class sasl_step_request_body
     static const inline client_opcode opcode = client_opcode::sasl_step;
 
   private:
-    std::string key_;
-    std::vector<std::uint8_t> value_;
+    std::string key_{};
+    std::vector<std::uint8_t> value_{};
 
   public:
     void mechanism(std::string_view mech)
@@ -73,29 +73,27 @@ class sasl_step_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();
     }

data/ext/couchbase/protocol/cmd_select_bucket.hxx

@@ -24,14 +24,13 @@ class select_bucket_response_body
   public:
     static const inline client_opcode opcode = client_opcode::select_bucket;
 
-  public:
-    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;
@@ -53,30 +52,27 @@ class select_bucket_request_body
         key_ = name;
     }
 
-    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
     {
-        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_touch.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,7 +30,6 @@ class touch_response_body
   public:
     static const inline client_opcode opcode = client_opcode::touch;
 
-  public:
     bool parse(protocol::status /* status */,
                const header_buffer& header,
                std::uint8_t /* framing_extras_size */,
@@ -71,29 +70,27 @@ class touch_request_body
         memcpy(extras_.data(), &seconds, sizeof(seconds));
     }
 
-    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
     {
         return extras_;
     }
 
-    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() + extras_.size();
     }

data/ext/couchbase/protocol/cmd_unlock.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,14 +30,13 @@ class unlock_response_body
   public:
     static const inline client_opcode opcode = client_opcode::unlock;
 
-  public:
     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&)
+               const cmd_info& /* info */)
     {
         Expects(header[1] == static_cast<uint8_t>(opcode));
         return false;
@@ -63,30 +62,27 @@ class unlock_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
     {
-        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 key_.size();
     }

data/ext/couchbase/protocol/cmd_upsert.hxx

@@ -37,7 +37,7 @@ class upsert_response_body
     mutation_token token_;
 
   public:
-    mutation_token& token()
+    [[nodiscard]] const mutation_token& token() const
     {
         return token_;
     }
@@ -48,7 +48,7 @@ class upsert_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 upsert_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 upsert_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 upsert_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/datatype.hxx

@@ -27,10 +27,10 @@ enum class datatype : uint8_t {
 
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_datatype(uint8_t code)
 {
-    switch (static_cast<datatype>(code)) {
+    switch (datatype(code)) {
         case datatype::raw:
         case datatype::json:
         case datatype::snappy:
@@ -40,7 +40,7 @@ is_valid_datatype(uint8_t code)
     return false;
 }
 
-constexpr inline bool
+constexpr bool
 has_json_datatype(uint8_t code)
 {
     return (code & uint8_t(datatype::json)) != 0;

data/ext/couchbase/protocol/durability_level.hxx

@@ -44,10 +44,10 @@ enum class durability_level : uint8_t {
     persist_to_majority = 0x03,
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_durability_level(uint8_t value)
 {
-    switch (static_cast<durability_level>(value)) {
+    switch (durability_level(value)) {
         case durability_level::none:
         case durability_level::majority:
         case durability_level::majority_and_persist_to_active:

data/ext/couchbase/protocol/frame_info_id.hxx

@@ -93,10 +93,10 @@ enum class request_frame_info_id : uint8_t {
     preserve_ttl = 0x05,
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_request_frame_info_id(uint8_t value)
 {
-    switch (static_cast<request_frame_info_id>(value)) {
+    switch (request_frame_info_id(value)) {
         case request_frame_info_id::barrier:
         case request_frame_info_id::durability_requirement:
         case request_frame_info_id::dcp_stream_id:
@@ -129,10 +129,10 @@ enum class response_frame_info_id : uint8_t {
     server_duration = 0x00,
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_response_frame_info_id(uint8_t value)
 {
-    switch (static_cast<response_frame_info_id>(value)) {
+    switch (response_frame_info_id(value)) {
         case response_frame_info_id::server_duration:
             return true;
     }

data/ext/couchbase/protocol/hello_feature.hxx

@@ -152,10 +152,10 @@ enum class hello_feature : uint16_t {
     subdoc_document_macro_support = 0x18,
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_hello_feature(uint16_t code)
 {
-    switch (static_cast<hello_feature>(code)) {
+    switch (hello_feature(code)) {
         case hello_feature::tls:
         case hello_feature::tcp_nodelay:
         case hello_feature::mutation_seqno:

data/ext/couchbase/protocol/magic.hxx

@@ -36,10 +36,10 @@ enum class magic : uint8_t {
     server_response = 0x83
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_magic(uint8_t code)
 {
-    switch (static_cast<magic>(code)) {
+    switch (magic(code)) {
         case magic::client_request:
         case magic::alt_client_request:
         case magic::client_response:

data/ext/couchbase/protocol/server_opcode.hxx

@@ -24,10 +24,10 @@ enum class server_opcode : uint8_t {
     invalid = 0xff,
 };
 
-constexpr inline bool
+constexpr bool
 is_valid_server_request_opcode(uint8_t code)
 {
-    switch (static_cast<server_opcode>(code)) {
+    switch (server_opcode(code)) {
         case server_opcode::cluster_map_change_notification:
             return true;
         case server_opcode::invalid: