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

Return error when trying to do infix search without enabling first.

Harpreet Sangarbfd251d1d9d1
diff --git a/include/index.h b/include/index.h
index ab09ff33..b9805daa 100644
--- a/include/index.h
+++ b/include/index.h
@@ -813,8 +813,8 @@ public:
const std::vector<size_t>& geopoint_indices,
const std::string& collection_name = "") const;
- void search_infix(const std::string& query, const std::string& field_name, std::vector<uint32_t>& ids,
- size_t max_extra_prefix, size_t max_extra_suffix) const;
+ Option<bool> search_infix(const std::string& query, const std::string& field_name, std::vector<uint32_t>& ids,
+ size_t max_extra_prefix, size_t max_extra_suffix) const;
void curate_filtered_ids(const std::set<uint32_t>& curated_ids,
const uint32_t* exclude_token_ids, size_t exclude_token_ids_size, uint32_t*& filter_ids,
diff --git a/src/index.cpp b/src/index.cpp
index f6b7da72..573c040c 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -2302,13 +2302,14 @@ bool Index::check_for_overrides(const token_ordering& token_order, const string&
return false;
}
-void Index::search_infix(const std::string& query, const std::string& field_name,
- std::vector<uint32_t>& ids, const size_t max_extra_prefix, const size_t max_extra_suffix) const {
+Option<bool> Index::search_infix(const std::string& query, const std::string& field_name, std::vector<uint32_t>& ids,
+ const size_t max_extra_prefix, const size_t max_extra_suffix) const {
auto infix_maps_it = infix_index.find(field_name);
if(infix_maps_it == infix_index.end()) {
- return ;
+ return Option<bool>(400, "Could not find `" + field_name + "` in the infix index. Make sure to enable infix "
+ "search by specifying `\"infix\": true` in the schema.");
}
auto infix_sets = infix_maps_it->second;
@@ -2377,6 +2378,8 @@ void Index::search_infix(const std::string& query, const std::string& field_name
for(auto leaf: leaves) {
posting_t::merge({leaf->values}, ids);
}
+
+ return Option<bool>(true);
}
Option<bool> Index::search(std::vector<query_tokens_t>& field_query_tokens, const std::vector<search_field_t>& the_fields,
@@ -5102,7 +5105,11 @@ Option<bool> Index::do_infix_search(const size_t num_search_fields, const std::v
if(field_infix == always || (field_infix == fallback && all_result_ids_len == 0)) {
std::vector<uint32_t> infix_ids;
filter_result_t filtered_infix_ids;
- search_infix(query_tokens[0].value, field_name, infix_ids, max_extra_prefix, max_extra_suffix);
+ auto search_infix_op = search_infix(query_tokens[0].value, field_name, infix_ids,
+ max_extra_prefix, max_extra_suffix);
+ if (!search_infix_op.ok()) {
+ return search_infix_op;
+ }
if(!infix_ids.empty()) {
gfx::timsort(infix_ids.begin(), infix_ids.end());
diff --git a/test/collection_infix_search_test.cpp b/test/collection_infix_search_test.cpp
index 24db24ac..c0937f32 100644
--- a/test/collection_infix_search_test.cpp
+++ b/test/collection_infix_search_test.cpp
@@ -37,7 +37,8 @@ protected:
TEST_F(CollectionInfixSearchTest, InfixBasics) {
std::vector<field> fields = {field("title", field_types::STRING, false, false, true, "", -1, 1),
- field("points", field_types::INT32, false),};
+ field("points", field_types::INT32, false),
+ field("non_infix", field_types::STRING, true)};
Collection* coll1 = collectionManager.create_collection("coll1", 1, fields, "points").get();
@@ -45,8 +46,19 @@ TEST_F(CollectionInfixSearchTest, InfixBasics) {
doc["id"] = "0";
doc["title"] = "GH100037IN8900X";
doc["points"] = 100;
+ doc["non_infix"] = "foobar";
ASSERT_TRUE(coll1->add(doc.dump()).ok());
+ auto response = coll1->search("bar",
+ {"non_infix"}, "", {}, {}, {0}, 3, 1, FREQUENCY, {true}, 5,
+ spp::sparse_hash_set<std::string>(),
+ spp::sparse_hash_set<std::string>(), 10, "", 30, 4, "title", 20, {}, {}, {}, 0,
+ "<mark>", "</mark>", {}, 1000, true, false, true, "", false, 6000 * 1000, 4, 7, fallback,
+ 4, {always});
+ ASSERT_FALSE(response.ok());
+ ASSERT_EQ("Could not find `non_infix` in the infix index."
+ " Make sure to enable infix search by specifying `\"infix\": true` in the schema.", response.error());
+
auto results = coll1->search("100037",
{"title"}, "", {}, {}, {0}, 3, 1, FREQUENCY, {true}, 5,
spp::sparse_hash_set<std::string>(),