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 merge errors.

Harpreet Sangarb02e689c6d8c
diff --git a/src/filter.cpp b/src/filter.cpp
index 5d94c66c..10354ea0 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -737,16 +737,16 @@ Option<bool> filter::parse_filter_query(const std::string& filter_query,
return tokenize_op;
}
- if (tokens.size() > 100) {
- return Option<bool>(400, "Filter expression is not valid.");
- }
-
std::queue<std::string> postfix;
Option<bool> toPostfix_op = toPostfix(tokens, postfix);
if (!toPostfix_op.ok()) {
return toPostfix_op;
}
+ if (postfix.size() > 100) {
+ return Option<bool>(400, "`filter_by` has too many operations.");
+ }
+
Option<bool> toParseTree_op = toParseTree(postfix,
root,
search_schema,
diff --git a/src/filter_result_iterator.cpp b/src/filter_result_iterator.cpp
index 08933c70..a85721bb 100644
--- a/src/filter_result_iterator.cpp
+++ b/src/filter_result_iterator.cpp
@@ -1026,6 +1026,9 @@ void filter_result_iterator_t::init() {
std::vector<std::string> str_tokens;
while (tokenizer.next(str_token, token_index)) {
+ if (str_token.size() > 100) {
+ str_token.erase(100);
+ }
str_tokens.push_back(str_token);
art_leaf* leaf = (art_leaf *) art_search(t, (const unsigned char*) str_token.c_str(),
diff --git a/test/collection_filtering_test.cpp b/test/collection_filtering_test.cpp
index 159989c9..e33af8bc 100644
--- a/test/collection_filtering_test.cpp
+++ b/test/collection_filtering_test.cpp
@@ -2144,6 +2144,7 @@ TEST_F(CollectionFilteringTest, ComplexFilterQuery) {
auto search_op = coll->search("Jeremy", {"name"}, extreme_filter,
{}, sort_fields_desc, {0}, 10, 1, FREQUENCY, {false});
+ LOG(INFO) << search_op.error();
ASSERT_TRUE(search_op.ok());
ASSERT_EQ(1, search_op.get()["hits"].size());