couchbase 3.4.2 → 3.4.4

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

@@ -21,41 +21,36 @@
 #include "core/cluster.hxx"
 #include "core/operations/management/query_index_create.hxx"
 
-namespace couchbase::core::impl
+namespace couchbase
 {
 template<typename Response>
 static manager_error_context
 build_context(Response& resp)
 {
-    return { resp.ctx.ec,
-             resp.ctx.last_dispatched_to,
-             resp.ctx.last_dispatched_from,
-             resp.ctx.retry_attempts,
-             std::move(resp.ctx.retry_reasons),
-             std::move(resp.ctx.client_context_id),
-             resp.ctx.http_status,
-             std::move(resp.ctx.http_body),
-             std::move(resp.ctx.path) };
+    return manager_error_context(internal_manager_error_context{ resp.ctx.ec,
+                                                                 resp.ctx.last_dispatched_to,
+                                                                 resp.ctx.last_dispatched_from,
+                                                                 resp.ctx.retry_attempts,
+                                                                 std::move(resp.ctx.retry_reasons),
+                                                                 std::move(resp.ctx.client_context_id),
+                                                                 resp.ctx.http_status,
+                                                                 std::move(resp.ctx.http_body),
+                                                                 std::move(resp.ctx.path) });
 }
 
-void
-initiate_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                            std::string bucket_name,
-                            std::string index_name,
-                            std::vector<std::string> fields,
-                            couchbase::create_query_index_options::built options,
-                            query_context query_ctx,
-                            std::string collection_name,
-                            create_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_index_request(std::string bucket_name,
+                           std::string index_name,
+                           std::vector<std::string> fields,
+                           create_query_index_options::built options)
 {
-    core->execute(
-      operations::management::query_index_create_request{
-        bucket_name,
+    core::operations::management::query_index_create_request request{
+        std::move(bucket_name),
+        "",
         "",
-        collection_name,
-        index_name,
-        fields,
-        query_ctx,
+        std::move(index_name),
+        std::move(fields),
+        {},
         false,
         options.ignore_if_exists,
         options.condition,
@@ -63,39 +58,70 @@ initiate_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
         options.num_replicas,
         {},
         options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_create_response resp) { handler(build_context(resp)); });
+    };
+    return request;
 }
 
-void
-initiate_create_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                            std::string bucket_name,
-                            std::string index_name,
-                            std::vector<std::string> fields,
-                            couchbase::create_query_index_options::built options,
-                            create_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_primary_index_request(std::string bucket_name, create_primary_query_index_options::built options)
 {
-    initiate_create_query_index(
-      core, std::move(bucket_name), std::move(index_name), std::move(fields), options, {}, "", std::move(handler));
+    core::operations::management::query_index_create_request request{
+        std::move(bucket_name),
+        "",
+        "",
+        options.index_name.value_or(""),
+        {},
+        {},
+        true,
+        options.ignore_if_exists,
+        {},
+        options.deferred,
+        options.num_replicas,
+        {},
+        options.timeout,
+    };
+    return request;
 }
 
-void
-initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                    std::string bucket_name,
-                                    couchbase::create_primary_query_index_options::built options,
-                                    query_context query_ctx,
-                                    std::string collection_name,
-                                    create_primary_query_index_handler&& handler)
+static core::operations::management::query_index_create_request
+build_create_index_request(std::string bucket_name,
+                           std::string scope_name,
+                           std::string collection_name,
+                           std::string index_name,
+                           std::vector<std::string> fields,
+                           create_query_index_options::built options)
+{
+    core::operations::management::query_index_create_request request{
+        "",
+        "",
+        std::move(collection_name),
+        std::move(index_name),
+        std::move(fields),
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
+        false,
+        options.ignore_if_exists,
+        options.condition,
+        options.deferred,
+        options.num_replicas,
+        {},
+        options.timeout,
+    };
+    return request;
+}
+
+static core::operations::management::query_index_create_request
+build_create_primary_index_request(std::string bucket_name,
+                                   std::string scope_name,
+                                   std::string collection_name,
+                                   create_primary_query_index_options::built options)
 {
-    core->execute(
-      operations::management::query_index_create_request{
-        bucket_name,
+    core::operations::management::query_index_create_request request{
         "",
-        collection_name,
+        "",
+        std::move(collection_name),
         options.index_name.value_or(""),
         {},
-        query_ctx,
+        core::query_context(std::move(bucket_name), std::move(scope_name)),
         true,
         options.ignore_if_exists,
         {},
@@ -103,17 +129,104 @@ initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> co
         options.num_replicas,
         {},
         options.timeout,
-      },
-      [core, bucket_name, options = std::move(options), handler = std::move(handler)](
-        operations::management::query_index_create_response resp) { handler(build_context(resp)); });
+    };
+    return request;
 }
 
 void
-initiate_create_primary_query_index(std::shared_ptr<couchbase::core::cluster> core,
-                                    std::string bucket_name,
-                                    couchbase::create_primary_query_index_options::built options,
-                                    create_primary_query_index_handler&& handler)
+query_index_manager::create_index(std::string bucket_name,
+                                  std::string index_name,
+                                  std::vector<std::string> fields,
+                                  const couchbase::create_query_index_options& options,
+                                  couchbase::create_primary_query_index_handler&& handler) const
+{
+    auto request = build_create_index_request(std::move(bucket_name), std::move(index_name), std::move(fields), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::create_index(std::string bucket_name,
+                                  std::string index_name,
+                                  std::vector<std::string> fields,
+                                  const couchbase::create_query_index_options& options) const -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_index(std::move(bucket_name), std::move(index_name), std::move(fields), options, [barrier](auto ctx) mutable {
+        barrier->set_value(std::move(ctx));
+    });
+    return barrier->get_future();
+}
+
+void
+query_index_manager::create_primary_index(std::string bucket_name,
+                                          const create_primary_query_index_options& options,
+                                          create_query_index_handler&& handler)
+{
+    auto request = build_create_primary_index_request(std::move(bucket_name), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+query_index_manager::create_primary_index(std::string bucket_name, const create_primary_query_index_options& options)
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_primary_index(std::move(bucket_name), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
+void
+collection_query_index_manager::create_index(std::string index_name,
+                                             std::vector<std::string> fields,
+                                             const create_query_index_options& options,
+                                             create_query_index_handler&& handler) const
+{
+    auto request =
+      build_create_index_request(bucket_name_, scope_name_, collection_name_, std::move(index_name), std::move(fields), options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+collection_query_index_manager::create_index(std::string index_name,
+                                             std::vector<std::string> fields,
+                                             const couchbase::create_query_index_options& options) const
+  -> std::future<manager_error_context>
+{
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_index(std::move(index_name), std::move(fields), options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
+}
+
+void
+collection_query_index_manager::create_primary_index(const create_primary_query_index_options& options,
+                                                     create_query_index_handler&& handler) const
+{
+    auto request = build_create_primary_index_request(bucket_name_, scope_name_, collection_name_, options.build());
+
+    core_->execute(std::move(request),
+                   [handler = std::move(handler)](core::operations::management::query_index_create_response resp) mutable {
+                       return handler(build_context(resp));
+                   });
+}
+
+auto
+collection_query_index_manager::create_primary_index(const couchbase::create_primary_query_index_options& options)
+  -> std::future<manager_error_context>
 {
-    initiate_create_primary_query_index(core, std::move(bucket_name), std::move(options), {}, "", std::move(handler));
+    auto barrier = std::make_shared<std::promise<manager_error_context>>();
+    create_primary_index(options, [barrier](auto ctx) mutable { barrier->set_value(std::move(ctx)); });
+    return barrier->get_future();
 }
-} // namespace couchbase::core::impl
+} // 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

data/ext/couchbase/core/impl/disjunction_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/disjunction_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+disjunction_query::encode() const -> encoded_search_query
+{
+    if (disjuncts_.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 disjuncts = tao::json::empty_array;
+    for (const auto& disjunct : disjuncts_) {
+        auto encoded = disjunct->encode();
+        if (encoded.ec) {
+            return { encoded.ec };
+        }
+        disjuncts.push_back(encoded.query);
+    }
+    built.query["disjuncts"] = disjuncts;
+
+    return built;
+}
+} // namespace couchbase

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

@@ -41,7 +41,8 @@ dns_srv_tracker::dns_srv_tracker(asio::io_context& ctx, std::string address, con
 void
 dns_srv_tracker::get_srv_nodes(utils::movable_function<void(origin::node_list, std::error_code)> callback)
 {
-    CB_LOG_TRACE("query DNS-SRV: address=\"{}\", service=\"{}\"", address_, service_);
+    CB_LOG_DEBUG(
+      "Query DNS-SRV: address=\"{}\", service=\"{}\", nameserver=\"{}:{}\"", address_, service_, config_.nameserver(), config_.port());
     dns_client_.query_srv(
       address_,
       service_,