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
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Handle bad filter query in override.
Kishore Nallan47879ff35c94
diff --git a/include/field.h b/include/field.hindex c8ba94b0..0f39ef69 100644--- a/include/field.h+++ b/include/field.h@@ -516,8 +516,8 @@ struct filter_node_t {filter filter_exp;FILTER_OPERATOR filter_operator;bool isOperator;- filter_node_t* left;- filter_node_t* right;+ filter_node_t* left = nullptr;+ filter_node_t* right = nullptr;filter_node_t(filter filter_exp): filter_exp(std::move(filter_exp)),diff --git a/src/index.cpp b/src/index.cppindex fab2a644..dc42a305 100644--- a/src/index.cpp+++ b/src/index.cpp@@ -2041,7 +2041,7 @@ bool Index::static_filter_query_eval(const override_t* override,if ((override->rule.match == override_t::MATCH_EXACT && override->rule.query == query) ||(override->rule.match == override_t::MATCH_CONTAINS &&StringUtils::contains_word(query, override->rule.query))) {- filter_node_t* new_filter_tree_root;+ filter_node_t* new_filter_tree_root = nullptr;Option<bool> filter_op = filter::parse_filter_query(override->filter_by, search_schema,store, "", new_filter_tree_root);if (filter_op.ok()) {@@ -2196,7 +2196,7 @@ void Index::process_filter_overrides(const std::vector<const override_t*>& filtetoken_order, absorbed_tokens, filter_by_clause);if (resolved_override) {- filter_node_t* new_filter_tree_root;+ filter_node_t* new_filter_tree_root = nullptr;Option<bool> filter_op = filter::parse_filter_query(filter_by_clause, search_schema,store, "", new_filter_tree_root);if (filter_op.ok()) {diff --git a/test/collection_override_test.cpp b/test/collection_override_test.cppindex 21af3405..0d283c1c 100644--- a/test/collection_override_test.cpp+++ b/test/collection_override_test.cpp@@ -779,6 +779,35 @@ TEST_F(CollectionOverrideTest, IncludeOverrideWithFilterBy) {ASSERT_EQ(2, results["hits"].size());ASSERT_EQ("2", results["hits"][0]["document"]["id"].get<std::string>());ASSERT_EQ("0", results["hits"][1]["document"]["id"].get<std::string>());++ // when bad filter by clause is used in override+ override_json_include = {+ {"id", "include-rule-2"},+ {+ "rule", {+ {"query", "test"},+ {"match", override_t::MATCH_EXACT}+ }+ },+ {"filter_curated_hits", false},+ {"stop_processing", false},+ {"remove_matched_tokens", false},+ {"filter_by", "price >55"}+ };++ override_json_include["includes"] = nlohmann::json::array();+ override_json_include["includes"][0] = nlohmann::json::object();+ override_json_include["includes"][0]["id"] = "2";+ override_json_include["includes"][0]["position"] = 1;++ override_t override_include2;+ op = override_t::parse(override_json_include, "include-rule-2", override_include2);+ ASSERT_TRUE(op.ok());+ coll1->add_override(override_include2);++ results = coll1->search("random-name", {"name"}, "",+ {}, sort_fields, {2}, 10, 1, FREQUENCY, {true}, 0).get();+ ASSERT_EQ(0, results["hits"].size());}TEST_F(CollectionOverrideTest, ReplaceQuery) {@@ -1673,6 +1702,52 @@ TEST_F(CollectionOverrideTest, DynamicFilteringMissingField) {collectionManager.drop_collection("coll1");}+TEST_F(CollectionOverrideTest, DynamicFilteringBadFilterBy) {+ Collection *coll1;++ std::vector<field> fields = {field("name", field_types::STRING, false),+ field("category", field_types::STRING, true),+ field("points", field_types::INT32, false)};++ coll1 = collectionManager.get_collection("coll1").get();+ if(coll1 == nullptr) {+ coll1 = collectionManager.create_collection("coll1", 1, fields, "points").get();+ }++ nlohmann::json doc1;+ doc1["id"] = "0";+ doc1["name"] = "Amazing Shoes";+ doc1["category"] = "shoes";+ doc1["points"] = 3;++ ASSERT_TRUE(coll1->add(doc1.dump()).ok());++ std::vector<sort_by> sort_fields = { sort_by("_text_match", "DESC"), sort_by("points", "DESC") };++ nlohmann::json override_json = {+ {"id", "dynamic-cat-filter"},+ {+ "rule", {+ {"query", "{category}"}, // this field does NOT exist+ {"match", override_t::MATCH_EXACT}+ }+ },+ {"remove_matched_tokens", true},+ {"filter_by", "category: {category} && foo"}+ };++ override_t override;+ auto op = override_t::parse(override_json, "dynamic-cat-filter", override);+ ASSERT_TRUE(op.ok());+ coll1->add_override(override);++ auto results = coll1->search("shoes", {"name", "category"}, "",+ {}, sort_fields, {2, 2}, 10).get();++ ASSERT_EQ(1, results["hits"].size());+ collectionManager.drop_collection("coll1");+}+TEST_F(CollectionOverrideTest, DynamicFilteringMultiplePlaceholders) {Collection* coll1;