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 wildcard field to be non-indexable.

Kishore Nallan549d1a7da3c5
diff --git a/include/field.h b/include/field.h
index 830b73d8..aad0bce8 100644
--- a/include/field.h
+++ b/include/field.h
@@ -244,9 +244,14 @@ struct field {
return Option<bool>(400, "Field `" + field.name + "` must be optional since it is marked as non-indexable.");
}
- if(!field.index && field.is_auto()) {
+ if(field.name == ".*" && !field.index) {
return Option<bool>(400, "Field `" + field.name + "` cannot be marked as non-indexable.");
}
+
+ if(!field.index && field.facet) {
+ return Option<bool>(400, "Field `" + field.name + "` cannot be a facet since "
+ "it's marked as non-indexable.");
+ }
}
if(!default_sorting_field.empty() && !found_default_sorting_field) {
diff --git a/test/collection_all_fields_test.cpp b/test/collection_all_fields_test.cpp
index d356037f..ea010c87 100644
--- a/test/collection_all_fields_test.cpp
+++ b/test/collection_all_fields_test.cpp
@@ -1131,7 +1131,7 @@ TEST_F(CollectionAllFieldsTest, DoNotIndexFieldMarkedAsNonIndex) {
std::vector<field> fields = {field("company_name", field_types::STRING, false),
field("num_employees", field_types::INT32, false),
field("post", field_types::STRING, false, true, false),
- field(".*_txt", field_types::STRING, true, true, false),
+ field(".*_txt", field_types::STRING, false, true, false),
field(".*", field_types::AUTO, false, true)};
coll1 = collectionManager.get_collection("coll1").get();
@@ -1199,16 +1199,37 @@ TEST_F(CollectionAllFieldsTest, DoNotIndexFieldMarkedAsNonIndex) {
ASSERT_FALSE(op.ok());
ASSERT_EQ("Field `.*_txt` must be an optional field.", op.error());
- // don't allow catch all field to contain non-index field
+ // don't allow catch all field to be non-indexable
fields = {field("company_name", field_types::STRING, false),
field("num_employees", field_types::INT32, false),
- field(".*_txt", field_types::STRING, true, true, false),
+ field(".*_txt", field_types::STRING, false, true, false),
field(".*", field_types::AUTO, false, true, false)};
op = collectionManager.create_collection("coll2", 1, fields, "", 0, field_types::AUTO);
ASSERT_FALSE(op.ok());
ASSERT_EQ("Field `.*` cannot be marked as non-indexable.", op.error());
+ // allow auto field to be non-indexable
+
+ fields = {field("company_name", field_types::STRING, false),
+ field("num_employees", field_types::INT32, false),
+ field("noidx_.*", field_types::AUTO, false, true, false)};
+
+ op = collectionManager.create_collection("coll3", 1, fields, "", 0, field_types::AUTO);
+ ASSERT_TRUE(op.ok());
+
+ // don't allow facet to be true when index is false
+ fields = {field("company_name", field_types::STRING, false),
+ field("num_employees", field_types::INT32, false),
+ field("facet_noindex", field_types::STRING, true, true, false)};
+
+ op = collectionManager.create_collection("coll4", 1, fields, "", 0, field_types::AUTO);
+ ASSERT_FALSE(op.ok());
+ ASSERT_EQ("Field `facet_noindex` cannot be a facet since it's marked as non-indexable.", op.error());
+
collectionManager.drop_collection("coll1");
+ collectionManager.drop_collection("coll2");
+ collectionManager.drop_collection("coll3");
+ collectionManager.drop_collection("coll4");
}