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

Support not like ! string comparator in filter_by. #1264

Browse Source
This commit is contained in:
Harpreet Sangar 2023-10-23 12:49:15 +05:30
parent 91209a17dc
commit 2e1335715e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/filter.cpp
View File

@ -607,13 +607,18 @@ Option<bool> toFilter(const std::string expression,
} else if (_field.is_string()) {
size_t filter_value_index = 0;
NUM_COMPARATOR str_comparator = CONTAINS;
auto apply_not_equals = false;
if (raw_value[0] == '=') {
// string filter should be evaluated in strict "equals" mode
str_comparator = EQUALS;
while (++filter_value_index < raw_value.size() && raw_value[filter_value_index] == ' ');
} else if (raw_value.size() >= 2 && raw_value[0] == '!' && raw_value[1] == '=') {
str_comparator = NOT_EQUALS;
filter_value_index++;
} else if (raw_value.size() >= 2 && raw_value[0] == '!') {
if (raw_value[1] == '=') {
str_comparator = NOT_EQUALS;
filter_value_index++;
}
apply_not_equals = true;
while (++filter_value_index < raw_value.size() && raw_value[filter_value_index] == ' ');
}
if (filter_value_index == raw_value.size()) {
@ -629,7 +634,7 @@ Option<bool> toFilter(const std::string expression,
filter_exp = {field_name, {raw_value.substr(filter_value_index)}, {str_comparator}};
}
filter_exp.apply_not_equals = (str_comparator == NOT_EQUALS);
filter_exp.apply_not_equals = apply_not_equals;
} else {
return Option<bool>(400, "Error with filter field `" + _field.name +
"`: Unidentified field data type, see docs for supported data types.");

8
test/collection_filtering_test.cpp
View File

@ -1466,6 +1466,14 @@ TEST_F(CollectionFilteringTest, NegationOperatorBasics) {
results = coll1->search("*", {"artist"}, "artist:!=Foobar", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10).get();
ASSERT_EQ(4, results["found"].get<size_t>());
results = coll1->search("*", {"artist"}, "artist:! Jackson", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10).get();
ASSERT_EQ(2, results["found"]);
ASSERT_EQ("2", results["hits"][0]["document"]["id"]);
ASSERT_EQ("0", results["hits"][1]["document"]["id"]);
results = coll1->search("*", {"artist"}, "artist:![Swift, Jackson]", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10).get();
ASSERT_EQ(0, results["found"]);
// empty value (bad filtering)
auto res_op = coll1->search("*", {"artist"}, "artist:!=", {}, {}, {0}, 10, 1, FREQUENCY, {true}, 10);
ASSERT_FALSE(res_op.ok());