snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Simplify the placeholder search of the facet-search route

Browse Source
This commit is contained in:
Clément Renault 2023-04-27 17:10:58 +02:00 committed by Louis Dureuil
parent f35ad96afa
commit 0252cfe8b6
No known key found for this signature in database
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
milli/src/search/mod.rs
View File

@ -298,7 +298,7 @@ impl<'a> SearchForFacetValues<'a> {
!self.search_query.index.exact_attributes_ids(rtxn)?.contains(&fid); !self.search_query.index.exact_attributes_ids(rtxn)?.contains(&fid);
if authorize_typos && field_authorizes_typos { if authorize_typos && field_authorizes_typos {
let mut result = vec![]; let mut results = vec![];
let exact_words_fst = self.search_query.index.exact_words(rtxn)?; let exact_words_fst = self.search_query.index.exact_words(rtxn)?;
if exact_words_fst.map_or(false, |fst| fst.contains(query)) { if exact_words_fst.map_or(false, |fst| fst.contains(query)) {
@ -309,7 +309,7 @@ impl<'a> SearchForFacetValues<'a> {
{ {
let count = search_candidates.intersection_len(&bitmap); let count = search_candidates.intersection_len(&bitmap);
if count != 0 { if count != 0 {
result.push(FacetValueHit { value: query.to_string(), count }); results.push(FacetValueHit { value: query.to_string(), count });
} }
} }
} else { } else {
@ -337,7 +337,7 @@ impl<'a> SearchForFacetValues<'a> {
}; };
let count = search_candidates.intersection_len(&docids); let count = search_candidates.intersection_len(&docids);
if count != 0 { if count != 0 {
result.push(FacetValueHit { value: value.to_string(), count }); results.push(FacetValueHit { value: value.to_string(), count });
length += 1; length += 1;
} }
if length >= MAX_NUMBER_OF_FACETS { if length >= MAX_NUMBER_OF_FACETS {
@ -346,11 +346,11 @@ impl<'a> SearchForFacetValues<'a> {
} }
} }
Ok(result) Ok(results)
} else { } else {
let automaton = StartsWith(Str::new(query)); let automaton = StartsWith(Str::new(query));
let mut stream = fst.search(automaton).into_stream(); let mut stream = fst.search(automaton).into_stream();
let mut result = vec![]; let mut results = vec![];
let mut length = 0; let mut length = 0;
while let Some(facet_value) = stream.next() { while let Some(facet_value) = stream.next() {
let value = std::str::from_utf8(facet_value)?; let value = std::str::from_utf8(facet_value)?;
@ -366,7 +366,7 @@ impl<'a> SearchForFacetValues<'a> {
}; };
let count = search_candidates.intersection_len(&docids); let count = search_candidates.intersection_len(&docids);
if count != 0 { if count != 0 {
result.push(FacetValueHit { value: value.to_string(), count }); results.push(FacetValueHit { value: value.to_string(), count });
length += 1; length += 1;
} }
if length >= MAX_NUMBER_OF_FACETS { if length >= MAX_NUMBER_OF_FACETS {
@ -374,34 +374,26 @@ impl<'a> SearchForFacetValues<'a> {
} }
} }
Ok(result) Ok(results)
} }
} }
None => { None => {
let mut stream = fst.stream(); let mut results = vec![];
let mut result = vec![];
let mut length = 0; let mut length = 0;
while let Some(facet_value) = stream.next() { let prefix = FacetGroupKey { field_id: fid, level: 0, left_bound: "" };
let value = std::str::from_utf8(facet_value)?; for result in index.facet_id_string_docids.prefix_iter(rtxn, &prefix)? {
let key = FacetGroupKey { field_id: fid, level: 0, left_bound: value }; let (FacetGroupKey { left_bound, .. }, FacetGroupValue { bitmap, .. }) =
let docids = match index.facet_id_string_docids.get(rtxn, &key)? { result?;
Some(FacetGroupValue { bitmap, .. }) => bitmap, let count = search_candidates.intersection_len(&bitmap);
None => {
error!("the facet value is missing from the facet database: {key:?}");
continue;
}
};
let count = search_candidates.intersection_len(&docids);
if count != 0 { if count != 0 {
result.push(FacetValueHit { value: value.to_string(), count }); results.push(FacetValueHit { value: left_bound.to_string(), count });
length += 1; length += 1;
} }
if length >= MAX_NUMBER_OF_FACETS { if length >= MAX_NUMBER_OF_FACETS {
break; break;
} }
} }
Ok(results)
Ok(result)
} }
} }
} }