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 Nallan714f27667e68
diff --cc include/index.h
index db371561,66cf3365..fa2b5544
--- a/include/index.h
+++ b/include/index.h
@@@ -641,9 -663,10 +641,10 @@@ public
const size_t max_extra_suffix, const size_t facet_query_num_typos,
const bool filter_curated_hits, enable_t split_join_tokens,
const vector_query_t& vector_query, size_t facet_sample_percent, size_t facet_sample_threshold,
- const std::string& collection_name) const;
+ const std::string& collection_name, facet_index_type_t facet_index_type = DETECT) const;
- void remove_field(uint32_t seq_id, const nlohmann::json& document, const std::string& field_name);
+ void remove_field(uint32_t seq_id, const nlohmann::json& document, const std::string& field_name,
+ const bool is_update);
Option<uint32_t> remove(const uint32_t seq_id, const nlohmann::json & document,
const std::vector<field>& del_fields, const bool is_update);
diff --cc src/index.cpp
index 8d1cca3a,f46916b8..4330a8d9
--- a/src/index.cpp
+++ b/src/index.cpp
@@@ -3762,26 -4144,9 +3782,14 @@@ Option<bool> Index::search_across_field
int64_t scores[3] = {0};
int64_t match_score_index = -1;
- compute_sort_scores(sort_fields, sort_order, field_values, geopoint_indices, seq_id, filter_index,
- best_field_match_score, scores, match_score_index);
+ auto compute_sort_scores_op = compute_sort_scores(sort_fields, sort_order, field_values, geopoint_indices,
+ seq_id, references, filter_index, best_field_match_score,
+ scores, match_score_index, 0, collection_name);
+ if (!compute_sort_scores_op.ok()) {
+ status = Option<bool>(compute_sort_scores_op.code(), compute_sort_scores_op.error());
+ return;
+ }
- size_t query_len = query_tokens.size();
-
- // check if seq_id exists in any of the dropped_token iters and increment matching fields accordingly
- for(auto& dropped_token_it: dropped_token_its) {
- if(dropped_token_it.skip_to(seq_id) && dropped_token_it.id() == seq_id) {
- query_len++;
- }
- }
-
- if(syn_orig_num_tokens != -1) {
- query_len = syn_orig_num_tokens;
- }
query_len = std::min<size_t>(15, query_len);
// NOTE: `query_len` is total tokens matched across fields.