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
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Allow wildcard with empty vector (for convenience).
Kishore Nallan8766d87e0b0f
diff --git a/src/collection.cpp b/src/collection.cppindex 4caac503..0ddd0bcf 100644--- a/src/collection.cpp+++ b/src/collection.cpp@@ -1071,7 +1071,7 @@ Option<nlohmann::json> Collection::search(std::string raw_query,const std::vector<std::string>& raw_search_fields,const std::string & filter_query, const std::vector<std::string>& facet_fields,const std::vector<sort_by> & sort_fields, const std::vector<uint32_t>& num_typos,- const size_t per_page, const size_t page,+ size_t per_page, const size_t page,token_ordering token_order, const std::vector<bool>& prefixes,const size_t drop_tokens_threshold,const spp::sparse_hash_set<std::string> & include_fields,@@ -1171,7 +1171,6 @@ Option<nlohmann::json> Collection::search(std::string raw_query,group_limit = 0;}-vector_query_t vector_query;if(!vector_query_str.empty()) {bool is_wildcard_query = (raw_query == "*" || raw_query.empty());@@ -1187,9 +1186,19 @@ Option<nlohmann::json> Collection::search(std::string raw_query,return Option<nlohmann::json>(400, "Field `" + vector_query.field_name + "` does not have a vector query index.");}- if(is_wildcard_query && vector_field_it.value().num_dim != vector_query.values.size()) {- return Option<nlohmann::json>(400, "Query field `" + vector_query.field_name + "` must have " +- std::to_string(vector_field_it.value().num_dim) + " dimensions.");+ if(is_wildcard_query) {+ if(vector_query.values.empty() && !vector_query.query_doc_given) {+ // for usability we will treat this as non-vector query+ vector_query.field_name.clear();+ if(vector_query.k != 0) {+ per_page = std::min(per_page, vector_query.k);+ }+ }++ else if(vector_field_it.value().num_dim != vector_query.values.size()) {+ return Option<nlohmann::json>(400, "Query field `" + vector_query.field_name + "` must have " ++ std::to_string(vector_field_it.value().num_dim) + " dimensions.");+ }}}diff --git a/src/vector_query_ops.cpp b/src/vector_query_ops.cppindex 66ec3a13..67443f2b 100644--- a/src/vector_query_ops.cpp+++ b/src/vector_query_ops.cpp@@ -158,10 +158,6 @@ Option<bool> VectorQueryOps::parse_vector_query_str(const std::string& vector_qu}}- if(is_wildcard_query && !vector_query.query_doc_given && vector_query.values.empty()) {- return Option<bool>(400, "When a vector query value is empty, an `id` parameter must be present.");- }-return Option<bool>(true);}}diff --git a/test/collection_vector_search_test.cpp b/test/collection_vector_search_test.cppindex c3a608ba..4eb84853 100644--- a/test/collection_vector_search_test.cpp+++ b/test/collection_vector_search_test.cpp@@ -1188,6 +1188,20 @@ TEST_F(CollectionVectorTest, HybridSearchWithExplicitVector) {ASSERT_EQ(1, search_res["found"].get<size_t>());ASSERT_EQ(1, search_res["hits"].size());+ // allow wildcard with empty vector (for convenience)+ search_res_op = coll->search("*", {"embedding"}, "", {}, {}, {0}, 20, 1, FREQUENCY, {true}, Index::DROP_TOKENS_THRESHOLD,+ spp::sparse_hash_set<std::string>(),+ spp::sparse_hash_set<std::string>(), 10, "", 30, 5,+ "", 10, {}, {}, {}, 0,+ "<mark>", "</mark>", {}, 1000, true, false, true, "", false, 6000 * 1000, 4, 7,+ fallback,+ 4, {off}, 32767, 32767, 2,+ false, true, vec_query);+ ASSERT_TRUE(search_res_op.ok());+ search_res = search_res_op.get();+ ASSERT_EQ(3, search_res["found"].get<size_t>());+ ASSERT_EQ(1, search_res["hits"].size());+// when no embedding field is passed, it should not be allowedsearch_res_op = coll->search("butter", {"name"}, "", {}, {}, {0}, 20, 1, FREQUENCY, {true}, Index::DROP_TOKENS_THRESHOLD,spp::sparse_hash_set<std::string>(),diff --git a/test/vector_query_ops_test.cpp b/test/vector_query_ops_test.cppindex 0a8b6b49..e2c81e71 100644--- a/test/vector_query_ops_test.cpp+++ b/test/vector_query_ops_test.cpp@@ -48,8 +48,7 @@ TEST_F(VectorQueryOpsTest, ParseVectorQueryString) {vector_query._reset();parsed = VectorQueryOps::parse_vector_query_str("vec:([], k: 10)", vector_query, true, nullptr);- ASSERT_FALSE(parsed.ok());- ASSERT_EQ("When a vector query value is empty, an `id` parameter must be present.", parsed.error());+ ASSERT_TRUE(parsed.ok());vector_query._reset();parsed = VectorQueryOps::parse_vector_query_str("vec:[0.34, 0.66, 0.12, 0.68], k: 10)", vector_query, false, nullptr);