snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 20:15:07 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert "Reduce the universe while exploring the facet tree" because it's slower this way

Browse Source 
This reverts commit 14026115f21409535772ede0ee4273f37848dd61.
This commit is contained in:
Clément Renault 2024-06-05 21:58:40 -04:00
parent 5432776132
commit 52d0d35b39
No known key found for this signature in database
GPG Key ID: F250A4C4E3AE5F5F
1 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
milli/src/search/facet/facet_range_search.rs
View File

@ -50,7 +50,7 @@ where
Bound::Unbounded => Bound::Unbounded, Bound::Unbounded => Bound::Unbounded,
}; };
let db = db.remap_types::<FacetGroupKeyCodec<BytesRefCodec>, FacetGroupLazyValueCodec>(); let db = db.remap_types::<FacetGroupKeyCodec<BytesRefCodec>, FacetGroupLazyValueCodec>();
let mut f = FacetRangeSearch { rtxn, db, field_id, left, right, docids }; let mut f = FacetRangeSearch { rtxn, db, field_id, left, right, universe, docids };
let highest_level = get_highest_level(rtxn, db, field_id)?; let highest_level = get_highest_level(rtxn, db, field_id)?;
if let Some(starting_left_bound) = if let Some(starting_left_bound) =
@ -59,7 +59,7 @@ where
let rightmost_bound = let rightmost_bound =
Bound::Included(get_last_facet_value::<BytesRefCodec, _>(rtxn, db, field_id)?.unwrap()); // will not fail because get_first_facet_value succeeded Bound::Included(get_last_facet_value::<BytesRefCodec, _>(rtxn, db, field_id)?.unwrap()); // will not fail because get_first_facet_value succeeded
let group_size = usize::MAX; let group_size = usize::MAX;
f.run(highest_level, starting_left_bound, rightmost_bound, group_size, universe)?; f.run(highest_level, starting_left_bound, rightmost_bound, group_size)?;
Ok(()) Ok(())
} else { } else {
Ok(()) Ok(())
@ -73,18 +73,14 @@ struct FacetRangeSearch<'t, 'b, 'bitmap> {
field_id: u16, field_id: u16,
left: Bound<&'b [u8]>, left: Bound<&'b [u8]>,
right: Bound<&'b [u8]>, right: Bound<&'b [u8]>,
/// The subset of documents ids that are useful for this search.
/// Great performance optimizations can be achieved by only fetching values matching this subset.
universe: Option<&'bitmap RoaringBitmap>,
docids: &'bitmap mut RoaringBitmap, docids: &'bitmap mut RoaringBitmap,
} }
impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> { impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
fn run_level_0( fn run_level_0(&mut self, starting_left_bound: &'t [u8], group_size: usize) -> Result<()> {
&mut self,
starting_left_bound: &'t [u8],
group_size: usize,
// The subset of documents ids that are useful for this search.
// Great performance optimizations can be achieved by only fetching values matching this subset.
universe: Option<&RoaringBitmap>,
) -> Result<()> {
let left_key = let left_key =
FacetGroupKey { field_id: self.field_id, level: 0, left_bound: starting_left_bound }; FacetGroupKey { field_id: self.field_id, level: 0, left_bound: starting_left_bound };
let iter = self.db.range(self.rtxn, &(left_key..))?.take(group_size); let iter = self.db.range(self.rtxn, &(left_key..))?.take(group_size);
@ -117,7 +113,7 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
} }
if RangeBounds::<&[u8]>::contains(&(self.left, self.right), &key.left_bound) { if RangeBounds::<&[u8]>::contains(&(self.left, self.right), &key.left_bound) {
*self.docids |= match universe { *self.docids |= match self.universe {
Some(universe) => CboRoaringBitmapCodec::intersection_with_serialized( Some(universe) => CboRoaringBitmapCodec::intersection_with_serialized(
value.bitmap_bytes, value.bitmap_bytes,
universe, universe,
@ -154,10 +150,9 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
starting_left_bound: &'t [u8], starting_left_bound: &'t [u8],
rightmost_bound: Bound<&'t [u8]>, rightmost_bound: Bound<&'t [u8]>,
group_size: usize, group_size: usize,
universe: Option<&RoaringBitmap>,
) -> Result<()> { ) -> Result<()> {
if level == 0 { if level == 0 {
return self.run_level_0(starting_left_bound, group_size, universe); return self.run_level_0(starting_left_bound, group_size);
} }
let left_key = let left_key =
@ -214,16 +209,12 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
}; };
left_condition && right_condition left_condition && right_condition
}; };
let subset = match universe { if should_take_whole_group {
Some(universe) => Some(CboRoaringBitmapCodec::intersection_with_serialized( *self.docids |= match self.universe {
Some(universe) => CboRoaringBitmapCodec::intersection_with_serialized(
previous_value.bitmap_bytes, previous_value.bitmap_bytes,
universe, universe,
)?), )?,
None => None,
};
if should_take_whole_group {
*self.docids |= match subset {
Some(subset) => subset,
None => CboRoaringBitmapCodec::deserialize_from(previous_value.bitmap_bytes)?, None => CboRoaringBitmapCodec::deserialize_from(previous_value.bitmap_bytes)?,
}; };
previous_key = next_key; previous_key = next_key;
@ -238,9 +229,7 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
let rightmost_bound = Bound::Excluded(next_key.left_bound); let rightmost_bound = Bound::Excluded(next_key.left_bound);
let group_size = previous_value.size as usize; let group_size = previous_value.size as usize;
if subset.as_ref().map_or(true, |u| !u.is_empty()) { self.run(level, starting_left_bound, rightmost_bound, group_size)?;
self.run(level, starting_left_bound, rightmost_bound, group_size, subset.as_ref())?;
}
previous_key = next_key; previous_key = next_key;
previous_value = next_value; previous_value = next_value;
@ -322,18 +311,12 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
}; };
left_condition && right_condition left_condition && right_condition
}; };
if should_take_whole_group {
let subset = match universe { *self.docids |= match self.universe {
Some(universe) => Some(CboRoaringBitmapCodec::intersection_with_serialized( Some(universe) => CboRoaringBitmapCodec::intersection_with_serialized(
previous_value.bitmap_bytes, previous_value.bitmap_bytes,
universe, universe,
)?), )?,
None => None,
};
if should_take_whole_group {
*self.docids |= match subset {
Some(subset) => subset,
None => CboRoaringBitmapCodec::deserialize_from(previous_value.bitmap_bytes)?, None => CboRoaringBitmapCodec::deserialize_from(previous_value.bitmap_bytes)?,
}; };
} else { } else {
@ -341,9 +324,7 @@ impl<'t, 'b, 'bitmap> FacetRangeSearch<'t, 'b, 'bitmap> {
let starting_left_bound = previous_key.left_bound; let starting_left_bound = previous_key.left_bound;
let group_size = previous_value.size as usize; let group_size = previous_value.size as usize;
if subset.as_ref().map_or(true, |u| !u.is_empty()) { self.run(level, starting_left_bound, rightmost_bound, group_size)?;
self.run(level, starting_left_bound, rightmost_bound, group_size, subset.as_ref())?;
}
} }
Ok(()) Ok(())