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

Allow partial matches with wildcard `facet_by`.

Harpreet Sangar0b965f9e328e
diff --git a/src/collection.cpp b/src/collection.cpp
index 34889ef4..14b9bc5d 100644
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@ -4312,9 +4312,6 @@ Option<bool> Collection::parse_facet(const std::string& facet_field, std::vector
if (field->facet) {
facets.emplace_back(facet(field->name));
facets.back().is_wildcard_match = true;
- } else {
- std::string error = "Field `" + field->name + "` is not marked as a facet in the schema.";
- return Option<bool>(404, error);
}
}
} else {
diff --git a/test/collection_faceting_test.cpp b/test/collection_faceting_test.cpp
index 09b31387..8c04fcfa 100644
--- a/test/collection_faceting_test.cpp
+++ b/test/collection_faceting_test.cpp
@@ -346,14 +346,14 @@ TEST_F(CollectionFacetingTest, FacetCounts) {
ASSERT_FALSE(res_op.ok());
ASSERT_STREQ("Could not find a facet field for `foo*` in the schema.", res_op.error().c_str());
- // known filed but not a facet
- res_op = coll_array_fields->search("*", query_fields, "", {"nam*"}, sort_fields, {0}, 10, 1, FREQUENCY,
+ // Wildcard facet_by can have partial matches
+ results = coll_array_fields->search("*", query_fields, "", {"nam*"}, sort_fields, {0}, 10, 1, FREQUENCY,
{false}, Index::DROP_TOKENS_THRESHOLD,
spp::sparse_hash_set<std::string>(),
- spp::sparse_hash_set<std::string>(), 10);
-
- ASSERT_FALSE(res_op.ok());
- ASSERT_STREQ("Field `name` is not marked as a facet in the schema.", res_op.error().c_str());
+ spp::sparse_hash_set<std::string>(), 10).get();
+ ASSERT_EQ(5, results["hits"].size());
+ ASSERT_EQ(1, results["facet_counts"].size());
+ ASSERT_EQ("name_facet", results["facet_counts"][0]["field_name"].get<std::string>());
// when facet query is given but no facet fields are specified, must return an error message
res_op = coll_array_fields->search("*", query_fields, "", {}, sort_fields, {0}, 10, 1, FREQUENCY,
@@ -1074,17 +1074,12 @@ TEST_F(CollectionFacetingTest, FacetParseTest){
coll1->parse_facet(facet_field, wildcard_facets);
}
- std::vector<std::string> wildcard_facet_names(3);
- std::transform(wildcard_facets.begin(), wildcard_facets.end(), wildcard_facet_names.begin(), [] (const facet& f) {
- return f.field_name;
- });
- std::sort(wildcard_facet_names.begin(), wildcard_facet_names.end());
-
- ASSERT_EQ(3, wildcard_facet_names.size());
+ ASSERT_EQ(3, wildcard_facets.size());
- ASSERT_EQ("range", wildcard_facet_names[0]);
- ASSERT_EQ("rank", wildcard_facet_names[1]);
- ASSERT_EQ("score", wildcard_facet_names[2]);
+ std::set<std::string> expected{"range", "rank", "score"};
+ for (size_t i = 0; i < wildcard_facets.size(); i++) {
+ ASSERT_TRUE(expected.count(wildcard_facets[i].field_name) == 1);
+ }
wildcard_facets.clear();
coll1->parse_facet("*", wildcard_facets);
@@ -1092,21 +1087,13 @@ TEST_F(CollectionFacetingTest, FacetParseTest){
// Last field is not a facet.
ASSERT_EQ(fields.size() - 1, wildcard_facets.size());
- std::vector<std::string> expected;
- expected.resize(fields.size() - 1);
- std::transform(fields.begin(), fields.end() - 1, expected.begin(), [] (const field& f) -> string {
- return f.name;
- });
- std::sort(expected.begin(), expected.end());
+ expected.clear();
+ for (size_t i = 0; i < fields.size() - 1; i++) {
+ expected.insert(fields[i].name);
+ }
- std::vector<std::string> result;
- result.resize(wildcard_facets.size());
- std::transform(wildcard_facets.begin(), wildcard_facets.end(), result.begin(), [] (const facet& f) -> string {
- return f.field_name;
- });
- std::sort(result.begin(), result.end());
for (size_t i = 0; i < wildcard_facets.size(); i++) {
- ASSERT_EQ(expected[i], result[i]);
+ ASSERT_TRUE(expected.count(wildcard_facets[i].field_name) == 1);
}
std::vector<std::string> mixed_facet_fields {