searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-11-05 12:38:55 +01:00
Code Issues Releases Wiki Activity

Make sure that we don't iterate throught all string facet values

Browse Source
This commit is contained in:
Clément Renault 2021-01-27 14:41:36 +01:00
parent b52d500fbc
commit 2e00740515
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/search/facet/facet_distribution.rs
View File

@ -63,17 +63,18 @@ impl<'a> FacetDistribution<'a> {
) -> heed::Result<BTreeMap<FacetValue, u64>> ) -> heed::Result<BTreeMap<FacetValue, u64>>
{ {
if let Some(candidates) = self.candidates.as_ref() { if let Some(candidates) = self.candidates.as_ref() {
if candidates.len() <= CANDIDATES_THRESHOLD { if candidates.len() <= CANDIDATES_THRESHOLD || facet_type == FacetType::String {
let mut key_buffer = vec![field_id]; let mut key_buffer = vec![field_id];
match facet_type { match facet_type {
FacetType::String => { FacetType::String => {
let mut facet_values = BTreeMap::new(); let mut facet_values = BTreeMap::new();
for docid in candidates { for docid in candidates.into_iter().take(CANDIDATES_THRESHOLD as usize) {
key_buffer.truncate(1); key_buffer.truncate(1);
key_buffer.extend_from_slice(&docid.to_be_bytes()); key_buffer.extend_from_slice(&docid.to_be_bytes());
let iter = self.index.field_id_docid_facet_values let iter = self.index.field_id_docid_facet_values
.prefix_iter(self.rtxn, &key_buffer)? .prefix_iter(self.rtxn, &key_buffer)?
.remap_key_type::<FieldDocIdFacetStringCodec>(); .remap_key_type::<FieldDocIdFacetStringCodec>();
for result in iter { for result in iter {
let ((_, _, value), ()) = result?; let ((_, _, value), ()) = result?;
*facet_values.entry(FacetValue::from(value)).or_insert(0) += 1; *facet_values.entry(FacetValue::from(value)).or_insert(0) += 1;
@ -89,6 +90,7 @@ impl<'a> FacetDistribution<'a> {
let iter = self.index.field_id_docid_facet_values let iter = self.index.field_id_docid_facet_values
.prefix_iter(self.rtxn, &key_buffer)? .prefix_iter(self.rtxn, &key_buffer)?
.remap_key_type::<FieldDocIdFacetF64Codec>(); .remap_key_type::<FieldDocIdFacetF64Codec>();
for result in iter { for result in iter {
let ((_, _, value), ()) = result?; let ((_, _, value), ()) = result?;
*facet_values.entry(FacetValue::from(value)).or_insert(0) += 1; *facet_values.entry(FacetValue::from(value)).or_insert(0) += 1;
@ -104,6 +106,7 @@ impl<'a> FacetDistribution<'a> {
let iter = self.index.field_id_docid_facet_values let iter = self.index.field_id_docid_facet_values
.prefix_iter(self.rtxn, &key_buffer)? .prefix_iter(self.rtxn, &key_buffer)?
.remap_key_type::<FieldDocIdFacetI64Codec>(); .remap_key_type::<FieldDocIdFacetI64Codec>();
for result in iter { for result in iter {
let ((_, _, value), ()) = result?; let ((_, _, value), ()) = result?;
*facet_values.entry(FacetValue::from(value)).or_insert(0) += 1; *facet_values.entry(FacetValue::from(value)).or_insert(0) += 1;
@ -114,19 +117,13 @@ impl<'a> FacetDistribution<'a> {
} }
} else { } else {
let iter = match facet_type { let iter = match facet_type {
FacetType::String => { FacetType::String => unreachable!(),
let db = self.index.facet_field_id_value_docids;
let iter = db
.prefix_iter(self.rtxn, &[field_id])?
.remap_key_type::<FacetValueStringCodec>()
.map(|r| r.map(|((_, v), docids)| (FacetValue::from(v), docids)));
Box::new(iter) as Box::<dyn Iterator<Item=_>>
},
FacetType::Float => { FacetType::Float => {
let iter = FacetIter::<f64, FacetLevelValueF64Codec>::new_non_reducing( let iter = FacetIter::<f64, FacetLevelValueF64Codec>::new_non_reducing(
self.rtxn, self.index, field_id, candidates.clone(), self.rtxn, self.index, field_id, candidates.clone(),
)?; )?;
Box::new(iter.map(|r| r.map(|(v, docids)| (FacetValue::from(v), docids)))) let iter = iter.map(|r| r.map(|(v, docids)| (FacetValue::from(v), docids)));
Box::new(iter) as Box::<dyn Iterator<Item=_>>
}, },
FacetType::Integer => { FacetType::Integer => {
let iter = FacetIter::<i64, FacetLevelValueI64Codec>::new_non_reducing( let iter = FacetIter::<i64, FacetLevelValueI64Codec>::new_non_reducing(