postgres/typesense
1
0
Fork 0
mirror of https://github.com/typesense/typesense.git synced 2025-05-23 23:30:42 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Handle missing field when dynamic filtering is used.

Browse Source
This commit is contained in:
Kishore Nallan 2021-10-13 11:14:58 +05:30
parent a8a8c60e0f
commit 0591fd508c
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/index.cpp
View File

@ -2658,7 +2658,13 @@ void Index::search_field(const uint8_t & field_id,
// NOTE: `query_tokens` preserve original tokens, while `search_tokens` could be a result of dropped tokens
size_t max_cost = (num_typos < 0 || num_typos > 2) ? 2 : num_typos;
auto& the_field = search_schema.at(field);
auto field_it = search_schema.find(field);
if(field_it == search_schema.end()) {
return;
}
auto& the_field = field_it->second;
if(the_field.locale != "" && the_field.locale != "en") {
// disable fuzzy trie traversal for non-english locales

48
test/collection_override_test.cpp
View File

@ -937,6 +937,54 @@ TEST_F(CollectionOverrideTest, DynamicFilteringExactMatchBasics) {
collectionManager.drop_collection("coll1");
}
TEST_F(CollectionOverrideTest, DynamicFilteringMissingField) {
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", "{categories}"}, // this field does NOT exist
{"match", override_t::MATCH_EXACT}
}
},
{"remove_matched_tokens", true},
{"filter_by", "category: {categories}"}
};
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());
ASSERT_EQ("0", results["hits"][0]["document"]["id"].get<std::string>());
collectionManager.drop_collection("coll1");
}
TEST_F(CollectionOverrideTest, DynamicFilteringMultiplePlaceholders) {
Collection* coll1;