tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename mgcxx namespace and fix Rust → C++ string handling

Browse Source
This commit is contained in:
Ante Pušić 2024-01-18 17:38:33 +01:00
parent c60b66fde7
commit e16c4a0208
3 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/storage/v2/indices/text_index.cpp
View File

@ -18,7 +18,7 @@
namespace memgraph::storage { namespace memgraph::storage {
void TextIndex::AddNode(Vertex *vertex_after_update, Storage *storage, void TextIndex::AddNode(Vertex *vertex_after_update, Storage *storage,
const std::vector<memcxx::text_search::Context *> &applicable_text_indices) { const std::vector<mgcxx::text_search::Context *> &applicable_text_indices) {
// NOTE: Text indexes are presently all-property indices. If we allow text indexes restricted to specific properties, // NOTE: Text indexes are presently all-property indices. If we allow text indexes restricted to specific properties,
// an indexable document should be created for each applicable index. // an indexable document should be created for each applicable index.
nlohmann::json document = {}; nlohmann::json document = {};
@ -36,7 +36,7 @@ void TextIndex::AddNode(Vertex *vertex_after_update, Storage *storage,
document["metadata"]["is_node"] = true; document["metadata"]["is_node"] = true;
for (auto *index_context : applicable_text_indices) { for (auto *index_context : applicable_text_indices) {
memcxx::text_search::add(*index_context, memcxx::text_search::DocumentInput{.data = document.dump()}, false); mgcxx::text_search::add_document(*index_context, mgcxx::text_search::DocumentInput{.data = document.dump()}, false);
} }
} }
@ -64,12 +64,12 @@ void TextIndex::UpdateNode(Vertex *vertex_after_update, Storage *storage, const
} }
void TextIndex::RemoveNode(Vertex *vertex_after_update, void TextIndex::RemoveNode(Vertex *vertex_after_update,
const std::vector<memcxx::text_search::Context *> &applicable_text_indices) { const std::vector<mgcxx::text_search::Context *> &applicable_text_indices) {
auto search_node_to_be_deleted = memcxx::text_search::SearchInput{ auto search_node_to_be_deleted =
.search_query = fmt::format("metadata.gid:{}", vertex_after_update->gid.AsInt())}; mgcxx::text_search::SearchInput{.search_query = fmt::format("metadata.gid:{}", vertex_after_update->gid.AsInt())};
for (auto *index_context : applicable_text_indices) { for (auto *index_context : applicable_text_indices) {
memcxx::text_search::delete_document(*index_context, search_node_to_be_deleted, false); mgcxx::text_search::delete_document(*index_context, search_node_to_be_deleted, false);
} }
} }
@ -98,8 +98,8 @@ void TextIndex::UpdateOnSetProperty(Vertex *vertex_after_update, Storage *storag
UpdateNode(vertex_after_update, storage); UpdateNode(vertex_after_update, storage);
} }
std::vector<memcxx::text_search::Context *> TextIndex::GetApplicableTextIndices(const std::vector<LabelId> &labels) { std::vector<mgcxx::text_search::Context *> TextIndex::GetApplicableTextIndices(const std::vector<LabelId> &labels) {
std::vector<memcxx::text_search::Context *> applicable_text_indices; std::vector<mgcxx::text_search::Context *> applicable_text_indices;
for (const auto &label : labels) { for (const auto &label : labels) {
if (label_to_index_.contains(label)) { if (label_to_index_.contains(label)) {
applicable_text_indices.push_back(&index_.at(label_to_index_.at(label))); applicable_text_indices.push_back(&index_.at(label_to_index_.at(label)));
@ -108,8 +108,8 @@ std::vector<memcxx::text_search::Context *> TextIndex::GetApplicableTextIndices(
return applicable_text_indices; return applicable_text_indices;
} }
std::vector<memcxx::text_search::Context *> TextIndex::GetApplicableTextIndices(Vertex *vertex) { std::vector<mgcxx::text_search::Context *> TextIndex::GetApplicableTextIndices(Vertex *vertex) {
std::vector<memcxx::text_search::Context *> applicable_text_indices; std::vector<mgcxx::text_search::Context *> applicable_text_indices;
for (const auto &label : vertex->labels) { for (const auto &label : vertex->labels) {
if (label_to_index_.contains(label)) { if (label_to_index_.contains(label)) {
applicable_text_indices.push_back(&index_.at(label_to_index_.at(label))); applicable_text_indices.push_back(&index_.at(label_to_index_.at(label)));
@ -124,8 +124,8 @@ bool TextIndex::CreateIndex(std::string index_name, LabelId label, memgraph::que
mappings["properties"]["metadata"] = {{"type", "json"}, {"fast", true}, {"stored", true}, {"text", true}}; mappings["properties"]["metadata"] = {{"type", "json"}, {"fast", true}, {"stored", true}, {"text", true}};
mappings["properties"]["data"] = {{"type", "json"}, {"fast", true}, {"stored", true}, {"text", true}}; mappings["properties"]["data"] = {{"type", "json"}, {"fast", true}, {"stored", true}, {"text", true}};
index_.emplace(index_name, memcxx::text_search::create_index( index_.emplace(index_name, mgcxx::text_search::create_index(
index_name, memcxx::text_search::IndexConfig{.mappings = mappings.dump()})); index_name, mgcxx::text_search::IndexConfig{.mappings = mappings.dump()}));
label_to_index_.emplace(label, index_name); label_to_index_.emplace(label, index_name);
bool has_schema = false; bool has_schema = false;
@ -157,13 +157,14 @@ bool TextIndex::CreateIndex(std::string index_name, LabelId label, memgraph::que
document["metadata"]["deleted"] = false; document["metadata"]["deleted"] = false;
document["metadata"]["is_node"] = true; document["metadata"]["is_node"] = true;
memcxx::text_search::add(index_.at(index_name), memcxx::text_search::DocumentInput{.data = document.dump()}, false); mgcxx::text_search::add_document(index_.at(index_name), mgcxx::text_search::DocumentInput{.data = document.dump()},
false);
} }
return true; return true;
} }
bool TextIndex::DropIndex(std::string index_name) { bool TextIndex::DropIndex(std::string index_name) {
memcxx::text_search::drop_index(index_name); mgcxx::text_search::drop_index(index_name);
index_.erase(index_name); index_.erase(index_name);
std::erase_if(label_to_index_, [index_name](const auto &item) { return item.second == index_name; }); std::erase_if(label_to_index_, [index_name](const auto &item) { return item.second == index_name; });
return true; return true;
@ -172,15 +173,22 @@ bool TextIndex::DropIndex(std::string index_name) {
bool TextIndex::IndexExists(std::string index_name) const { return index_.contains(index_name); } bool TextIndex::IndexExists(std::string index_name) const { return index_.contains(index_name); }
std::vector<Gid> TextIndex::Search(std::string index_name, std::string search_query) { std::vector<Gid> TextIndex::Search(std::string index_name, std::string search_query) {
auto input = memcxx::text_search::SearchInput{.search_query = search_query, .return_fields = {"metadata"}}; auto input = mgcxx::text_search::SearchInput{.search_query = search_query, .return_fields = {"metadata"}};
// Basic check for search fields in the query (Tantivy syntax delimits them with a `:` to the right) // Basic check for search fields in the query (Tantivy syntax delimits them with a `:` to the right)
if (search_query.find(":") == std::string::npos) { if (search_query.find(":") == std::string::npos) {
input.search_fields = {"data"}; input.search_fields = {"data"};
} }
std::vector<Gid> found_nodes; std::vector<Gid> found_nodes;
for (const auto &doc : memcxx::text_search::search(index_.at(index_name), input).docs) { auto search_results = mgcxx::text_search::search(index_.at(index_name), input);
found_nodes.push_back(storage::Gid::FromString(nlohmann::json::parse(doc.data.data())["metadata"]["gid"].dump())); auto docs = search_results.docs;
for (const auto &doc : docs) {
auto doc_data = doc.data;
std::string doc_string = doc_data.data();
auto doc_len = doc_data.length();
doc_string.resize(doc_len);
auto doc_json = nlohmann::json::parse(doc_string);
found_nodes.push_back(storage::Gid::FromString(doc_json["metadata"]["gid"].dump()));
} }
return found_nodes; return found_nodes;
} }

10
src/storage/v2/indices/text_index.hpp
View File

@ -27,11 +27,11 @@ class Storage;
class TextIndex { class TextIndex {
private: private:
void AddNode(Vertex *vertex, Storage *storage, void AddNode(Vertex *vertex, Storage *storage,
const std::vector<memcxx::text_search::Context *> &applicable_text_indices); const std::vector<mgcxx::text_search::Context *> &applicable_text_indices);
std::vector<memcxx::text_search::Context *> GetApplicableTextIndices(const std::vector<LabelId> &labels); std::vector<mgcxx::text_search::Context *> GetApplicableTextIndices(const std::vector<LabelId> &labels);
void RemoveNode(Vertex *vertex, const std::vector<memcxx::text_search::Context *> &applicable_text_indices); void RemoveNode(Vertex *vertex, const std::vector<mgcxx::text_search::Context *> &applicable_text_indices);
public: public:
TextIndex() = default; TextIndex() = default;
@ -43,7 +43,7 @@ class TextIndex {
~TextIndex() = default; ~TextIndex() = default;
std::map<std::string, memcxx::text_search::Context> index_; std::map<std::string, mgcxx::text_search::Context> index_;
std::map<LabelId, std::string> label_to_index_; std::map<LabelId, std::string> label_to_index_;
void AddNode(Vertex *vertex, Storage *storage); void AddNode(Vertex *vertex, Storage *storage);
@ -60,7 +60,7 @@ class TextIndex {
void UpdateOnSetProperty(Vertex *vertex_after_update, Storage *storage, const Transaction &tx); void UpdateOnSetProperty(Vertex *vertex_after_update, Storage *storage, const Transaction &tx);
std::vector<memcxx::text_search::Context *> GetApplicableTextIndices(Vertex *vertex); std::vector<mgcxx::text_search::Context *> GetApplicableTextIndices(Vertex *vertex);
bool CreateIndex(std::string index_name, LabelId label, memgraph::query::DbAccessor *db); bool CreateIndex(std::string index_name, LabelId label, memgraph::query::DbAccessor *db);

28
src/storage/v2/vertex_accessor.cpp
View File

@ -292,15 +292,15 @@ Result<PropertyValue> VertexAccessor::SetProperty(PropertyId property, const Pro
// if (flags::run_time::GetTextSearchEnabled() && update_text_index) { // if (flags::run_time::GetTextSearchEnabled() && update_text_index) {
// for (auto *index_context : storage_->indices_.text_index_->GetApplicableTextIndices(vertex_)) { // for (auto *index_context : storage_->indices_.text_index_->GetApplicableTextIndices(vertex_)) {
// auto search_input = memcxx::text_search::SearchInput{ // auto search_input = mgcxx::text_search::SearchInput{
// .search_query = fmt::format("metadata.gid:{}", vertex_->gid.AsInt()), .return_fields = {"data"}}; // .search_query = fmt::format("metadata.gid:{}", vertex_->gid.AsInt()), .return_fields = {"data"}};
// auto search_result = memcxx::text_search::search(*index_context, search_input); // auto search_result = mgcxx::text_search::search(*index_context, search_input);
// memcxx::text_search::delete_document(*index_context, search_input, true); // mgcxx::text_search::delete_document(*index_context, search_input, true);
// auto new_properties = search_result.docs[0].data; // TODO (pending real Tantivy results): parse result to // auto new_properties = search_result.docs[0].data; // TODO (pending real Tantivy results): parse result to
// // JSON, set property and convert back to string // // JSON, set property and convert back to string
// auto new_properties_document = memcxx::text_search::DocumentInput{.data = new_properties}; // auto new_properties_document = mgcxx::text_search::DocumentInput{.data = new_properties};
// memcxx::text_search::add(*index_context, new_properties_document, true); // mgcxx::text_search::add_document(*index_context, new_properties_document, true);
// } // }
// } // }
@ -343,9 +343,9 @@ Result<bool> VertexAccessor::InitProperties(const std::map<storage::PropertyId,
// if (flags::run_time::GetTextSearchEnabled() && update_text_index) { // if (flags::run_time::GetTextSearchEnabled() && update_text_index) {
// for (auto *index_context : storage_->indices_.text_index_->GetApplicableTextIndices(vertex_)) { // for (auto *index_context : storage_->indices_.text_index_->GetApplicableTextIndices(vertex_)) {
// auto new_properties_document = // auto new_properties_document =
// memcxx::text_search::DocumentInput{}; // TODO (pending real Tantivy operation): create a JSON, set // mgcxx::text_search::DocumentInput{}; // TODO (pending real Tantivy operation): create a JSON, set
// // properties and convert to string // // properties and convert to string
// memcxx::text_search::add(*index_context, new_properties_document, true); // mgcxx::text_search::add_document(*index_context, new_properties_document, true);
// } // }
// } // }
@ -372,15 +372,15 @@ Result<std::vector<std::tuple<PropertyId, PropertyValue, PropertyValue>>> Vertex
id_old_new_change.emplace(vertex->properties.UpdateProperties(properties)); id_old_new_change.emplace(vertex->properties.UpdateProperties(properties));
// if (flags::run_time::GetTextSearchEnabled()) { // if (flags::run_time::GetTextSearchEnabled()) {
// for (auto *index_context : storage->indices_.text_index_->GetApplicableTextIndices(vertex)) { // for (auto *index_context : storage->indices_.text_index_->GetApplicableTextIndices(vertex)) {
// auto search_input = memcxx::text_search::SearchInput{ // auto search_input = mgcxx::text_search::SearchInput{
// .search_query = fmt::format("metadata.gid:{}", vertex->gid.AsInt()), .return_fields = {"data"}}; // .search_query = fmt::format("metadata.gid:{}", vertex->gid.AsInt()), .return_fields = {"data"}};
// auto search_result = memcxx::text_search::search(*index_context, search_input); // auto search_result = mgcxx::text_search::search(*index_context, search_input);
// memcxx::text_search::delete_document(*index_context, search_input, true); // mgcxx::text_search::delete_document(*index_context, search_input, true);
// auto new_properties = search_result.docs[0].data; // TODO (pending real Tantivy results): parse result to // auto new_properties = search_result.docs[0].data; // TODO (pending real Tantivy results): parse result to
// // JSON, set property and convert back to string // // JSON, set property and convert back to string
// auto new_properties_document = memcxx::text_search::DocumentInput{.data = new_properties}; // auto new_properties_document = mgcxx::text_search::DocumentInput{.data = new_properties};
// memcxx::text_search::add(*index_context, new_properties_document, true); // mgcxx::text_search::add_document(*index_context, new_properties_document, true);
// } // }
// } // }
@ -433,9 +433,9 @@ Result<std::map<PropertyId, PropertyValue>> VertexAccessor::ClearProperties(bool
// if (flags::run_time::GetTextSearchEnabled()) { // if (flags::run_time::GetTextSearchEnabled()) {
// for (auto *index_context : storage->indices_.text_index_->GetApplicableTextIndices(vertex)) { // for (auto *index_context : storage->indices_.text_index_->GetApplicableTextIndices(vertex)) {
// auto search_input = // auto search_input =
// memcxx::text_search::SearchInput{.search_query = fmt::format("metadata.gid:{}", // mgcxx::text_search::SearchInput{.search_query = fmt::format("metadata.gid:{}",
// vertex->gid.AsInt())}; // vertex->gid.AsInt())};
// memcxx::text_search::delete_document(*index_context, search_input, true); // mgcxx::text_search::delete_document(*index_context, search_input, true);
// } // }
// } // }
}}; }};