couchbase 3.4.2 → 3.4.3

data/ext/couchbase/core/config_profiles.cxx

@@ -0,0 +1,79 @@
+/* -*- 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.
+ */
+
+#include "config_profiles.hxx"
+
+#include "cluster_options.hxx"
+
+#include <fmt/core.h>
+
+#include <chrono>
+#include <stdexcept>
+
+namespace couchbase::core
+{
+class development_profile : public config_profile
+{
+  public:
+    void apply(couchbase::core::cluster_options& opts) override
+    {
+        opts.key_value_timeout = std::chrono::seconds(20);
+        opts.key_value_durable_timeout = std::chrono::seconds(20);
+        opts.connect_timeout = std::chrono::seconds(20);
+        opts.view_timeout = std::chrono::minutes(2);
+        opts.query_timeout = std::chrono::minutes(2);
+        opts.analytics_timeout = std::chrono::minutes(2);
+        opts.search_timeout = std::chrono::minutes(2);
+        opts.management_timeout = std::chrono::minutes(2);
+
+        // C++SDK specific
+        opts.dns_config = couchbase::core::io::dns::dns_config{
+            opts.dns_config.nameserver(),
+            opts.dns_config.port(),
+            std::chrono::seconds(20), // timeout to make DNS-SRV query
+        };
+        opts.resolve_timeout = std::chrono::seconds(20);  // timeout to resolve hostnames
+        opts.bootstrap_timeout = std::chrono::minutes(2); // overall timeout to bootstrap
+    }
+};
+
+config_profiles::config_profiles() noexcept
+{
+    // add all known profiles (above) to the map
+    register_profile<development_profile>("wan_development");
+}
+
+void
+config_profiles::apply(const std::string& profile_name, couchbase::core::cluster_options& opts)
+{
+    std::lock_guard<std::mutex> lock(mut_);
+    auto it = profiles_.find(profile_name);
+    if (it != profiles_.end()) {
+        it->second->apply(opts);
+    } else {
+        throw std::invalid_argument(fmt::format("unknown profile '{}'", profile_name));
+    }
+}
+
+config_profiles&
+known_profiles()
+{
+    static config_profiles profiles{};
+    return profiles;
+}
+
+} // namespace couchbase::core

data/ext/couchbase/core/config_profiles.hxx

@@ -0,0 +1,56 @@
+/* -*- 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
+
+#include "cluster_options_fwd.hxx"
+#include "config_profile.hxx"
+
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace couchbase::core
+{
+// this class just registers the known profiles defined above, and allows access to them.
+class config_profiles
+{
+  private:
+    std::map<std::string, std::shared_ptr<config_profile>, std::less<>> profiles_;
+    mutable std::mutex mut_;
+
+  public:
+    config_profiles() noexcept;
+
+    void apply(const std::string& profile_name, couchbase::core::cluster_options& opts);
+
+    template<typename T, typename... Args>
+    void register_profile(const std::string& name, Args... args)
+    {
+        // This will just add it, doesn't look to see if it is overwriting an existing profile.
+        // TODO: perhaps add a template Args param?
+        // TODO: should we make this thread-safe?   Easy enough here, but we'd need to make the
+        //   singleton thread-safe too.
+        const std::scoped_lock lock(mut_);
+        profiles_.emplace(std::make_pair(name, std::make_shared<T>(args...)));
+    }
+};
+
+config_profiles&
+known_profiles();
+
+} // namespace couchbase::core

data/ext/couchbase/core/error_context/search.hxx

@@ -32,7 +32,7 @@ struct search {
     std::error_code ec{};
     std::string client_context_id{};
     std::string index_name{};
-    std::optional<std::string> query{};
+    std::string query{};
     std::optional<std::string> parameters{};
 
     std::string method{};

data/ext/couchbase/core/impl/analytics.cxx

@@ -17,6 +17,7 @@
 
 #include <couchbase/cluster.hxx>
 #include <couchbase/error_codes.hxx>
+#include <couchbase/scope.hxx>
 
 #include "core/cluster.hxx"
 #include "core/operations/document_analytics.hxx"

data/ext/couchbase/core/impl/boolean_field_query.cxx

@@ -0,0 +1,40 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-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 "encoded_search_query.hxx"
+
+#include <couchbase/boolean_field_query.hxx>
+
+namespace couchbase
+{
+auto
+boolean_field_query::encode() const -> encoded_search_query
+{
+    encoded_search_query built;
+
+    built.query = tao::json::empty_object;
+    if (boost_) {
+        built.query["boost"] = boost_.value();
+    }
+    built.query["bool"] = bool_;
+    if (field_) {
+        built.query["field"] = field_.value();
+    }
+
+    return built;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/boolean_query.cxx

@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-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 "encoded_search_query.hxx"
+
+#include <couchbase/boolean_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+boolean_query::encode() const -> encoded_search_query
+{
+    if (!must_ && !should_ && !must_not_) {
+        return { errc::common::invalid_argument };
+    }
+
+    encoded_search_query built;
+    built.query = tao::json::empty_object;
+    if (boost_) {
+        built.query["boost"] = boost_.value();
+    }
+    if (must_) {
+        auto encoded = must_->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        built.query["must"] = encoded.query;
+    }
+    if (must_not_) {
+        auto encoded = must_not_->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        built.query["must_not"] = encoded.query;
+    }
+    if (should_) {
+        auto encoded = should_->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        built.query["should"] = encoded.query;
+    }
+
+    return built;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/cluster.cxx

@@ -90,6 +90,7 @@ options_to_origin(const std::string& connection_string, const couchbase::cluster
                 user_options.tls_verify = core::tls_verify_mode::peer;
                 break;
         }
+        user_options.disable_mozilla_ca_certificates = opts.security.disable_mozilla_ca_certificates;
     }
 
     if (opts.dns.nameserver) {
@@ -98,6 +99,7 @@ options_to_origin(const std::string& connection_string, const couchbase::cluster
     }
     user_options.enable_clustermap_notification = opts.behavior.enable_clustermap_notification;
     user_options.show_queries = opts.behavior.show_queries;
+    user_options.dump_configuration = opts.behavior.dump_configuration;
     user_options.enable_mutation_tokens = opts.behavior.enable_mutation_tokens;
     user_options.enable_unordered_execution = opts.behavior.enable_unordered_execution;
     user_options.user_agent_extra = opts.behavior.user_agent_extra;

data/ext/couchbase/core/impl/conjunction_query.cxx

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-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 "encoded_search_query.hxx"
+
+#include <couchbase/conjunction_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+conjunction_query::encode() const -> encoded_search_query
+{
+    if (conjuncts_.empty()) {
+        return { errc::common::invalid_argument };
+    }
+
+    encoded_search_query built;
+    built.query = tao::json::empty_object;
+    if (boost_) {
+        built.query["boost"] = boost_.value();
+    }
+
+    tao::json::value conjuncts = tao::json::empty_array;
+    for (const auto& conjunct : conjuncts_) {
+        auto encoded = conjunct->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        conjuncts.push_back(encoded.query);
+    }
+    built.query["conjuncts"] = conjuncts;
+
+    return built;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/date_range.cxx

@@ -0,0 +1,89 @@
+/* -*- 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.
+ */
+
+#include <couchbase/date_range.hxx>
+
+#include <fmt/chrono.h>
+
+namespace couchbase
+{
+static constexpr const char* iso_8601_format = "{:%Y-%m-%dT%H:%M:%S%z}";
+
+date_range::date_range(std::string name, std::string start, std::string end)
+  : name_{ std::move(name) }
+  , start_{ std::move(start) }
+  , end_{ std::move(end) }
+{
+}
+
+date_range::date_range(std::string name, std::chrono::system_clock::time_point start, std::chrono::system_clock::time_point end)
+  : name_{ std::move(name) }
+  , start_{ fmt::format(iso_8601_format, start) }
+  , end_{ fmt::format(iso_8601_format, end) }
+{
+}
+
+date_range::date_range(std::string name, std::tm start, std::tm end)
+  : name_{ std::move(name) }
+  , start_{ fmt::format(iso_8601_format, start) }
+  , end_{ fmt::format(iso_8601_format, end) }
+{
+}
+
+date_range::date_range(std::string name, std::optional<std::string> start, std::optional<std::string> end)
+  : name_{ std::move(name) }
+  , start_{ std::move(start) }
+  , end_{ std::move(end) }
+{
+}
+
+date_range
+date_range::with_start(std::string name, std::string start)
+{
+    return { std::move(name), std::move(start), {} };
+}
+
+date_range
+date_range::with_start(std::string name, std::chrono::system_clock::time_point start)
+{
+    return { std::move(name), fmt::format(iso_8601_format, start), {} };
+}
+
+date_range
+date_range::with_start(std::string name, std::tm start)
+{
+    return { std::move(name), fmt::format(iso_8601_format, start), {} };
+}
+
+date_range
+date_range::with_end(std::string name, std::string end)
+{
+    return { std::move(name), {}, std::move(end) };
+}
+
+date_range
+date_range::with_end(std::string name, std::chrono::system_clock::time_point end)
+{
+    return { std::move(name), {}, fmt::format(iso_8601_format, end) };
+}
+
+date_range
+date_range::with_end(std::string name, std::tm end)
+{
+    return { std::move(name), {}, fmt::format(iso_8601_format, end) };
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/date_range_facet.cxx

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-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 "encoded_search_facet.hxx"
+
+#include <couchbase/date_range_facet.hxx>
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+date_range_facet::encode() const -> encoded_search_facet
+{
+    encoded_search_facet built;
+    built.facet = {
+        { "field", field_ },
+    };
+    if (size_) {
+        built.facet["size"] = size_.value();
+    }
+    if (ranges_.empty()) {
+        return { errc::common::invalid_argument };
+    }
+    tao::json::value ranges = tao::json::empty_array;
+    for (const auto& range : ranges_) {
+        tao::json::value entry = {
+            { "field", range.name() },
+        };
+        if (const auto& start = range.start(); start.has_value()) {
+            entry["start"] = start.value();
+        }
+        if (const auto& end = range.end(); end.has_value()) {
+            entry["end"] = end.value();
+        }
+        ranges.emplace_back(entry);
+    }
+    built.facet["date_ranges"] = ranges;
+    return built;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/date_range_facet_result.cxx

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ *   Copyright 2023-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 "internal_date_range_facet_result.hxx"
+
+#include <couchbase/date_range_facet_result.hxx>
+
+namespace couchbase
+{
+date_range_facet_result::date_range_facet_result(internal_date_range_facet_result internal)
+  : internal_{ std::make_unique<internal_date_range_facet_result>(std::move(internal)) }
+{
+}
+
+auto
+date_range_facet_result::name() const -> const std::string&
+{
+    return internal_->name();
+}
+
+auto
+date_range_facet_result::field() const -> const std::string&
+{
+    return internal_->field();
+}
+
+auto
+date_range_facet_result::total() const -> std::uint64_t
+{
+    return internal_->total();
+}
+
+auto
+date_range_facet_result::missing() const -> std::uint64_t
+{
+    return internal_->missing();
+}
+
+auto
+date_range_facet_result::other() const -> std::uint64_t
+{
+    return internal_->other();
+}
+
+auto
+date_range_facet_result::date_ranges() const -> const std::vector<search_date_range>&
+{
+    return internal_->date_ranges();
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/date_range_query.cxx

@@ -0,0 +1,125 @@
+/* -*- 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.
+ */
+
+#include "encoded_search_query.hxx"
+
+#include <couchbase/date_range_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+#include <fmt/chrono.h>
+
+namespace couchbase
+{
+
+static constexpr const char* iso_8601_format = "{:%Y-%m-%dT%H:%M:%S%z}";
+
+auto
+date_range_query::start(std::chrono::system_clock::time_point value) -> date_range_query&
+{
+    start_ = fmt::format(iso_8601_format, value);
+    return *this;
+}
+
+auto
+date_range_query::start(std::tm value) -> date_range_query&
+{
+    start_ = fmt::format(iso_8601_format, value);
+    return *this;
+}
+
+auto
+date_range_query::start(std::chrono::system_clock::time_point value, bool inclusive) -> date_range_query&
+{
+    start_ = fmt::format(iso_8601_format, value);
+    inclusive_start_ = inclusive;
+    return *this;
+}
+
+auto
+date_range_query::start(std::tm value, bool inclusive) -> date_range_query&
+{
+    start_ = fmt::format(iso_8601_format, value);
+    inclusive_start_ = inclusive;
+    return *this;
+}
+
+auto
+date_range_query::end(std::chrono::system_clock::time_point value) -> date_range_query&
+{
+
+    end_ = fmt::format(iso_8601_format, value);
+    return *this;
+}
+
+auto
+date_range_query::end(std::tm value) -> date_range_query&
+{
+    end_ = fmt::format(iso_8601_format, value);
+    return *this;
+}
+
+auto
+date_range_query::end(std::chrono::system_clock::time_point value, bool inclusive) -> date_range_query&
+{
+    end_ = fmt::format(iso_8601_format, value);
+    inclusive_end_ = inclusive;
+    return *this;
+}
+
+auto
+date_range_query::end(std::tm value, bool inclusive) -> date_range_query&
+{
+    end_ = fmt::format(iso_8601_format, value);
+    inclusive_end_ = inclusive;
+    return *this;
+}
+
+auto
+date_range_query::encode() const -> encoded_search_query
+{
+    if ((!start_ || start_->empty()) && (!end_ || end_->empty())) {
+        return { errc::common::invalid_argument };
+    }
+
+    encoded_search_query built;
+    built.query = tao::json::empty_object;
+    if (boost_) {
+        built.query["boost"] = boost_.value();
+    }
+    if (field_) {
+        built.query["field"] = field_.value();
+    }
+    if (start_) {
+        built.query["start"] = start_.value();
+        if (inclusive_start_.has_value()) {
+            built.query["inclusive_start"] = inclusive_start_.value();
+        }
+    }
+    if (end_) {
+        built.query["end"] = end_.value();
+        if (inclusive_end_.has_value()) {
+            built.query["inclusive_end"] = inclusive_end_.value();
+        }
+    }
+    if (date_time_parser_) {
+        built.query["datetime_parser"] = date_time_parser_.value();
+    }
+
+    return built;
+}
+} // namespace couchbase