couchbase 3.4.2 → 3.4.4

data/ext/couchbase/core/impl/internal_search_result.hxx

@@ -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.
+ */
+
+#pragma once
+
+#include "core/operations/document_search.hxx"
+
+#include <couchbase/search_result.hxx>
+
+namespace couchbase
+{
+class internal_search_result
+{
+  public:
+    explicit internal_search_result(const core::operations::search_response& response);
+
+    [[nodiscard]] auto meta_data() const -> const search_meta_data&;
+
+    [[nodiscard]] auto rows() const -> const std::vector<search_row>&;
+
+    [[nodiscard]] auto facets() const -> const std::map<std::string, std::shared_ptr<search_facet_result>>&;
+
+  private:
+    search_meta_data meta_data_;
+    std::map<std::string, std::shared_ptr<search_facet_result>> facets_;
+    std::vector<search_row> rows_;
+};
+
+} // namespace couchbase

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

@@ -0,0 +1,82 @@
+/* -*- 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_search_row.hxx"
+
+#include "internal_search_row_location.hxx"
+#include "internal_search_row_locations.hxx"
+
+#include "core/utils/binary.hxx"
+
+#include <utility>
+
+namespace couchbase
+{
+
+internal_search_row::internal_search_row(core::operations::search_response::search_row row)
+  : row_{ std::move(row) }
+  , fields_{ core::utils::to_binary(row_.fields) }
+  , explanation_{ core::utils::to_binary(row_.explanation) }
+  , fragments_{ row_.fragments }
+{
+    if (!row_.locations.empty()) {
+        locations_.emplace(internal_search_row_locations{ row_.locations });
+    }
+}
+
+auto
+internal_search_row::index() const -> const std::string&
+{
+    return row_.index;
+}
+
+auto
+internal_search_row::id() const -> const std::string&
+{
+    return row_.id;
+}
+
+auto
+internal_search_row::score() const -> double
+{
+    return row_.score;
+}
+
+auto
+internal_search_row::fields() const -> const codec::binary&
+{
+    return fields_;
+}
+
+auto
+internal_search_row::explanation() const -> const codec::binary&
+{
+    return explanation_;
+}
+
+auto
+internal_search_row::fragments() const -> const std::map<std::string, std::vector<std::string>>&
+{
+    return fragments_;
+}
+
+auto
+internal_search_row::locations() const -> const std::optional<search_row_locations>&
+{
+    return locations_;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/internal_search_row.hxx

@@ -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.
+ */
+
+#pragma once
+
+#include "core/operations/document_search.hxx"
+
+#include <couchbase/codec/encoded_value.hxx>
+#include <couchbase/search_row_locations.hxx>
+
+namespace couchbase
+{
+class internal_search_row
+{
+  public:
+    explicit internal_search_row(core::operations::search_response::search_row row);
+
+    [[nodiscard]] auto index() const -> const std::string&;
+
+    [[nodiscard]] auto id() const -> const std::string&;
+
+    [[nodiscard]] auto score() const -> double;
+
+    [[nodiscard]] auto fields() const -> const codec::binary&;
+
+    [[nodiscard]] auto explanation() const -> const codec::binary&;
+
+    [[nodiscard]] auto fragments() const -> const std::map<std::string, std::vector<std::string>>&;
+
+    [[nodiscard]] auto locations() const -> const std::optional<search_row_locations>&;
+
+  private:
+    core::operations::search_response::search_row row_;
+
+    // TODO(sergey): eliminate or defer copying of these fields
+    codec::binary fields_;
+    codec::binary explanation_;
+    std::map<std::string, std::vector<std::string>> fragments_;
+    std::optional<search_row_locations> locations_{};
+};
+
+} // namespace couchbase

data/ext/couchbase/core/impl/internal_search_row_location.hxx

@@ -0,0 +1,32 @@
+/* -*- 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.
+ */
+
+#pragma once
+
+#include "core/operations/document_search.hxx"
+
+#include <couchbase/search_row_location.hxx>
+
+namespace couchbase
+{
+class internal_search_row_location
+{
+  public:
+    core::operations::search_response::search_location location;
+};
+
+} // namespace couchbase

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

@@ -0,0 +1,137 @@
+/* -*- 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_search_row_locations.hxx"
+
+#include "internal_search_row_location.hxx"
+
+namespace couchbase
+{
+
+internal_search_row_locations::internal_search_row_locations(
+  const std::vector<core::operations::search_response::search_location>& locations)
+{
+    for (const auto& location : locations) {
+        locations_[location.field][location.term].emplace_back(internal_search_row_location{ location });
+    }
+}
+
+auto
+internal_search_row_locations::get(const std::string& field) const -> std::vector<search_row_location>
+{
+    const auto& locations_for_field = locations_.find(field);
+
+    if (locations_for_field == locations_.end()) {
+        return {};
+    }
+
+    std::vector<search_row_location> result;
+    for (const auto& [term, locations] : locations_for_field->second) {
+        result.reserve(result.size() + locations.size());
+        for (const auto& location : locations) {
+            result.emplace_back(location);
+        }
+    }
+
+    return result;
+}
+
+auto
+internal_search_row_locations::get(const std::string& field, const std::string& term) const -> std::vector<search_row_location>
+{
+    const auto& locations_for_field = locations_.find(field);
+
+    if (locations_for_field == locations_.end()) {
+        return {};
+    }
+
+    const auto& locations_for_term = locations_for_field->second.find(term);
+    if (locations_for_term == locations_for_field->second.end()) {
+        return {};
+    }
+
+    std::vector<search_row_location> result;
+    result.reserve(locations_for_term->second.size());
+    for (const auto& location : locations_for_term->second) {
+        result.emplace_back(location);
+    }
+    return result;
+}
+
+auto
+internal_search_row_locations::get_all() const -> std::vector<search_row_location>
+{
+    std::vector<search_row_location> result;
+
+    for (const auto& [field, locations_by_field] : locations_) {
+        for (const auto& [term, locations] : locations_by_field) {
+            result.reserve(result.size() + locations.size());
+            for (const auto& location : locations) {
+                result.emplace_back(location);
+            }
+        }
+    }
+
+    return result;
+}
+
+auto
+internal_search_row_locations::fields() const -> std::vector<std::string>
+{
+    std::vector<std::string> result;
+
+    result.reserve(locations_.size());
+    for (const auto& [field, _] : locations_) {
+        result.emplace_back(field);
+    }
+
+    return result;
+}
+
+auto
+internal_search_row_locations::terms() const -> std::set<std::string>
+{
+    std::set<std::string> result;
+
+    for (const auto& [field, locations_by_term] : locations_) {
+        for (const auto& [term, _] : locations_by_term) {
+            result.insert(term);
+        }
+    }
+
+    return result;
+}
+
+auto
+internal_search_row_locations::terms_for(const std::string& field) const -> std::vector<std::string>
+{
+    const auto& locations_for_field = locations_.find(field);
+
+    if (locations_for_field == locations_.end()) {
+        return {};
+    }
+
+    std::vector<std::string> result;
+
+    result.reserve(locations_for_field->second.size());
+    for (const auto& [term, _] : locations_for_field->second) {
+        result.emplace_back(term);
+    }
+
+    return result;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/internal_search_row_locations.hxx

@@ -0,0 +1,45 @@
+/* -*- 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.
+ */
+
+#pragma once
+
+#include "core/operations/document_search.hxx"
+
+#include <couchbase/search_row_location.hxx>
+
+namespace couchbase
+{
+class internal_search_row_location;
+
+class internal_search_row_locations
+{
+  public:
+    explicit internal_search_row_locations(const std::vector<core::operations::search_response::search_location>& locations);
+
+    [[nodiscard]] auto get(const std::string& field) const -> std::vector<search_row_location>;
+    [[nodiscard]] auto get(const std::string& field, const std::string& term) const -> std::vector<search_row_location>;
+    [[nodiscard]] auto get_all() const -> std::vector<search_row_location>;
+    [[nodiscard]] auto fields() const -> std::vector<std::string>;
+    [[nodiscard]] auto terms() const -> std::set<std::string>;
+    [[nodiscard]] auto terms_for(const std::string& field) const -> std::vector<std::string>;
+
+  private:
+    // field -> term -> location
+    std::map<std::string, std::map<std::string, std::vector<internal_search_row_location>>> locations_;
+};
+
+} // namespace couchbase

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

@@ -0,0 +1,80 @@
+/* -*- 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"
+
+namespace couchbase
+{
+
+static std::vector<search_term_range>
+map_ranges(const core::operations::search_response::search_facet& facet)
+{
+    std::vector<search_term_range> ranges;
+    ranges.reserve(facet.terms.size());
+
+    for (const auto& range : facet.terms) {
+        ranges.emplace_back(range.term, range.count);
+    }
+
+    return ranges;
+}
+
+internal_term_facet_result::internal_term_facet_result(const core::operations::search_response::search_facet& facet)
+  : name_{ facet.name }
+  , field_{ facet.field }
+  , total_{ facet.total }
+  , missing_{ facet.missing }
+  , other_{ facet.other }
+  , ranges_{ map_ranges(facet) }
+{
+}
+
+auto
+internal_term_facet_result::name() const -> const std::string&
+{
+    return name_;
+}
+auto
+internal_term_facet_result::field() const -> const std::string&
+{
+    return field_;
+}
+
+auto
+internal_term_facet_result::total() const -> std::uint64_t
+{
+    return total_;
+}
+
+auto
+internal_term_facet_result::missing() const -> std::uint64_t
+{
+    return missing_;
+}
+
+auto
+internal_term_facet_result::other() const -> std::uint64_t
+{
+    return other_;
+}
+
+auto
+internal_term_facet_result::terms() const -> const std::vector<search_term_range>&
+{
+    return ranges_;
+}
+} // namespace couchbase

data/ext/couchbase/core/impl/internal_term_facet_result.hxx

@@ -0,0 +1,48 @@
+/* -*- 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.
+ */
+
+#pragma once
+
+#include "core/operations/document_search.hxx"
+
+#include <couchbase/search_meta_data.hxx>
+#include <couchbase/search_term_range.hxx>
+
+namespace couchbase
+{
+class internal_term_facet_result
+{
+  public:
+    explicit internal_term_facet_result(const core::operations::search_response::search_facet& facet);
+
+    [[nodiscard]] auto name() const -> const std::string&;
+    [[nodiscard]] auto field() const -> const std::string&;
+    [[nodiscard]] auto total() const -> std::uint64_t;
+    [[nodiscard]] auto missing() const -> std::uint64_t;
+    [[nodiscard]] auto other() const -> std::uint64_t;
+    [[nodiscard]] auto terms() const -> const std::vector<search_term_range>&;
+
+  private:
+    std::string name_;
+    std::string field_;
+    std::uint64_t total_{};
+    std::uint64_t missing_{};
+    std::uint64_t other_{};
+    std::vector<search_term_range> ranges_;
+};
+
+} // namespace couchbase

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

@@ -84,10 +84,8 @@ struct key_value_error_category : std::error_category {
                 return "cannot_revive_living_document (131)";
             case errc::key_value::xattr_no_access:
                 return "xattr_no_access (130)";
-            case errc::key_value::range_scan_cancelled:
-                return "range_scan_cancelled (132)";
-            case errc::key_value::range_scan_vb_uuid_not_equal:
-                return "range_scan_vb_uuid_not_equal (133)";
+            case errc::key_value::mutation_token_outdated:
+                return "mutation_token_outdated (133)";
             case errc::key_value::range_scan_completed:
                 return "range_scan_completed (134)";
         }

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

@@ -0,0 +1,98 @@
+/* -*- 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/key_value_error_context.hxx>
+
+#include <couchbase/fmt/cas.hxx>
+#include <couchbase/fmt/key_value_error_map_attribute.hxx>
+#include <couchbase/fmt/key_value_status_code.hxx>
+#include <couchbase/fmt/retry_reason.hxx>
+
+#include <tao/json/to_string.hpp>
+
+namespace couchbase
+{
+auto
+key_value_error_context::to_json() const -> std::string
+{
+    tao::json::value json = {
+        {
+          "ec",
+          tao::json::value{
+            { "value", ec().value() },
+            { "message", ec().message() },
+          },
+        },
+        { "operation_id", operation_id() },
+        { "id", id_ },
+        { "bucket", bucket_ },
+        { "scope", scope_ },
+        { "collection", collection_ },
+    };
+
+    if (auto val = retry_attempts(); val > 0) {
+        json["retry_attempts"] = val;
+    }
+    if (opaque_ > 0) {
+        json["opaque"] = opaque_;
+    }
+
+    if (!cas_.empty()) {
+        json["cas"] = fmt::format("{}", cas_);
+    }
+
+    if (const auto& reasons = retry_reasons(); !reasons.empty()) {
+        tao::json::value reasons_json = tao::json::empty_array;
+        for (const auto& reason : reasons) {
+            reasons_json.emplace_back(fmt::format("{}", reason));
+        }
+        json["retry_reasons"] = reasons_json;
+    }
+    if (const auto& val = last_dispatched_from(); val.has_value()) {
+        json["last_dispatched_from"] = val.value();
+    }
+    if (const auto& val = last_dispatched_to(); val.has_value()) {
+        json["last_dispatched_to"] = val.value();
+    }
+    if (const auto& val = status_code_; val.has_value()) {
+        json["status_code"] = fmt::format("{}", val.value());
+    }
+    if (const auto& val = extended_error_info_; val.has_value()) {
+        json["extended_error_info"] = tao::json::value{
+            { "context", val->context() },
+            { "reference", val->reference() },
+        };
+    }
+    if (const auto& val = error_map_info_; val.has_value()) {
+        tao::json::value info{
+            { "code", val->code() },
+            { "name", val->name() },
+            { "description", val->description() },
+        };
+        if (const auto& attributes = val->attributes(); !attributes.empty()) {
+            tao::json::value attrs_json = tao::json::empty_array;
+            for (const auto& attr : attributes) {
+                attrs_json.emplace_back(fmt::format("{}", attr));
+            }
+            info["attributes"] = attrs_json;
+        }
+        json["error_map_info"] = info;
+    }
+
+    return tao::json::to_string(json, 2);
+}
+} // namespace couchbase

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

@@ -60,6 +60,7 @@ initiate_lookup_in_operation(std::shared_ptr<couchbase::core::cluster> core,
                 std::move(entry.value),
                 entry.original_index,
                 entry.exists,
+                entry.ec,
               });
           }
           return handler(std::move(resp.ctx), lookup_in_result{ resp.cas, std::move(entries), resp.deleted });