couchbase 3.4.2 → 3.4.3

data/ext/couchbase/core/mozilla_ca_bundle.hxx

@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2020-Present 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 <array>
+#include <gsl/span>
+#include <string_view>
+
+namespace couchbase::core::default_ca
+{
+struct certificate {
+    std::string_view authority;
+    std::string_view body;
+};
+
+auto
+mozilla_ca_certs() -> gsl::span<const certificate>;
+
+auto
+mozilla_ca_certs_date() -> std::string_view;
+
+auto
+mozilla_ca_certs_sha256() -> std::string_view;
+} // namespace couchbase::core::default_ca

data/ext/couchbase/core/operations/document_analytics.cxx

@@ -16,6 +16,7 @@
  */
 
 #include "document_analytics.hxx"
+#include "core/cluster_options.hxx"
 #include "core/logger/logger.hxx"
 #include "core/utils/duration_parser.hxx"
 #include "core/utils/json.hxx"

data/ext/couchbase/core/operations/document_analytics.hxx

@@ -24,6 +24,7 @@
 #include "core/io/http_traits.hxx"
 #include "core/json_string.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 namespace couchbase::core::operations

data/ext/couchbase/core/operations/document_append.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_append.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_decrement.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_decrement.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_exists.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_get_meta.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_get.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_get.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_get_and_lock.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_get_and_lock.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_get_and_touch.hxx

@@ -24,8 +24,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_get_and_touch.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_get_projected.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_lookup_in.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_increment.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_increment.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_insert.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_insert.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_lookup_in.hxx

@@ -24,8 +24,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_lookup_in.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/lookup_in_result.hxx>
 

data/ext/couchbase/core/operations/document_mutate_in.hxx

@@ -26,8 +26,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_mutate_in.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 #include <couchbase/mutate_in_result.hxx>

data/ext/couchbase/core/operations/document_prepend.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_prepend.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_query.cxx

@@ -16,6 +16,8 @@
  */
 
 #include "document_query.hxx"
+
+#include "core/cluster_options.hxx"
 #include "core/logger/logger.hxx"
 #include "core/operations/management/error_utils.hxx"
 #include "core/utils/duration_parser.hxx"

data/ext/couchbase/core/operations/document_query.hxx

@@ -23,6 +23,7 @@
 #include "core/io/http_traits.hxx"
 #include "core/json_string.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 
 #include "couchbase/query_profile.hxx"
@@ -30,6 +31,11 @@
 
 #include <couchbase/mutation_token.hxx>
 
+namespace couchbase::tracing
+{
+class request_span;
+}
+
 namespace couchbase::core::operations
 {
 struct query_response {

data/ext/couchbase/core/operations/document_remove.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_remove.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_replace.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_replace.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_search.cxx

@@ -17,6 +17,7 @@
 
 #include "document_search.hxx"
 
+#include "core/cluster_options.hxx"
 #include "core/logger/logger.hxx"
 #include "core/utils/json.hxx"
 
@@ -31,9 +32,11 @@ search_request::encode_to(search_request::encoded_request_type& encoded, http_co
 {
     auto body = tao::json::value{
         { "query", utils::json::parse(query) },
-        { "explain", explain },
         { "ctl", { { "timeout", encoded.timeout.count() } } },
     };
+    if (explain) {
+        body["explain"] = *explain;
+    }
     if (limit) {
         body["size"] = *limit;
     }

data/ext/couchbase/core/operations/document_search.hxx

@@ -23,6 +23,7 @@
 #include "core/io/http_traits.hxx"
 #include "core/json_string.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/search_highlight_style.hxx"
 #include "core/search_scan_consistency.hxx"
 #include "core/timeout_defaults.hxx"
@@ -120,7 +121,7 @@ struct search_request {
 
     std::optional<std::uint32_t> limit{};
     std::optional<std::uint32_t> skip{};
-    bool explain{ false };
+    std::optional<bool> explain{ false };
     bool disable_scoring{ false };
     /**
      * UNCOMMITTED: If set to true, will include the vector of search_location in rows.

data/ext/couchbase/core/operations/document_touch.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_touch.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_unlock.hxx

@@ -23,8 +23,8 @@
 #include "core/io/retry_context.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_unlock.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 namespace couchbase::core::operations
 {

data/ext/couchbase/core/operations/document_upsert.hxx

@@ -25,8 +25,8 @@
 #include "core/operations/operation_traits.hxx"
 #include "core/protocol/client_request.hxx"
 #include "core/protocol/cmd_upsert.hxx"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
-#include "couchbase/tracing/request_tracer.hxx"
 
 #include <couchbase/durability_level.hxx>
 

data/ext/couchbase/core/operations/document_view.hxx

@@ -23,6 +23,7 @@
 #include "core/io/http_message.hxx"
 #include "core/io/http_traits.hxx"
 #include "core/platform/uuid.h"
+#include "core/public_fwd.hxx"
 #include "core/timeout_defaults.hxx"
 #include "core/view_on_error.hxx"
 #include "core/view_scan_consistency.hxx"

data/ext/couchbase/core/protocol/client_request.hxx

@@ -29,6 +29,8 @@
 #include <cstring>
 #include <gsl/util>
 
+#include <iostream>
+
 namespace couchbase::core::protocol
 {
 std::pair<bool, std::uint32_t>
@@ -110,10 +112,17 @@ class client_request
   private:
     [[nodiscard]] std::vector<std::byte> generate_payload(bool try_to_compress)
     {
-        std::vector<std::byte> payload(header_size + body_.size());
+        // SA: for some reason GCC 8.5.0 on CentOS 8 sees here null-pointer dereference
+#if defined(__GNUC__) && __GNUC__ == 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wnull-dereference"
+#endif
+        std::vector<std::byte> payload(header_size + body_.size(), std::byte{});
         payload[0] = static_cast<std::byte>(magic_);
         payload[1] = static_cast<std::byte>(opcode_);
-
+#if defined(__GNUC__) && __GNUC__ == 8
+#pragma GCC diagnostic pop
+#endif
         const auto& framing_extras = body_.framing_extras();
 
         std::uint16_t key_size = gsl::narrow_cast<std::uint16_t>(body_.key().size());

data/ext/couchbase/core/public_fwd.hxx

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * Copyright 2022-Present 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
+ *
+ *     https://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::tracing
+{
+class request_span;
+} // namespace couchbase::tracing

data/ext/couchbase/core/tls_verify_mode.hxx

@@ -0,0 +1,26 @@
+/* -*- 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::core
+{
+enum class tls_verify_mode {
+    none,
+    peer,
+};
+} // namespace couchbase::core

data/ext/couchbase/core/topology/configuration.cxx

@@ -20,6 +20,8 @@
 #include "core/logger/logger.hxx"
 #include "core/service_type_fmt.hxx"
 
+#include <gsl/narrow>
+
 #include <algorithm>
 #include <stdexcept>
 
@@ -162,9 +164,20 @@ configuration::node::endpoint(const std::string& network, service_type type, boo
 }
 
 bool
-configuration::has_node_with_hostname(const std::string& hostname) const
+configuration::has_node(const std::string& network, service_type type, bool is_tls, const std::string& hostname, const std::string& port)
+  const
 {
-    return std::any_of(nodes.begin(), nodes.end(), [&hostname](const auto& n) { return n.hostname == hostname; });
+    std::uint16_t port_number{ 0 };
+    try {
+        port_number = gsl::narrow_cast<std::uint16_t>(std::stoul(port, nullptr, 10));
+    } catch (const std::invalid_argument&) {
+        return false;
+    } catch (const std::out_of_range&) {
+        return false;
+    }
+    return std::any_of(nodes.begin(), nodes.end(), [&](const auto& n) {
+        return n.hostname_for(network) == hostname && n.port_or(network, type, is_tls, 0) == port_number;
+    });
 }
 
 std::string

data/ext/couchbase/core/topology/configuration.hxx

@@ -120,7 +120,11 @@ struct configuration {
     }
 
     [[nodiscard]] std::size_t index_for_this_node() const;
-    [[nodiscard]] bool has_node_with_hostname(const std::string& hostname) const;
+    [[nodiscard]] bool has_node(const std::string& network,
+                                service_type type,
+                                bool is_tls,
+                                const std::string& hostname,
+                                const std::string& port) const;
 
     template<typename Key>
     std::pair<std::uint16_t, std::optional<std::size_t>> map_key(const Key& key, std::size_t index)

data/ext/couchbase/core/transactions/attempt_context_testing_hooks.cxx

@@ -0,0 +1,93 @@
+/*
+ *     Copyright 2021-Present 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.
+ */
+
+#include "attempt_context_testing_hooks.hxx"
+
+namespace couchbase::core::transactions
+{
+namespace
+{
+inline std::optional<error_class>
+noop_1(attempt_context*)
+{
+    return {};
+}
+
+inline std::optional<error_class>
+noop_2(attempt_context*, const std::string&)
+{
+    return {};
+}
+
+inline std::optional<const std::string>
+noop_3(attempt_context*)
+{
+    return {};
+}
+
+inline bool
+noop_4(attempt_context*, const std::string&, std::optional<const std::string>)
+{
+    return false;
+}
+} // namespace
+
+attempt_context_testing_hooks::attempt_context_testing_hooks()
+  : before_atr_commit{ noop_1 }
+  , before_atr_commit_ambiguity_resolution{ noop_1 }
+  , after_atr_commit{ noop_1 }
+  , before_doc_committed{ noop_2 }
+  , before_removing_doc_during_staged_insert{ noop_2 }
+  , before_rollback_delete_inserted{ noop_2 }
+  , after_doc_committed_before_saving_cas{ noop_2 }
+  , after_doc_committed{ noop_2 }
+  , before_staged_insert{ noop_2 }
+  , before_staged_remove{ noop_2 }
+  , before_staged_replace{ noop_2 }
+  , before_doc_removed{ noop_2 }
+  , before_doc_rolled_back{ noop_2 }
+  , after_doc_removed_pre_retry{ noop_2 }
+  , after_doc_removed_post_retry{ noop_2 }
+  , after_get_complete{ noop_2 }
+  , after_staged_replace_complete_before_cas_saved{ noop_2 }
+  , after_staged_replace_complete{ noop_2 }
+  , after_staged_remove_complete{ noop_2 }
+  , after_staged_insert_complete{ noop_2 }
+  , after_rollback_replace_or_remove{ noop_2 }
+  , after_rollback_delete_inserted{ noop_2 }
+  , before_check_atr_entry_for_blocking_doc{ noop_2 }
+  , before_doc_get{ noop_2 }
+  , before_get_doc_in_exists_during_staged_insert{ noop_2 }
+  , before_query{ noop_2 }
+  , after_query{ noop_2 }
+  , before_remove_staged_insert{ noop_2 }
+  , after_remove_staged_insert{ noop_2 }
+  , after_docs_committed{ noop_1 }
+  , after_docs_removed{ noop_1 }
+  , after_atr_pending{ noop_1 }
+  , before_atr_pending{ noop_1 }
+  , before_atr_complete{ noop_1 }
+  , before_atr_rolled_back{ noop_1 }
+  , after_atr_complete{ noop_1 }
+  , before_get_atr_for_abort{ noop_1 }
+  , before_atr_aborted{ noop_1 }
+  , after_atr_aborted{ noop_1 }
+  , after_atr_rolled_back{ noop_1 }
+  , random_atr_id_for_vbucket{ noop_3 }
+  , has_expired_client_side{ noop_4 }
+{
+}
+} // namespace couchbase::core::transactions