couchbase 4.0.0 → 4.1.0

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_get_all.cxx

@@ -56,7 +56,7 @@ view_index_get_all_request::make_response(error_context::http&& ctx, const encod
                         continue;
                     }
 
-                    design_document document{};
+                    couchbase::management::views::design_document document{};
                     document.rev = meta->at("rev").get_string();
                     auto id = meta->at("id").get_string();
                     if (static const std::string prefix = "_design/"; id.find(prefix) == 0) {
@@ -64,13 +64,13 @@ view_index_get_all_request::make_response(error_context::http&& ctx, const encod
                     } else {
                         document.name = id; // fall back, should not happen
                     }
-                    if (static const std::string name_space_prefix = "dev_"; document.name.find(name_space_prefix) == 0) {
-                        document.name = document.name.substr(name_space_prefix.size());
-                        document.ns = couchbase::operations::design_document::name_space::development;
+                    if (static const std::string namespace_prefix = "dev_"; document.name.find(namespace_prefix) == 0) {
+                        document.name = document.name.substr(namespace_prefix.size());
+                        document.ns = couchbase::design_document_namespace::development;
                     } else {
-                        document.ns = couchbase::operations::design_document::name_space::production;
+                        document.ns = couchbase::design_document_namespace::production;
                     }
-                    if (document.ns != name_space) {
+                    if (document.ns != ns) {
                         continue;
                     }
 
@@ -80,7 +80,7 @@ view_index_get_all_request::make_response(error_context::http&& ctx, const encod
                     }
                     if (const auto* views = json->find("views"); views != nullptr && views->is_object()) {
                         for (const auto& [name, view_entry] : views->get_object()) {
-                            couchbase::operations::design_document::view view;
+                            couchbase::management::views::design_document::view view;
                             view.name = name;
                             if (view_entry.is_object()) {
                                 if (const auto* map = view_entry.find("map"); map != nullptr && map->is_string()) {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_get_all.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/design_document.hxx>
+#include <couchbase/management/design_document.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -28,7 +28,7 @@ namespace couchbase::operations::management
 {
 struct view_index_get_all_response {
     error_context::http ctx;
-    std::vector<design_document> design_documents{};
+    std::vector<couchbase::management::views::design_document> design_documents{};
 };
 
 struct view_index_get_all_request {
@@ -40,7 +40,7 @@ struct view_index_get_all_request {
     static const inline service_type type = service_type::management;
 
     std::string bucket_name;
-    design_document::name_space name_space;
+    design_document_namespace ns;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_upsert.cxx

@@ -42,7 +42,7 @@ view_index_upsert_request::encode_to(encoded_request_type& encoded, http_context
     encoded.headers["content-type"] = "application/json";
     encoded.method = "PUT";
     encoded.path =
-      fmt::format("/{}/_design/{}{}", bucket_name, document.ns == design_document::name_space::development ? "dev_" : "", document.name);
+      fmt::format("/{}/_design/{}{}", bucket_name, document.ns == design_document_namespace::development ? "dev_" : "", document.name);
     encoded.body = utils::json::generate(body);
     return {};
 }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/operations/management/view_index_upsert.hxx

@@ -20,7 +20,7 @@
 #include <couchbase/error_context/http.hxx>
 #include <couchbase/io/http_context.hxx>
 #include <couchbase/io/http_message.hxx>
-#include <couchbase/operations/management/design_document.hxx>
+#include <couchbase/management/design_document.hxx>
 #include <couchbase/platform/uuid.h>
 #include <couchbase/timeout_defaults.hxx>
 
@@ -39,7 +39,7 @@ struct view_index_upsert_request {
     static const inline service_type type = service_type::view;
 
     std::string bucket_name;
-    design_document document;
+    couchbase::management::views::design_document document;
 
     std::optional<std::string> client_context_id{};
     std::optional<std::chrono::milliseconds> timeout{};

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/client_request.hxx

@@ -59,7 +59,7 @@ class client_request
         opaque_ = val;
     }
 
-    void cas(protocol::cas val)
+    void cas(cas val)
     {
         cas_ = utils::byte_swap(val.value);
     }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/client_response.hxx

@@ -17,8 +17,8 @@
 
 #pragma once
 
+#include <couchbase/cas.hxx>
 #include <couchbase/io/mcbp_message.hxx>
-#include <couchbase/protocol/cas.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/client_opcode_fmt.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
@@ -98,9 +98,9 @@ class client_response
         return body_size_;
     }
 
-    [[nodiscard]] protocol::cas cas() const
+    [[nodiscard]] couchbase::cas cas() const
     {
-        return protocol::cas{ cas_ };
+        return couchbase::cas{ cas_ };
     }
 
     [[nodiscard]] std::uint32_t opaque() const
@@ -135,7 +135,6 @@ class client_response
         uint16_t status = 0;
         memcpy(&status, header_.data() + 6, sizeof(status));
         status = utils::byte_swap(status);
-        Expects(protocol::is_valid_status(status));
         status_ = protocol::status(status);
 
         extras_size_ = header_[4];

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_append.hxx

@@ -25,8 +25,8 @@
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/status.hxx>
 
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 
 namespace couchbase::protocol
 {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_decrement.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol
@@ -121,7 +121,7 @@ class decrement_request_body
         if (extras_.empty()) {
             fill_extras();
         }
-        return extras_.size() + key_.size();
+        return extras_.size() + framing_extras_.size() + key_.size();
     }
 
   private:

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_exists.hxx

@@ -17,9 +17,9 @@
 
 #pragma once
 
+#include <couchbase/cas.hxx>
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
-#include <couchbase/protocol/cas.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/status.hxx>
@@ -44,9 +44,9 @@ class exists_response_body
         return partition_id_;
     }
 
-    [[nodiscard]] protocol::cas cas() const
+    [[nodiscard]] couchbase::cas cas() const
     {
-        return protocol::cas{ cas_ };
+        return couchbase::cas{ cas_ };
     }
 
     [[nodiscard]] const std::string& key() const

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_get_meta.hxx

@@ -17,9 +17,9 @@
 
 #pragma once
 
+#include <couchbase/cas.hxx>
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
-#include <couchbase/protocol/cas.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/status.hxx>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_increment.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol
@@ -121,7 +121,7 @@ class increment_request_body
         if (extras_.empty()) {
             fill_extras();
         }
-        return extras_.size() + key_.size();
+        return extras_.size() + framing_extras_.size() + key_.size();
     }
 
   private:

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_insert.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_mutate_in.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 #include <gsl/assert>

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_prepend.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_remove.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_replace.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/cmd_upsert.hxx

@@ -19,10 +19,10 @@
 
 #include <couchbase/document_id.hxx>
 #include <couchbase/io/mcbp_message.hxx>
+#include <couchbase/mutation_token.hxx>
 #include <couchbase/protocol/client_opcode.hxx>
 #include <couchbase/protocol/cmd_info.hxx>
 #include <couchbase/protocol/durability_level.hxx>
-#include <couchbase/protocol/mutation_token.hxx>
 #include <couchbase/protocol/status.hxx>
 
 namespace couchbase::protocol

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/protocol/server_request.hxx

@@ -71,9 +71,9 @@ class server_request
         return body_size_;
     }
 
-    [[nodiscard]] protocol::cas cas() const
+    [[nodiscard]] couchbase::cas cas() const
     {
-        return protocol::cas{ cas_ };
+        return couchbase::cas{ cas_ };
     }
 
     [[nodiscard]] std::uint32_t opaque() const

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/query_profile_mode.hxx

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class query_profile_mode {
+    off = 0,
+    phases,
+    timings,
+};
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/query_scan_consistency.hxx

@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class query_scan_consistency { not_bounded = 0, request_plus };
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/search_highlight_style.hxx

@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class search_highlight_style { html = 0, ansi };
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/search_scan_consistency.hxx

@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class search_scan_consistency { not_bounded = 0 };
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/timeout_defaults.hxx

@@ -23,7 +23,8 @@ namespace couchbase::timeout_defaults
 {
 constexpr std::chrono::milliseconds bootstrap_timeout{ 10'000 };
 
-constexpr std::chrono::milliseconds connect_timeout{ 10'000 };
+constexpr std::chrono::milliseconds resolve_timeout{ 2'000 };
+constexpr std::chrono::milliseconds connect_timeout{ 2'000 };
 constexpr std::chrono::milliseconds key_value_timeout{ 2'500 };
 constexpr std::chrono::milliseconds key_value_durable_timeout{ 10'000 };
 constexpr std::chrono::milliseconds view_timeout{ 75'000 };

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/topology/collections_manifest.hxx

@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include <couchbase/platform/uuid.h>
 
 namespace couchbase::topology

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/utils/connection_string.cxx

@@ -193,6 +193,18 @@ parse_option(tls_verify_mode& receiver, const std::string& /* name */, const std
     }
 }
 
+void
+parse_option(io::ip_protocol& receiver, const std::string& /* name */, const std::string& value)
+{
+    if (value == "any") {
+        receiver = io::ip_protocol::any;
+    } else if (value == "force_ipv4") {
+        receiver = io::ip_protocol::force_ipv4;
+    } else if (value == "force_ipv6") {
+        receiver = io::ip_protocol::force_ipv6;
+    }
+}
+
 void
 parse_option(std::size_t& receiver, const std::string& name, const std::string& value)
 {
@@ -294,7 +306,16 @@ extract_options(connection_string& connstr)
             /**
              * Sets the SDK configuration to do IPv4 Name Resolution
              */
-            parse_option(connstr.options.force_ipv4, name, value);
+            bool force_ipv4 = false;
+            parse_option(force_ipv4, name, value);
+            if (force_ipv4) {
+                connstr.options.use_ip_protocol = io::ip_protocol::force_ipv4;
+            }
+        } else if (name == "ip_protocol") {
+            /**
+             * Controls preference of IP protocol for name resolution
+             */
+            parse_option(connstr.options.use_ip_protocol, name, value);
         } else if (name == "config_poll_interval") {
             parse_option(connstr.options.config_poll_interval, name, value);
         } else if (name == "config_poll_floor") {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/view_scan_consistency.hxx

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class view_scan_consistency {
+    not_bounded = 0,
+    update_after,
+    request_plus,
+};
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/couchbase/view_sort_order.hxx

@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   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.
+ *   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
+{
+enum class view_sort_order { ascending = 0, descending };
+} // namespace couchbase

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_integration_arithmetic.cxx

@@ -50,6 +50,18 @@ TEST_CASE("integration: increment", "[integration]")
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.content == 10);
     }
+
+    if (integration.cluster_version().supports_enhanced_durability()) {
+        SECTION("durability")
+        {
+            couchbase::operations::increment_request req{ id };
+            req.initial_value = 2;
+            req.durability_level = couchbase::protocol::durability_level::persist_to_majority;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.content == 2);
+        }
+    }
 }
 
 TEST_CASE("integration: decrement", "[integration]")
@@ -85,4 +97,16 @@ TEST_CASE("integration: decrement", "[integration]")
         REQUIRE_FALSE(resp.ctx.ec);
         REQUIRE(resp.content == 10);
     }
+
+    if (integration.cluster_version().supports_enhanced_durability()) {
+        SECTION("durability")
+        {
+            couchbase::operations::decrement_request req{ id };
+            req.initial_value = 2;
+            req.durability_level = couchbase::protocol::durability_level::persist_to_majority;
+            auto resp = test::utils::execute(integration.cluster, req);
+            REQUIRE_FALSE(resp.ctx.ec);
+            REQUIRE(resp.content == 2);
+        }
+    }
 }

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_integration_binary_operations.cxx

@@ -17,7 +17,7 @@
 
 #include "test_helper_integration.hxx"
 
-#include <couchbase/protocol/cas_fmt.hxx>
+#include <couchbase/cas_fmt.hxx>
 
 TEST_CASE("integration: append", "[integration]")
 {

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_integration_connect.cxx

@@ -37,6 +37,32 @@ TEST_CASE("integration: connecting with empty bootstrap nodes list", "[integrati
     io_thread.join();
 }
 
+TEST_CASE("integration: connecting with unresponsive first node in bootstrap nodes list", "[integration]")
+{
+    test::utils::init_logger();
+    asio::io_context io{};
+    auto ctx = test::utils::test_context::load_from_environment();
+    auto connstr = couchbase::utils::parse_connection_string(ctx.connection_string);
+    REQUIRE_FALSE(connstr.bootstrap_nodes.empty());
+    connstr.bootstrap_nodes.insert(connstr.bootstrap_nodes.begin(),
+                                   couchbase::utils::connection_string::node{
+                                     "example.com",
+                                     11210,
+                                     couchbase::utils::connection_string::address_type::dns,
+                                     couchbase::utils::connection_string::bootstrap_mode::gcccp,
+                                   });
+    auto origin = couchbase::origin(ctx.build_auth(), connstr);
+    auto cluster = couchbase::cluster::create(io);
+    auto io_thread = std::thread([&io]() { io.run(); });
+    auto barrier = std::make_shared<std::promise<std::error_code>>();
+    auto f = barrier->get_future();
+    cluster->open(origin, [barrier](std::error_code ec) mutable { barrier->set_value(ec); });
+    auto rc = f.get();
+    REQUIRE_FALSE(rc);
+    test::utils::close_cluster(cluster);
+    io_thread.join();
+}
+
 TEST_CASE("integration: can connect with handler capturing non-copyable object", "[integration]")
 {
     test::utils::integration_test_guard integration;

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/test/test_integration_crud.cxx

@@ -170,7 +170,7 @@ TEST_CASE("integration: pessimistic locking", "[integration]")
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("locking") };
     uint32_t lock_time = 10;
 
-    couchbase::protocol::cas cas;
+    couchbase::cas cas;
 
     {
         couchbase::operations::insert_request req{ id, basic_doc_json };
@@ -209,7 +209,7 @@ TEST_CASE("integration: pessimistic locking", "[integration]")
     // but unlock operation is not retried in this case, because it would never have succeeded
     {
         couchbase::operations::unlock_request req{ id };
-        req.cas = couchbase::protocol::cas{ cas.value - 1 };
+        req.cas = couchbase::cas{ cas.value - 1 };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE(resp.ctx.ec == couchbase::error::key_value_errc::document_locked);
         REQUIRE(resp.ctx.retry_reasons.count(couchbase::io::retry_reason::kv_locked) == 0);
@@ -260,7 +260,7 @@ TEST_CASE("integration: lock/unlock without lock time", "[integration]")
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
-    couchbase::protocol::cas cas;
+    couchbase::cas cas;
 
     {
         couchbase::operations::get_and_lock_request req{ id };
@@ -428,7 +428,7 @@ TEST_CASE("integration: cas replace", "[integration]")
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     couchbase::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("cas_replace") };
-    couchbase::protocol::cas cas;
+    couchbase::cas cas;
 
     {
         couchbase::operations::insert_request req{ id, basic_doc_json };
@@ -440,7 +440,7 @@ TEST_CASE("integration: cas replace", "[integration]")
     SECTION("incorrect")
     {
         couchbase::operations::replace_request req{ id, "" };
-        req.cas = couchbase::protocol::cas{ cas.value + 1 };
+        req.cas = couchbase::cas{ cas.value + 1 };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE(resp.ctx.ec == couchbase::error::common_errc::cas_mismatch);
     }