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

Merge branch 'v0.25-join' into v0.26-facets

Kishore Nallan7a23770a47a2
diff --cc include/collection.h
index 9fc304fc,f9620c9b..33d97850
--- a/include/collection.h
+++ b/include/collection.h
@@@ -464,8 -464,9 +464,10 @@@ public
const size_t facet_sample_percent = 100,
const size_t facet_sample_threshold = 0,
const size_t page_offset = 0,
+ facet_index_type_t facet_index_type = HASH,
- const size_t vector_query_hits = 250) const;
+ const size_t vector_query_hits = 250,
+ const size_t remote_embedding_timeout_ms = 30000,
+ const size_t remote_embedding_num_try = 2) const;
Option<bool> get_filter_ids(const std::string & filter_query, filter_result_t& filter_result) const;
diff --cc src/collection.cpp
index 6d644b31,ba09c3ba..a2be1b06
--- a/src/collection.cpp
+++ b/src/collection.cpp
@@@ -1107,8 -1107,9 +1107,10 @@@ Option<nlohmann::json> Collection::sear
const size_t facet_sample_percent,
const size_t facet_sample_threshold,
const size_t page_offset,
+ facet_index_type_t facet_index_type,
- const size_t vector_query_hits) const {
+ const size_t vector_query_hits,
+ const size_t remote_embedding_timeout_ms,
+ const size_t remote_embedding_num_try) const {
std::shared_lock lock(mutex);
diff --cc src/collection_manager.cpp
index f8d32b4e,39217969..21a1d803
--- a/src/collection_manager.cpp
+++ b/src/collection_manager.cpp
@@@ -1062,7 -1081,10 +1081,11 @@@ Option<bool> CollectionManager::do_sear
match_type,
facet_sample_percent,
facet_sample_threshold,
- offset
+ offset,
++ HASH,
+ vector_query_hits,
+ remote_embedding_timeout_ms,
+ remote_embedding_num_try
);
uint64_t timeMillis = std::chrono::duration_cast<std::chrono::milliseconds>(