Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Fix memory leaks: * Handle deletion of `filter_tree_root` in `sort_fields_guard_t`. * Handle `filter_tree_root` being updated in `Index::static_filter_query_eval`. * Handle deletion of `phrase_result_ids` in `Index::search`.

Harpreet Sangar6acc7d8557d6
diff --git a/include/field.h b/include/field.h
index e2f9729f..cbd62af2 100644
--- a/include/field.h
+++ b/include/field.h
@@ -555,7 +555,7 @@ struct sort_by {
};
struct eval_t {
- filter_node_t* filter_tree_root;
+ filter_node_t* filter_tree_root = nullptr;
uint32_t* ids = nullptr;
uint32_t size = 0;
};
diff --git a/include/index.h b/include/index.h
index 7f54e094..386490cd 100644
--- a/include/index.h
+++ b/include/index.h
@@ -642,7 +642,7 @@ public:
Option<bool> search(std::vector<query_tokens_t>& field_query_tokens, const std::vector<search_field_t>& the_fields,
const text_match_type_t match_type,
- filter_node_t* filter_tree_root, std::vector<facet>& facets, facet_query_t& facet_query,
+ filter_node_t*& filter_tree_root, std::vector<facet>& facets, facet_query_t& facet_query,
const std::vector<std::pair<uint32_t, uint32_t>>& included_ids,
const std::vector<uint32_t>& excluded_ids, std::vector<sort_by>& sort_fields_std,
const std::vector<uint32_t>& num_typos, Topster* topster, Topster* curated_topster,
diff --git a/src/collection.cpp b/src/collection.cpp
index 21f2d187..f62a1753 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -28,6 +28,8 @@ struct sort_fields_guard_t {
~sort_fields_guard_t() {
for(auto& sort_by_clause: sort_fields_std) {
+ delete sort_by_clause.eval.filter_tree_root;
+
if(sort_by_clause.eval.ids) {
delete [] sort_by_clause.eval.ids;
sort_by_clause.eval.ids = nullptr;
@@ -1542,6 +1544,11 @@ Option<nlohmann::json> Collection::search(std::string raw_query,
std::unique_ptr<search_args> search_params_guard(search_params);
auto search_op = index->run_search(search_params, name);
+
+ // filter_tree_root might be updated in Index::static_filter_query_eval.
+ filter_tree_root_guard.release();
+ filter_tree_root_guard.reset(filter_tree_root);
+
if (!search_op.ok()) {
return Option<nlohmann::json>(search_op.code(), search_op.error());
}
diff --git a/src/index.cpp b/src/index.cpp
index 4fb91d9b..f5c5ae40 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -2348,7 +2348,7 @@ bool Index::static_filter_query_eval(const override_t* override,
if (filter_tree_root == nullptr) {
filter_tree_root = new_filter_tree_root;
} else {
- filter_node_t* root = new filter_node_t(AND, filter_tree_root,
+ auto root = new filter_node_t(AND, filter_tree_root,
new_filter_tree_root);
filter_tree_root = root;
}
@@ -2711,7 +2711,7 @@ void Index::search_infix(const std::string& query, const std::string& field_name
Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, const std::vector<search_field_t>& the_fields,
const text_match_type_t match_type,
- filter_node_t* filter_tree_root, std::vector<facet>& facets, facet_query_t& facet_query,
+ filter_node_t*& filter_tree_root, std::vector<facet>& facets, facet_query_t& facet_query,
const std::vector<std::pair<uint32_t, uint32_t>>& included_ids,
const std::vector<uint32_t>& excluded_ids, std::vector<sort_by>& sort_fields_std,
const std::vector<uint32_t>& num_typos, Topster* topster, Topster* curated_topster,
@@ -2797,6 +2797,8 @@ Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, cons
// handle phrase searches
uint32_t* phrase_result_ids = nullptr;
uint32_t phrase_result_count = 0;
+ std::unique_ptr<uint32_t> phrase_result_ids_guard;
+
if (!field_query_tokens[0].q_phrases.empty()) {
do_phrase_search(num_search_fields, the_fields, field_query_tokens,
sort_fields_std, searched_queries, group_limit, group_by_fields,
@@ -2805,6 +2807,9 @@ Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, cons
excluded_result_ids, excluded_result_ids_size, excluded_group_ids, curated_topster,
included_ids_map, is_wildcard_query,
phrase_result_ids, phrase_result_count);
+
+ phrase_result_ids_guard.reset(phrase_result_ids);
+
if (phrase_result_count == 0) {
goto process_search_results;
}