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 wildcard search with filter_by returning `found: 1` in case of empty collection. (#1504)

Harpreet Sangar3ade1f789550
diff --git a/src/filter_result_iterator.cpp b/src/filter_result_iterator.cpp
index 44867fec..00d9800f 100644
--- a/src/filter_result_iterator.cpp
+++ b/src/filter_result_iterator.cpp
@@ -552,7 +552,7 @@ void apply_not_equals(uint32_t*&& all_ids,
void filter_result_iterator_t::get_string_filter_first_match(const bool& field_is_array) {
get_string_filter_next_match(field_is_array);
- if (filter_node->filter_exp.apply_not_equals) {
+ if (filter_node->filter_exp.apply_not_equals && index->seq_ids->num_ids() > 0) {
// filter didn't match any id. So by applying not equals, every id in the index is a match.
if (!validity) {
validity = valid;
diff --git a/src/index.cpp b/src/index.cpp
index 235f46b6..0ec2b553 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -6069,6 +6069,7 @@ Option<bool> Index::search_wildcard(filter_node_t const* const& filter_tree_root
std::chrono::high_resolution_clock::now() - beginF).count();
LOG(INFO) << "Time for raw scoring: " << timeMillisF;*/
+ filter_result_iterator->reset();
if (filter_result_iterator->validity == filter_result_iterator_t::timed_out) {
auto partial_result = new filter_result_t();
std::unique_ptr<filter_result_t> partial_result_guard(partial_result);
@@ -6078,8 +6079,7 @@ Option<bool> Index::search_wildcard(filter_node_t const* const& filter_tree_root
all_result_ids_len = partial_result->count;
all_result_ids = partial_result->docs;
partial_result->docs = nullptr;
- } else {
- filter_result_iterator->reset();
+ } else if (filter_result_iterator->validity == filter_result_iterator_t::valid) {
all_result_ids_len = filter_result_iterator->to_filter_id_array(all_result_ids);
search_cutoff = search_cutoff || filter_result_iterator->validity == filter_result_iterator_t::timed_out;
}
diff --git a/test/collection_test.cpp b/test/collection_test.cpp
index 72c434e2..cbe23257 100644
--- a/test/collection_test.cpp
+++ b/test/collection_test.cpp
@@ -589,6 +589,17 @@ TEST_F(CollectionTest, WildcardQuery) {
results_op = collection->search("the", {}, "", {}, sort_fields, {0}, 3, 1, FREQUENCY, {false});
ASSERT_FALSE(results_op.ok());
ASSERT_STREQ("No search fields specified for the query.", results_op.error().c_str());
+
+ Collection* empty_coll;
+ std::vector<field> fields = {field("title", field_types::STRING, false)};
+
+ empty_coll = collectionManager.get_collection("empty_coll").get();
+ if(empty_coll == nullptr) {
+ empty_coll = collectionManager.create_collection("empty_coll", 1, fields).get();
+ }
+ results = empty_coll->search("*", {}, "title:!= foo", {}, {}, {0}, 3, 1).get();
+ ASSERT_EQ(0, results["hits"].size());
+ ASSERT_EQ(0, results["found"]);
}
TEST_F(CollectionTest, PrefixSearching) {