couchbase 3.0.3-universal-darwin-20 → 3.1.1-universal-darwin-20

data/ext/couchbase/operations/view_index_upsert.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/origin.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/client_opcode.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -233,6 +233,7 @@ enum class client_opcode : uint8_t {
 enum class subdoc_opcode : uint8_t {
     get_doc = 0x00,
     set_doc = 0x01,
+    remove_doc = 0x04,
     get = 0xc5,
     exists = 0xc6,
     dict_add = 0xc7,
@@ -345,6 +346,7 @@ is_valid_subdoc_opcode(uint8_t code)
         case subdoc_opcode::get_count:
         case subdoc_opcode::get_doc:
         case subdoc_opcode::set_doc:
+        case subdoc_opcode::remove_doc:
         case subdoc_opcode::replace_body_with_xattr:
             return true;
     }
@@ -626,6 +628,9 @@ struct fmt::formatter<couchbase::protocol::subdoc_opcode> : formatter<string_vie
             case couchbase::protocol::subdoc_opcode::replace_body_with_xattr:
                 name = "replace_body_with_xattr (0xd3)";
                 break;
+            case couchbase::protocol::subdoc_opcode::remove_doc:
+                name = "remove_doc (0x04)";
+                break;
         }
         return formatter<string_view>::format(name, ctx);
     }

data/ext/couchbase/protocol/client_request.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/client_response.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_append.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_cluster_map_change_notification.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_decrement.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ class decrement_response_body
     bool parse(protocol::status status,
                const header_buffer& header,
                std::uint8_t framing_extras_size,
-               std::uint16_t /* key_size */,
+               std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
                const cmd_info&)
@@ -66,6 +66,7 @@ class decrement_response_body
                 token_.sequence_number = utils::byte_swap_64(token_.sequence_number);
                 offset += 8;
             }
+            offset += key_size;
             memcpy(&content_, body.data() + offset, sizeof(content_));
             content_ = utils::byte_swap_64(content_);
             return true;
@@ -119,19 +120,28 @@ class decrement_request_body
             return;
         }
         auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        auto extras_size = framing_extras_.size();
         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);
+            framing_extras_.resize(extras_size + 4);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
             uint16_t val = htons(*timeout);
-            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+            memcpy(framing_extras_.data() + extras_size + 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);
+            framing_extras_.resize(extras_size + 2);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
         }
     }
 
+    void preserve_expiry()
+    {
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::preserve_ttl);
+        auto extras_size = framing_extras_.size();
+        framing_extras_.resize(extras_size + 1);
+        framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 0U);
+    }
+
     const std::string& key()
     {
         return key_;

data/ext/couchbase/protocol/cmd_exists.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get_and_lock.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get_and_touch.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get_cluster_config.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get_collection_id.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -77,17 +77,18 @@ class get_collection_id_request_body
     static const inline client_opcode opcode = client_opcode::get_collection_id;
 
   private:
-    std::string key_;
+    std::vector<std::uint8_t> value_{};
 
   public:
     void collection_path(const std::string& path)
     {
-        key_ = path;
+        value_.assign(path.begin(), path.end());
     }
 
     const std::string& key()
     {
-        return key_;
+        static std::string empty;
+        return empty;
     }
 
     const std::vector<std::uint8_t>& framing_extras()
@@ -104,13 +105,12 @@ class get_collection_id_request_body
 
     const std::vector<std::uint8_t>& value()
     {
-        static std::vector<std::uint8_t> empty;
-        return empty;
+        return value_;
     }
 
     std::size_t size()
     {
-        return key_.size();
+        return value_.size();
     }
 };
 

data/ext/couchbase/protocol/cmd_get_collections_manifest.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_get_error_map.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_hello.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -80,17 +80,15 @@ class hello_request_body
         hello_feature::xattr,
         hello_feature::xerror,
         hello_feature::select_bucket,
-        hello_feature::snappy,
         hello_feature::json,
         hello_feature::duplex,
-        hello_feature::clustermap_change_notification,
-        hello_feature::unordered_execution,
         hello_feature::alt_request_support,
         hello_feature::tracing,
         hello_feature::sync_replication,
         hello_feature::vattr,
         hello_feature::collections,
         hello_feature::subdoc_create_as_deleted,
+        hello_feature::preserve_ttl,
     };
     std::vector<std::uint8_t> value_;
 
@@ -105,6 +103,21 @@ class hello_request_body
         return key_;
     }
 
+    void enable_unordered_execution()
+    {
+        features_.emplace_back(hello_feature::unordered_execution);
+    }
+
+    void enable_clustermap_change_notification()
+    {
+        features_.emplace_back(hello_feature::clustermap_change_notification);
+    }
+
+    void enable_compression()
+    {
+        features_.emplace_back(hello_feature::snappy);
+    }
+
     [[nodiscard]] const std::vector<hello_feature>& features() const
     {
         return features_;

data/ext/couchbase/protocol/cmd_increment.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ class increment_response_body
     bool parse(protocol::status status,
                const header_buffer& header,
                std::uint8_t framing_extras_size,
-               std::uint16_t /* key_size */,
+               std::uint16_t key_size,
                std::uint8_t extras_size,
                const std::vector<uint8_t>& body,
                const cmd_info&)
@@ -66,6 +66,7 @@ class increment_response_body
                 token_.sequence_number = utils::byte_swap_64(token_.sequence_number);
                 offset += 8;
             }
+            offset += key_size;
             memcpy(&content_, body.data() + offset, sizeof(content_));
             content_ = utils::byte_swap_64(content_);
             return true;
@@ -119,19 +120,28 @@ class increment_request_body
             return;
         }
         auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        auto extras_size = framing_extras_.size();
         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);
+            framing_extras_.resize(extras_size + 4);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
             uint16_t val = htons(*timeout);
-            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+            memcpy(framing_extras_.data() + extras_size + 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);
+            framing_extras_.resize(extras_size + 2);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
         }
     }
 
+    void preserve_expiry()
+    {
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::preserve_ttl);
+        auto extras_size = framing_extras_.size();
+        framing_extras_.resize(extras_size + 1);
+        framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 0U);
+    }
+
     const std::string& key()
     {
         return key_;

data/ext/couchbase/protocol/cmd_info.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_insert.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_lookup_in.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

data/ext/couchbase/protocol/cmd_mutate_in.hxx

@@ -1,6 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- *     Copyright 2020 Couchbase, Inc.
+ *   Copyright 2020-2021 Couchbase, Inc.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -224,7 +224,7 @@ class mutate_in_request_body
 
         void add_spec(subdoc_opcode operation, bool xattr, const std::string& path)
         {
-            Expects(operation == protocol::subdoc_opcode::remove);
+            Expects(operation == protocol::subdoc_opcode::remove || operation == protocol::subdoc_opcode::remove_doc);
             add_spec(static_cast<std::uint8_t>(operation), build_path_flags(xattr, false, false), path, "");
         }
 
@@ -305,19 +305,28 @@ class mutate_in_request_body
             return;
         }
         auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::durability_requirement);
+        auto extras_size = framing_extras_.size();
         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);
+            framing_extras_.resize(extras_size + 4);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>((static_cast<std::uint32_t>(frame_id) << 4U) | 3U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
             uint16_t val = htons(*timeout);
-            memcpy(framing_extras_.data() + 2, &val, sizeof(val));
+            memcpy(framing_extras_.data() + extras_size + 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);
+            framing_extras_.resize(extras_size + 2);
+            framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 1U);
+            framing_extras_[extras_size + 1] = static_cast<std::uint8_t>(level);
         }
     }
 
+    void preserve_expiry()
+    {
+        auto frame_id = static_cast<uint8_t>(protocol::request_frame_info_id::preserve_ttl);
+        auto extras_size = framing_extras_.size();
+        framing_extras_.resize(extras_size + 1);
+        framing_extras_[extras_size + 0] = static_cast<std::uint8_t>(static_cast<std::uint32_t>(frame_id) << 4U | 0U);
+    }
+
     const std::string& key()
     {
         return key_;