mirror of
https://github.com/meilisearch/MeiliSearch
synced 2024-11-27 07:14:26 +01:00
Indexing the facet strings levels
This commit is contained in:
parent
a7ae552ba7
commit
8c86348119
@ -210,7 +210,6 @@ impl<'t> Iterator for FacetStringGroupRange<'t> {
|
|||||||
/// It yields the facet string and the roaring bitmap associated with it.
|
/// It yields the facet string and the roaring bitmap associated with it.
|
||||||
pub struct FacetStringLevelZeroRange<'t> {
|
pub struct FacetStringLevelZeroRange<'t> {
|
||||||
iter: RoRange<'t, FacetStringLevelZeroCodec, CboRoaringBitmapCodec>,
|
iter: RoRange<'t, FacetStringLevelZeroCodec, CboRoaringBitmapCodec>,
|
||||||
field_id: FieldId,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'t> FacetStringLevelZeroRange<'t> {
|
impl<'t> FacetStringLevelZeroRange<'t> {
|
||||||
@ -228,19 +227,19 @@ impl<'t> FacetStringLevelZeroRange<'t> {
|
|||||||
) -> Bound<&'a [u8]> {
|
) -> Bound<&'a [u8]> {
|
||||||
match bound {
|
match bound {
|
||||||
Included(value) => {
|
Included(value) => {
|
||||||
buffer.push(field_id);
|
buffer.extend_from_slice(&field_id.to_be_bytes());
|
||||||
buffer.push(0);
|
buffer.push(0);
|
||||||
buffer.extend_from_slice(value.as_bytes());
|
buffer.extend_from_slice(value.as_bytes());
|
||||||
Included(&buffer[..])
|
Included(&buffer[..])
|
||||||
}
|
}
|
||||||
Excluded(value) => {
|
Excluded(value) => {
|
||||||
buffer.push(field_id);
|
buffer.extend_from_slice(&field_id.to_be_bytes());
|
||||||
buffer.push(0);
|
buffer.push(0);
|
||||||
buffer.extend_from_slice(value.as_bytes());
|
buffer.extend_from_slice(value.as_bytes());
|
||||||
Excluded(&buffer[..])
|
Excluded(&buffer[..])
|
||||||
}
|
}
|
||||||
Unbounded => {
|
Unbounded => {
|
||||||
buffer.push(field_id);
|
buffer.extend_from_slice(&field_id.to_be_bytes());
|
||||||
buffer.push(1); // we must only get the level 0
|
buffer.push(1); // we must only get the level 0
|
||||||
Excluded(&buffer[..])
|
Excluded(&buffer[..])
|
||||||
}
|
}
|
||||||
@ -257,7 +256,7 @@ impl<'t> FacetStringLevelZeroRange<'t> {
|
|||||||
.range(rtxn, &(left_bound, right_bound))?
|
.range(rtxn, &(left_bound, right_bound))?
|
||||||
.remap_types::<FacetStringLevelZeroCodec, CboRoaringBitmapCodec>();
|
.remap_types::<FacetStringLevelZeroCodec, CboRoaringBitmapCodec>();
|
||||||
|
|
||||||
Ok(FacetStringLevelZeroRange { iter, field_id })
|
Ok(FacetStringLevelZeroRange { iter })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use std::cmp;
|
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::num::NonZeroUsize;
|
use std::num::{NonZeroU8, NonZeroUsize};
|
||||||
|
use std::{cmp, mem};
|
||||||
|
|
||||||
use chrono::Utc;
|
use chrono::Utc;
|
||||||
use grenad::{CompressionType, FileFuse, Reader, Writer};
|
use grenad::{CompressionType, FileFuse, Reader, Writer};
|
||||||
@ -10,7 +10,10 @@ use log::debug;
|
|||||||
use roaring::RoaringBitmap;
|
use roaring::RoaringBitmap;
|
||||||
|
|
||||||
use crate::error::InternalError;
|
use crate::error::InternalError;
|
||||||
use crate::heed_codec::facet::FacetLevelValueF64Codec;
|
use crate::heed_codec::facet::{
|
||||||
|
FacetLevelValueF64Codec, FacetLevelValueU32Codec, FacetStringLevelZeroCodec,
|
||||||
|
FacetStringZeroBoundsValueCodec,
|
||||||
|
};
|
||||||
use crate::heed_codec::CboRoaringBitmapCodec;
|
use crate::heed_codec::CboRoaringBitmapCodec;
|
||||||
use crate::update::index_documents::{
|
use crate::update::index_documents::{
|
||||||
create_writer, write_into_lmdb_database, writer_into_reader, WriteMethod,
|
create_writer, write_into_lmdb_database, writer_into_reader, WriteMethod,
|
||||||
@ -64,6 +67,13 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> {
|
|||||||
debug!("Computing and writing the facet values levels docids into LMDB on disk...");
|
debug!("Computing and writing the facet values levels docids into LMDB on disk...");
|
||||||
|
|
||||||
for field_id in faceted_fields {
|
for field_id in faceted_fields {
|
||||||
|
// Clear the facet string levels.
|
||||||
|
clear_field_string_levels(
|
||||||
|
self.wtxn,
|
||||||
|
self.index.facet_id_string_docids.remap_types::<ByteSlice, DecodeIgnore>(),
|
||||||
|
field_id,
|
||||||
|
)?;
|
||||||
|
|
||||||
// Compute and store the faceted strings documents ids.
|
// Compute and store the faceted strings documents ids.
|
||||||
let string_documents_ids = compute_faceted_documents_ids(
|
let string_documents_ids = compute_faceted_documents_ids(
|
||||||
self.wtxn,
|
self.wtxn,
|
||||||
@ -71,6 +81,17 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> {
|
|||||||
field_id,
|
field_id,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
|
let facet_string_levels = compute_facet_string_levels(
|
||||||
|
self.wtxn,
|
||||||
|
self.index.facet_id_string_docids,
|
||||||
|
self.chunk_compression_type,
|
||||||
|
self.chunk_compression_level,
|
||||||
|
self.chunk_fusing_shrink_size,
|
||||||
|
self.level_group_size,
|
||||||
|
self.min_level_size,
|
||||||
|
field_id,
|
||||||
|
)?;
|
||||||
|
|
||||||
// Clear the facet number levels.
|
// Clear the facet number levels.
|
||||||
clear_field_number_levels(self.wtxn, self.index.facet_id_f64_docids, field_id)?;
|
clear_field_number_levels(self.wtxn, self.index.facet_id_f64_docids, field_id)?;
|
||||||
|
|
||||||
@ -81,7 +102,7 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> {
|
|||||||
field_id,
|
field_id,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let content = compute_facet_number_levels(
|
let facet_number_levels = compute_facet_number_levels(
|
||||||
self.wtxn,
|
self.wtxn,
|
||||||
self.index.facet_id_f64_docids,
|
self.index.facet_id_f64_docids,
|
||||||
self.chunk_compression_type,
|
self.chunk_compression_type,
|
||||||
@ -106,8 +127,16 @@ impl<'t, 'u, 'i> Facets<'t, 'u, 'i> {
|
|||||||
write_into_lmdb_database(
|
write_into_lmdb_database(
|
||||||
self.wtxn,
|
self.wtxn,
|
||||||
*self.index.facet_id_f64_docids.as_polymorph(),
|
*self.index.facet_id_f64_docids.as_polymorph(),
|
||||||
content,
|
facet_number_levels,
|
||||||
|_, _| Err(InternalError::IndexingMergingKeys { process: "facet number level" }),
|
|_, _| Err(InternalError::IndexingMergingKeys { process: "facet number levels" }),
|
||||||
|
WriteMethod::GetMergePut,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
write_into_lmdb_database(
|
||||||
|
self.wtxn,
|
||||||
|
*self.index.facet_id_string_docids.as_polymorph(),
|
||||||
|
facet_string_levels,
|
||||||
|
|_, _| Err(InternalError::IndexingMergingKeys { process: "facet string levels" }),
|
||||||
WriteMethod::GetMergePut,
|
WriteMethod::GetMergePut,
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
@ -193,6 +222,21 @@ fn compute_facet_number_levels<'t>(
|
|||||||
writer_into_reader(writer, shrink_size)
|
writer_into_reader(writer, shrink_size)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn write_number_entry(
|
||||||
|
writer: &mut Writer<File>,
|
||||||
|
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)?;
|
||||||
|
writer.insert(&key, &data)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
fn compute_faceted_documents_ids(
|
fn compute_faceted_documents_ids(
|
||||||
rtxn: &heed::RoTxn,
|
rtxn: &heed::RoTxn,
|
||||||
db: heed::Database<ByteSlice, CboRoaringBitmapCodec>,
|
db: heed::Database<ByteSlice, CboRoaringBitmapCodec>,
|
||||||
@ -208,17 +252,97 @@ fn compute_faceted_documents_ids(
|
|||||||
Ok(documents_ids)
|
Ok(documents_ids)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_number_entry(
|
fn clear_field_string_levels<'t>(
|
||||||
|
wtxn: &'t mut heed::RwTxn,
|
||||||
|
db: heed::Database<ByteSlice, DecodeIgnore>,
|
||||||
|
field_id: FieldId,
|
||||||
|
) -> heed::Result<()> {
|
||||||
|
let left = (field_id, NonZeroU8::new(1).unwrap(), u32::MIN, u32::MIN);
|
||||||
|
let right = (field_id, NonZeroU8::new(u8::MAX).unwrap(), u32::MAX, u32::MAX);
|
||||||
|
let range = left..=right;
|
||||||
|
db.remap_key_type::<FacetLevelValueU32Codec>().delete_range(wtxn, &range).map(drop)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compute_facet_string_levels<'t>(
|
||||||
|
rtxn: &'t heed::RoTxn,
|
||||||
|
db: heed::Database<FacetStringLevelZeroCodec, CboRoaringBitmapCodec>,
|
||||||
|
compression_type: CompressionType,
|
||||||
|
compression_level: Option<u32>,
|
||||||
|
shrink_size: Option<u64>,
|
||||||
|
level_group_size: NonZeroUsize,
|
||||||
|
min_level_size: NonZeroUsize,
|
||||||
|
field_id: FieldId,
|
||||||
|
) -> Result<Reader<FileFuse>> {
|
||||||
|
let first_level_size = db
|
||||||
|
.remap_key_type::<ByteSlice>()
|
||||||
|
.prefix_iter(rtxn, &field_id.to_be_bytes())?
|
||||||
|
.remap_types::<DecodeIgnore, DecodeIgnore>()
|
||||||
|
.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 = tempfile::tempfile()
|
||||||
|
.and_then(|file| create_writer(compression_type, compression_level, file))?;
|
||||||
|
|
||||||
|
// 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), 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, shrink_size)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_string_entry(
|
||||||
writer: &mut Writer<File>,
|
writer: &mut Writer<File>,
|
||||||
field_id: FieldId,
|
field_id: FieldId,
|
||||||
level: u8,
|
level: NonZeroU8,
|
||||||
left: f64,
|
(left_id, left_value): (u32, &str),
|
||||||
right: f64,
|
(right_id, right_value): (u32, &str),
|
||||||
ids: &RoaringBitmap,
|
docids: RoaringBitmap,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let key = (field_id, level, left, right);
|
let key = (field_id, level, left_id, right_id);
|
||||||
let key = FacetLevelValueF64Codec::bytes_encode(&key).ok_or(Error::Encoding)?;
|
let key = FacetLevelValueU32Codec::bytes_encode(&key).ok_or(Error::Encoding)?;
|
||||||
let data = CboRoaringBitmapCodec::bytes_encode(&ids).ok_or(Error::Encoding)?;
|
let data = match level.get() {
|
||||||
|
1 => (Some((left_value, right_value)), docids),
|
||||||
|
_ => (None, docids),
|
||||||
|
};
|
||||||
|
let data = FacetStringZeroBoundsValueCodec::<CboRoaringBitmapCodec>::bytes_encode(&data)
|
||||||
|
.ok_or(Error::Encoding)?;
|
||||||
writer.insert(&key, &data)?;
|
writer.insert(&key, &data)?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user