couchbase 4.2.3 → 4.2.4

package/deps/couchbase-cxx-client/core/impl/search_sort_field.cxx

@@ -0,0 +1,104 @@
+/* -*- 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_sort.hxx"
+
+#include <couchbase/search_sort_field.hxx>
+
+namespace couchbase
+{
+auto
+search_sort_field::descending(bool desc) -> search_sort_field&
+{
+    descending_ = desc;
+    return *this;
+}
+
+auto
+search_sort_field::type(search_sort_field_type value) -> search_sort_field&
+{
+    type_ = value;
+    return *this;
+}
+
+auto
+search_sort_field::mode(search_sort_field_mode value) -> search_sort_field&
+{
+    mode_ = value;
+    return *this;
+}
+
+auto
+search_sort_field::missing(search_sort_field_missing value) -> search_sort_field&
+{
+    missing_ = value;
+    return *this;
+}
+
+auto
+search_sort_field::encode() const -> encoded_search_sort
+{
+    encoded_search_sort built;
+    built.sort = {
+        { "by", "field" },
+        { "field", field_ },
+    };
+    if (const auto& desc = descending_; desc.has_value()) {
+        built.sort["desc"] = desc.value();
+    }
+    if (const auto& type = type_; type.has_value()) {
+        switch (type.value()) {
+            case search_sort_field_type::automatic:
+                built.sort["type"] = "auto";
+                break;
+            case search_sort_field_type::string:
+                built.sort["type"] = "string";
+                break;
+            case search_sort_field_type::number:
+                built.sort["type"] = "number";
+                break;
+            case search_sort_field_type::date:
+                built.sort["type"] = "date";
+                break;
+        }
+    }
+    if (const auto& mode = mode_; mode.has_value()) {
+        switch (mode.value()) {
+            case search_sort_field_mode::server_default:
+                built.sort["mode"] = "default";
+                break;
+            case search_sort_field_mode::min:
+                built.sort["mode"] = "min";
+                break;
+            case search_sort_field_mode::max:
+                built.sort["mode"] = "max";
+                break;
+        }
+    }
+    if (const auto& missing = missing_; missing.has_value()) {
+        switch (missing.value()) {
+            case search_sort_field_missing::last:
+                built.sort["missing"] = "last";
+                break;
+            case search_sort_field_missing::first:
+                built.sort["missing"] = "first";
+                break;
+        }
+    }
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/search_sort_id.cxx

@@ -0,0 +1,43 @@
+/* -*- 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_sort.hxx"
+
+#include <couchbase/search_sort_id.hxx>
+
+namespace couchbase
+{
+auto
+search_sort_id::descending(bool desc) -> search_sort_id&
+{
+    descending_ = desc;
+    return *this;
+}
+
+auto
+search_sort_id::encode() const -> encoded_search_sort
+{
+    encoded_search_sort built;
+    built.sort = {
+        { "by", "id" },
+    };
+    if (const auto& desc = descending_; desc.has_value()) {
+        built.sort["desc"] = desc.value();
+    }
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/search_sort_score.cxx

@@ -0,0 +1,43 @@
+/* -*- 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_sort.hxx"
+
+#include <couchbase/search_sort_score.hxx>
+
+namespace couchbase
+{
+auto
+search_sort_score::descending(bool desc) -> search_sort_score&
+{
+    descending_ = desc;
+    return *this;
+}
+
+auto
+search_sort_score::encode() const -> encoded_search_sort
+{
+    encoded_search_sort built;
+    built.sort = {
+        { "by", "score" },
+    };
+    if (const auto& desc = descending_; desc.has_value()) {
+        built.sort["desc"] = desc.value();
+    }
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/term_facet.cxx

@@ -0,0 +1,36 @@
+/* -*- 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/term_facet.hxx>
+
+namespace couchbase
+{
+auto
+term_facet::encode() const -> encoded_search_facet
+{
+    encoded_search_facet built;
+    built.facet = {
+        { "field", field_ },
+    };
+    if (size_) {
+        built.facet["size"] = size_.value();
+    }
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/term_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_term_facet_result.hxx"
+
+#include <couchbase/term_facet_result.hxx>
+
+namespace couchbase
+{
+term_facet_result::term_facet_result(internal_term_facet_result internal)
+  : internal_{ std::make_unique<internal_term_facet_result>(std::move(internal)) }
+{
+}
+
+auto
+term_facet_result::name() const -> const std::string&
+{
+    return internal_->name();
+}
+
+auto
+term_facet_result::field() const -> const std::string&
+{
+    return internal_->field();
+}
+
+auto
+term_facet_result::total() const -> std::uint64_t
+{
+    return internal_->total();
+}
+
+auto
+term_facet_result::missing() const -> std::uint64_t
+{
+    return internal_->missing();
+}
+
+auto
+term_facet_result::other() const -> std::uint64_t
+{
+    return internal_->other();
+}
+
+auto
+term_facet_result::terms() const -> const std::vector<search_term_range>&
+{
+    return internal_->terms();
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/term_query.cxx

@@ -0,0 +1,56 @@
+/* -*- 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/term_query.hxx>
+
+namespace couchbase
+{
+auto
+term_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["term"] = term_;
+    if (field_) {
+        built.query["field"] = field_.value();
+    }
+    if (fuzziness_) {
+        built.query["fuzziness"] = fuzziness_.value();
+    }
+    if (prefix_length_) {
+        built.query["prefix_length"] = prefix_length_.value();
+    }
+    if (operator_) {
+        switch (operator_.value()) {
+            case match_operator::logical_or:
+                built.query["operator"] = "or";
+                break;
+            case match_operator::logical_and:
+                built.query["operator"] = "and";
+                break;
+        }
+    }
+
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/term_range_query.cxx

@@ -0,0 +1,57 @@
+/* -*- 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/term_range_query.hxx>
+
+#include <couchbase/error_codes.hxx>
+
+namespace couchbase
+{
+auto
+term_range_query::encode() const -> encoded_search_query
+{
+    if ((!min_ || min_->empty()) && (!max_ || max_->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 (min_) {
+        built.query["min"] = min_.value();
+        if (inclusive_min_.has_value()) {
+            built.query["inclusive_min"] = inclusive_min_.value();
+        }
+    }
+    if (max_) {
+        built.query["max"] = max_.value();
+        if (inclusive_max_.has_value()) {
+            built.query["inclusive_max"] = inclusive_max_.value();
+        }
+    }
+
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/impl/wildcard_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/wildcard_query.hxx>
+
+namespace couchbase
+{
+auto
+wildcard_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["wildcard"] = wildcard_;
+    if (field_) {
+        built.query["field"] = field_.value();
+    }
+
+    return built;
+}
+} // namespace couchbase

package/deps/couchbase-cxx-client/core/io/mcbp_command.hxx

@@ -59,9 +59,13 @@ struct mcbp_command : public std::enable_shared_from_this<mcbp_command<Manager,
     mcbp_command_handler handler_{};
     std::shared_ptr<Manager> manager_{};
     std::chrono::milliseconds timeout_{};
-    std::string id_{ uuid::to_string(uuid::random()) };
+    std::string id_{
+        fmt::format("{:02x}/{}", static_cast<std::uint8_t>(encoded_request_type::body_type::opcode), uuid::to_string(uuid::random()))
+    };
     std::shared_ptr<couchbase::tracing::request_span> span_{ nullptr };
     std::shared_ptr<couchbase::tracing::request_span> parent_span{ nullptr };
+    std::optional<std::string> last_dispatched_from_{};
+    std::optional<std::string> last_dispatched_to_{};
 
     mcbp_command(asio::io_context& ctx, std::shared_ptr<Manager> manager, Request req, std::chrono::milliseconds default_timeout)
       : deadline(ctx)
@@ -109,7 +113,10 @@ struct mcbp_command : public std::enable_shared_from_this<mcbp_command<Manager,
                 handler_ = nullptr;
             }
         }
-        invoke_handler(request.retries.idempotent() ? errc::common::unambiguous_timeout : errc::common::ambiguous_timeout);
+        invoke_handler(request.retries.idempotent() || !opaque_.has_value()
+                         ? errc::common::unambiguous_timeout // safe to retry or has not been sent to the server
+                         : errc::common::ambiguous_timeout   // non-idempotent and has been sent to the server
+        );
     }
 
     void invoke_handler(std::error_code ec, std::optional<io::mcbp_message>&& msg = {})