From 8d4b21a00525cec1095e237b1ec6c0a1473512d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Lecrenier?= Date: Mon, 18 Jul 2022 09:59:08 +0200 Subject: [PATCH] Switch string facet levels indexation to new algo Write the algorithm once for both numbers and strings --- milli/src/update/facets.rs | 505 ++++++++++++++----------------------- 1 file changed, 185 insertions(+), 320 deletions(-) diff --git a/milli/src/update/facets.rs b/milli/src/update/facets.rs index 8899f0485..b3d9f1c58 100644 --- a/milli/src/update/facets.rs +++ b/milli/src/update/facets.rs @@ -1,13 +1,12 @@ -use std::fs::File; -use std::num::{NonZeroU8, NonZeroUsize}; -use std::ops::RangeInclusive; -use std::{cmp, mem}; - use grenad::{CompressionType, Reader, Writer}; use heed::types::{ByteSlice, DecodeIgnore}; use heed::{BytesDecode, BytesEncode, Error}; use log::debug; use roaring::RoaringBitmap; +use std::cmp; +use std::fs::File; +use std::num::{NonZeroU8, NonZeroUsize}; +use std::ops::RangeFrom; use time::OffsetDateTime; use crate::error::InternalError; @@ -66,14 +65,7 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> { field_id, )?; - // Compute and store the faceted strings documents ids. - let string_documents_ids = compute_faceted_strings_documents_ids( - self.wtxn, - self.index.facet_id_string_docids.remap_key_type::(), - field_id, - )?; - - let facet_string_levels = compute_facet_string_levels( + let (facet_string_levels, string_documents_ids) = compute_facet_strings_levels( self.wtxn, self.index.facet_id_string_docids, self.chunk_compression_type, @@ -83,36 +75,26 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> { field_id, )?; + self.index.put_string_faceted_documents_ids( + self.wtxn, + field_id, + &string_documents_ids, + )?; + for facet_strings_levels in facet_string_levels { + write_into_lmdb_database( + self.wtxn, + *self.index.facet_id_string_docids.as_polymorph(), + facet_strings_levels, + |_, _| { + Err(InternalError::IndexingMergingKeys { process: "facet string levels" })? + }, + )?; + } + // Clear the facet number levels. clear_field_number_levels(self.wtxn, self.index.facet_id_f64_docids, field_id)?; - // Compute and store the faceted numbers documents ids. - // let number_documents_ids = compute_faceted_numbers_documents_ids( - // self.wtxn, - // self.index.facet_id_f64_docids.remap_key_type::(), - // field_id, - // )?; - - // let facet_number_levels = compute_facet_number_levels( - // self.wtxn, - // self.index.facet_id_f64_docids, - // self.chunk_compression_type, - // self.chunk_compression_level, - // self.level_group_size, - // self.min_level_size, - // field_id, - // )?; - - // println!("printing 1"); - - // let mut cursor = facet_number_levels.into_cursor().unwrap(); - // while let Some((key, bitmap)) = cursor.move_on_next().unwrap() { - // let key = FacetLevelValueF64Codec::bytes_decode(key).unwrap(); - // let bitmap = CboRoaringBitmapCodec::bytes_decode(bitmap).unwrap(); - // println!("{key:?} {bitmap:?}"); - // } - - let (facet_number_levels_2, number_documents_ids) = compute_facet_number_levels_2( + let (facet_number_levels_2, number_documents_ids) = compute_facet_number_levels( self.wtxn, self.index.facet_id_f64_docids, self.chunk_compression_type, @@ -122,37 +104,6 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> { field_id, )?; - // let mut writer = create_writer( - // self.chunk_compression_type, - // self.chunk_compression_level, - // tempfile::tempfile()?, - // ); - // for fnl in facet_number_levels_2 { - // let mut cursor = fnl.into_cursor().unwrap(); - // while let Some((key, bitmap)) = cursor.move_on_next().unwrap() { - // writer.insert(key, bitmap).unwrap(); - // } - // } - // let reader = writer_into_reader(writer)?; - // let mut cursor1 = reader.into_cursor().unwrap(); - // let mut cursor2 = facet_number_levels.into_cursor().unwrap(); - // loop { - // let (c1, c2) = (cursor1.move_on_next().unwrap(), cursor2.move_on_next().unwrap()); - // match (c1, c2) { - // (Some((k1, v1)), Some((k2, v2))) => { - // assert_eq!(k1, k2); - // assert_eq!(v1, v2); - // } - // (None, None) => break, - // _ => panic!(), - // } - // } - - self.index.put_string_faceted_documents_ids( - self.wtxn, - field_id, - &string_documents_ids, - )?; self.index.put_number_faceted_documents_ids( self.wtxn, field_id, @@ -169,31 +120,13 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> { }, )?; } - - write_into_lmdb_database( - self.wtxn, - *self.index.facet_id_string_docids.as_polymorph(), - facet_string_levels, - |_, _| Err(InternalError::IndexingMergingKeys { process: "facet string levels" })?, - )?; } Ok(()) } } -fn clear_field_number_levels<'t>( - wtxn: &'t mut heed::RwTxn, - db: heed::Database, - field_id: FieldId, -) -> heed::Result<()> { - let left = (field_id, 1, f64::MIN, f64::MIN); - let right = (field_id, u8::MAX, f64::MAX, f64::MAX); - let range = left..=right; - db.delete_range(wtxn, &range).map(drop) -} - -fn compute_facet_number_levels_2<'t>( +fn compute_facet_number_levels<'t>( rtxn: &'t heed::RoTxn, db: heed::Database, compression_type: CompressionType, @@ -208,11 +141,7 @@ fn compute_facet_number_levels_2<'t>( .remap_types::() .fold(Ok(0usize), |count, result| result.and(count).map(|c| c + 1))?; - let level_0_range = { - let left = (field_id, 0, f64::MIN, f64::MIN); - let right = (field_id, 0, f64::MAX, f64::MAX); - left..=right - }; + let level_0_start = (field_id, 0, f64::MIN, f64::MIN); // Groups sizes are always a power of the original level_group_size and therefore a group // always maps groups of the previous level and never splits previous levels groups in half. @@ -221,32 +150,38 @@ fn compute_facet_number_levels_2<'t>( .take_while(|(_, s)| first_level_size / *s >= min_level_size.get()) .collect::>(); - // dbg!(first_level_size, min_level_size); - // dbg!(level_group_size); - // dbg!(&group_size_iter); - let mut number_document_ids = RoaringBitmap::new(); if let Some((top_level, _)) = group_size_iter.last() { - let subwriters = recursive_compute_levels( - rtxn, - db, - compression_type, - compression_level, - *top_level, - level_0_range, - level_group_size, - &mut |bitmaps, _, _| { - for bitmap in bitmaps { - number_document_ids |= bitmap; - } - Ok(()) - }, - )?; + let subwriters = + recursive_compute_levels::( + rtxn, + db, + compression_type, + compression_level, + *top_level, + level_0_start, + &(level_0_start..), + first_level_size, + level_group_size, + &mut |bitmaps, _, _| { + for bitmap in bitmaps { + number_document_ids |= bitmap; + } + Ok(()) + }, + &|_i, (_field_id, _level, left, _right)| *left, + &|bitmap| bitmap, + &|writer, level, left, right, docids| { + write_number_entry(writer, field_id, level.get(), left, right, &docids)?; + Ok(()) + }, + )?; + Ok((subwriters, number_document_ids)) } else { let mut documents_ids = RoaringBitmap::new(); - for result in db.range(rtxn, &level_0_range)? { + for result in db.range(rtxn, &(level_0_start..))?.take(first_level_size) { let (_key, docids) = result?; documents_ids |= docids; } @@ -255,52 +190,129 @@ fn compute_facet_number_levels_2<'t>( } } -fn recursive_compute_levels<'t>( +fn compute_facet_strings_levels<'t>( rtxn: &'t heed::RoTxn, - db: heed::Database, + db: heed::Database, + compression_type: CompressionType, + compression_level: Option, + level_group_size: NonZeroUsize, + min_level_size: NonZeroUsize, + field_id: FieldId, +) -> Result<(Vec>, RoaringBitmap)> { + let first_level_size = db + .remap_key_type::() + .prefix_iter(rtxn, &field_id.to_be_bytes())? + .remap_types::() + .fold(Ok(0usize), |count, result| result.and(count).map(|c| c + 1))?; + + let level_0_start = (field_id, ""); + + // Groups sizes are always a power of the original level_group_size and therefore a group + // always maps groups of the previous level and never splits previous levels groups in half. + let group_size_iter = (1u8..) + .map(|l| (l, level_group_size.get().pow(l as u32))) + .take_while(|(_, s)| first_level_size / *s >= min_level_size.get()) + .collect::>(); + + let mut strings_document_ids = RoaringBitmap::new(); + + if let Some((top_level, _)) = group_size_iter.last() { + let subwriters = recursive_compute_levels::< + FacetStringLevelZeroCodec, + FacetStringLevelZeroValueCodec, + (u32, &str), + >( + rtxn, + db, + compression_type, + compression_level, + *top_level, + level_0_start, + &(level_0_start..), + first_level_size, + level_group_size, + &mut |bitmaps, _, _| { + for bitmap in bitmaps { + strings_document_ids |= bitmap; + } + Ok(()) + }, + &|i, (_field_id, value)| (i as u32, *value), + &|value| value.1, + &|writer, level, start_bound, end_bound, docids| { + write_string_entry(writer, field_id, level, start_bound, end_bound, docids)?; + Ok(()) + }, + )?; + + Ok((subwriters, strings_document_ids)) + } else { + let mut documents_ids = RoaringBitmap::new(); + for result in db.range(rtxn, &(level_0_start..))?.take(first_level_size) { + let (_key, (_original_value, docids)) = result?; + documents_ids |= docids; + } + + Ok((vec![], documents_ids)) + } +} + +fn recursive_compute_levels<'t, KeyCodec, ValueCodec, Bound>( + rtxn: &'t heed::RoTxn, + db: heed::Database, compression_type: CompressionType, compression_level: Option, level: u8, - level_0_range: RangeInclusive<(FieldId, u8, f64, f64)>, + level_0_start: >::DItem, + level_0_range: &'t RangeFrom<>::DItem>, + level_0_size: usize, level_group_size: NonZeroUsize, - computed_group_bitmap: &mut dyn FnMut(&[RoaringBitmap], f64, f64) -> Result<()>, -) -> Result>> { - let (field_id, level_0, first_left, first_right) = level_0_range.start().clone(); - assert_eq!(level_0, 0); - assert_eq!(first_left, first_right); + computed_group_bitmap: &mut dyn FnMut(&[RoaringBitmap], Bound, Bound) -> Result<()>, + bound_from_db_key: &dyn for<'a> Fn(usize, &'a >::DItem) -> Bound, + bitmap_from_db_value: &dyn Fn(>::DItem) -> RoaringBitmap, + write_entry: &dyn Fn(&mut Writer, NonZeroU8, Bound, Bound, RoaringBitmap) -> Result<()>, +) -> Result>> +where + KeyCodec: for<'a> BytesEncode<'a> + + for<'a> BytesDecode<'a, DItem = >::EItem>, + for<'a> >::EItem: Sized, + ValueCodec: for<'a> BytesEncode<'a> + + for<'a> BytesDecode<'a, DItem = >::EItem>, + for<'a> >::EItem: Sized, + Bound: Copy, +{ if level == 0 { + // base case for the recursion + let mut bitmaps = vec![]; - let mut first_f64_value = first_left; - let mut last_f64_value = first_left; - + let mut start_bound = bound_from_db_key(0, &level_0_start); + let mut end_bound = bound_from_db_key(0, &level_0_start); let mut first_iteration_for_new_group = true; - for db_result_item in db.range(rtxn, &level_0_range)? { - let ((_field_id, _level, left, _right), docids) = db_result_item?; - // println!("level0: {left}"); - assert_eq!(_level, 0); - assert_eq!(left, _right); + for (i, db_result_item) in db.range(rtxn, level_0_range)?.take(level_0_size).enumerate() { + let (key, value) = db_result_item?; + + let bound = bound_from_db_key(i, &key); + let docids = bitmap_from_db_value(value); + if first_iteration_for_new_group { - first_f64_value = left; + start_bound = bound; first_iteration_for_new_group = false; } - last_f64_value = left; + end_bound = bound; bitmaps.push(docids); if bitmaps.len() == level_group_size.get() { - // println!("callback first level with {bitmaps:?} {last_f64_value:?}"); - computed_group_bitmap(&bitmaps, first_f64_value, last_f64_value)?; + computed_group_bitmap(&bitmaps, start_bound, end_bound)?; first_iteration_for_new_group = true; bitmaps.clear(); } } if !bitmaps.is_empty() { - // println!("end callback first level with {bitmaps:?} {last_f64_value:?}"); - computed_group_bitmap(&bitmaps, first_f64_value, last_f64_value)?; + computed_group_bitmap(&bitmaps, start_bound, end_bound)?; bitmaps.clear(); } - - // level 0 isn't actually stored in this DB, since it contains exactly the same information as that other DB + // level 0 is already stored in the DB return Ok(vec![]); } else { let mut cur_writer = @@ -315,7 +327,9 @@ fn recursive_compute_levels<'t>( compression_type, compression_level, level - 1, + level_0_start, level_0_range, + level_0_size, level_group_size, &mut |sub_bitmaps: &[RoaringBitmap], start_range, end_range| { let mut combined_bitmap = RoaringBitmap::default(); @@ -326,36 +340,33 @@ fn recursive_compute_levels<'t>( bitmaps.push(combined_bitmap); if bitmaps.len() == level_group_size.get() { - let start_range = range_for_bitmaps.first().unwrap().0; - let end_range = range_for_bitmaps.last().unwrap().1; - // println!("callback level {} with {bitmaps:?} {last_f64_value:?}", level + 1); - computed_group_bitmap(&bitmaps, start_range, end_range)?; - for (bitmap, (start_range, end_range)) in + let start_bound = range_for_bitmaps.first().unwrap().0; + let end_bound = range_for_bitmaps.last().unwrap().1; + computed_group_bitmap(&bitmaps, start_bound, end_bound)?; + for (bitmap, (start_bound, end_bound)) in bitmaps.drain(..).zip(range_for_bitmaps.drain(..)) { - // println!("write {field_id} {level} {start_range} {end_range} {bitmap:?}"); - write_number_entry( + write_entry( &mut cur_writer, - field_id, - level, - start_range, - end_range, - &bitmap, + NonZeroU8::new(level).unwrap(), + start_bound, + end_bound, + bitmap, )?; } } - // println!("end callback level {level}"); Ok(()) }, + bound_from_db_key, + bitmap_from_db_value, + write_entry, )?; if !bitmaps.is_empty() { let start_range = range_for_bitmaps.first().unwrap().0; let end_range = range_for_bitmaps.last().unwrap().1; - // println!("end callback level {} with {bitmaps:?} {last_f64_value:?}", level + 1); computed_group_bitmap(&bitmaps, start_range, end_range)?; for (bitmap, (left, right)) in bitmaps.drain(..).zip(range_for_bitmaps.drain(..)) { - // println!("end write: {field_id} {level} {left} {right} {bitmap:?}"); - write_number_entry(&mut cur_writer, field_id, level, left, right, &bitmap)?; + write_entry(&mut cur_writer, NonZeroU8::new(level).unwrap(), left, right, bitmap)?; } } @@ -364,113 +375,15 @@ fn recursive_compute_levels<'t>( } } -fn compute_facet_number_levels<'t>( - rtxn: &'t heed::RoTxn, +fn clear_field_number_levels<'t>( + wtxn: &'t mut heed::RwTxn, db: heed::Database, - compression_type: CompressionType, - compression_level: Option, - level_group_size: NonZeroUsize, - min_level_size: NonZeroUsize, field_id: FieldId, -) -> Result> { - let first_level_size = db - .remap_key_type::() - .prefix_iter(rtxn, &field_id.to_be_bytes())? - .remap_types::() - .fold(Ok(0usize), |count, result| result.and(count).map(|c| c + 1))?; - - // It is forbidden to keep a cursor and write in a database at the same time with LMDB - // therefore we write the facet levels entries into a grenad file before transfering them. - let mut writer = create_writer(compression_type, compression_level, tempfile::tempfile()?); - - let level_0_range = { - let left = (field_id, 0, f64::MIN, f64::MIN); - let right = (field_id, 0, f64::MAX, f64::MAX); - left..=right - }; - - // Groups sizes are always a power of the original level_group_size and therefore a group - // always maps groups of the previous level and never splits previous levels groups in half. - let group_size_iter = (1u8..) - .map(|l| (l, level_group_size.get().pow(l as u32))) - .take_while(|(_, s)| first_level_size / *s >= min_level_size.get()); - - for (level, group_size) in group_size_iter { - // dbg!(level, group_size); - let mut left = 0.0; - let mut right = 0.0; - let mut group_docids = RoaringBitmap::new(); - - for (i, result) in db.range(rtxn, &level_0_range)?.enumerate() { - let ((_field_id, _level, value, _right), docids) = result?; - - if i == 0 { - left = value; - } else if i % group_size == 0 { - // we found the first bound of the next group, we must store the left - // and right bounds associated with the docids. - write_number_entry(&mut writer, field_id, level, left, right, &group_docids)?; - - // We save the left bound for the new group and also reset the docids. - group_docids = RoaringBitmap::new(); - left = value; - } - - // The right bound is always the bound we run through. - group_docids |= docids; - right = value; - } - - if !group_docids.is_empty() { - write_number_entry(&mut writer, field_id, level, left, right, &group_docids)?; - } - } - - writer_into_reader(writer) -} - -fn write_number_entry( - writer: &mut Writer, - field_id: FieldId, - level: u8, - left: f64, - right: f64, - ids: &RoaringBitmap, -) -> Result<()> { - let key = (field_id, level, left, right); - let key = FacetLevelValueF64Codec::bytes_encode(&key).ok_or(Error::Encoding)?; - let data = CboRoaringBitmapCodec::bytes_encode(&ids).ok_or(Error::Encoding)?; - // println!(" w{field_id}-{level}-{left}-{right}"); - writer.insert(&key, &data)?; - Ok(()) -} - -fn compute_faceted_strings_documents_ids( - rtxn: &heed::RoTxn, - db: heed::Database, - field_id: FieldId, -) -> Result { - let mut documents_ids = RoaringBitmap::new(); - for result in db.prefix_iter(rtxn, &field_id.to_be_bytes())? { - let (_key, (_original_value, docids)) = result?; - documents_ids |= docids; - } - - Ok(documents_ids) -} - -fn compute_faceted_numbers_documents_ids( - rtxn: &heed::RoTxn, - db: heed::Database, - field_id: FieldId, -) -> Result { - let mut documents_ids = RoaringBitmap::new(); - for result in db.prefix_iter(rtxn, &field_id.to_be_bytes())? { - let (_key, docids) = result?; - documents_ids |= docids; - } - - Ok(documents_ids) +) -> heed::Result<()> { + let left = (field_id, 1, f64::MIN, f64::MIN); + let right = (field_id, u8::MAX, f64::MAX, f64::MAX); + let range = left..=right; + db.delete_range(wtxn, &range).map(drop) } fn clear_field_string_levels<'t>( @@ -484,68 +397,20 @@ fn clear_field_string_levels<'t>( db.remap_key_type::().delete_range(wtxn, &range).map(drop) } -fn compute_facet_string_levels<'t>( - rtxn: &'t heed::RoTxn, - db: heed::Database, - compression_type: CompressionType, - compression_level: Option, - level_group_size: NonZeroUsize, - min_level_size: NonZeroUsize, +fn write_number_entry( + writer: &mut Writer, field_id: FieldId, -) -> Result> { - let first_level_size = db - .remap_key_type::() - .prefix_iter(rtxn, &field_id.to_be_bytes())? - .remap_types::() - .fold(Ok(0usize), |count, result| result.and(count).map(|c| c + 1))?; - - // It is forbidden to keep a cursor and write in a database at the same time with LMDB - // therefore we write the facet levels entries into a grenad file before transfering them. - let mut writer = create_writer(compression_type, compression_level, tempfile::tempfile()?); - - // Groups sizes are always a power of the original level_group_size and therefore a group - // always maps groups of the previous level and never splits previous levels groups in half. - let group_size_iter = (1u8..) - .map(|l| (l, level_group_size.get().pow(l as u32))) - .take_while(|(_, s)| first_level_size / *s >= min_level_size.get()); - - for (level, group_size) in group_size_iter { - let level = NonZeroU8::new(level).unwrap(); - let mut left = (0, ""); - let mut right = (0, ""); - let mut group_docids = RoaringBitmap::new(); - - // Because we know the size of the level 0 we can use a range iterator that starts - // at the first value of the level and goes to the last by simply counting. - for (i, result) in db.range(rtxn, &((field_id, "")..))?.take(first_level_size).enumerate() { - let ((_field_id, value), (_original_value, docids)) = result?; - - if i == 0 { - left = (i as u32, value); - } else if i % group_size == 0 { - // we found the first bound of the next group, we must store the left - // and right bounds associated with the docids. We also reset the docids. - let docids = mem::take(&mut group_docids); - write_string_entry(&mut writer, field_id, level, left, right, docids)?; - - // We save the left bound for the new group. - left = (i as u32, value); - } - - // The right bound is always the bound we run through. - group_docids |= docids; - right = (i as u32, value); - } - - if !group_docids.is_empty() { - let docids = mem::take(&mut group_docids); - write_string_entry(&mut writer, field_id, level, left, right, docids)?; - } - } - - writer_into_reader(writer) + level: u8, + left: f64, + right: f64, + ids: &RoaringBitmap, +) -> Result<()> { + let key = (field_id, level, left, right); + let key = FacetLevelValueF64Codec::bytes_encode(&key).ok_or(Error::Encoding)?; + let data = CboRoaringBitmapCodec::bytes_encode(&ids).ok_or(Error::Encoding)?; + writer.insert(&key, &data)?; + Ok(()) } - fn write_string_entry( writer: &mut Writer, field_id: FieldId,