snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-10-30 23:46:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the FacetStringLevelZeroRange range when unbounded

Browse Source
This commit is contained in:
Kerollmops
2021-06-23 17:05:57 +02:00
parent 757b2b502a
commit a7ae552ba7
1 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
milli/src/search/facet/facet_string.rs
View File

@@ -210,6 +210,7 @@ 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> {
@@ -220,20 +221,43 @@ impl<'t> FacetStringLevelZeroRange<'t> {
left: Bound<&str>, left: Bound<&str>,
right: Bound<&str>, right: Bound<&str>,
) -> heed::Result<FacetStringLevelZeroRange<'t>> { ) -> heed::Result<FacetStringLevelZeroRange<'t>> {
let db = db.remap_types::<FacetStringLevelZeroCodec, CboRoaringBitmapCodec>(); fn encode_bound<'a>(
let left_bound = match left { buffer: &'a mut Vec<u8>,
Included(left) => Included((field_id, left)), field_id: FieldId,
Excluded(left) => Excluded((field_id, left)), bound: Bound<&str>,
Unbounded => Included((field_id, "")), ) -> Bound<&'a [u8]> {
}; match bound {
Included(value) => {
buffer.push(field_id);
buffer.push(0);
buffer.extend_from_slice(value.as_bytes());
Included(&buffer[..])
}
Excluded(value) => {
buffer.push(field_id);
buffer.push(0);
buffer.extend_from_slice(value.as_bytes());
Excluded(&buffer[..])
}
Unbounded => {
buffer.push(field_id);
buffer.push(1); // we must only get the level 0
Excluded(&buffer[..])
}
}
}
let right_bound = match right { let mut left_buffer = Vec::new();
Included(right) => Included((field_id, right)), let mut right_buffer = Vec::new();
Excluded(right) => Excluded((field_id, right)), let left_bound = encode_bound(&mut left_buffer, field_id, left);
Unbounded => Excluded((field_id + 1, "")), let right_bound = encode_bound(&mut right_buffer, field_id, right);
};
db.range(rtxn, &(left_bound, right_bound)).map(|iter| FacetStringLevelZeroRange { iter }) let iter = db
.remap_key_type::<ByteSlice>()
.range(rtxn, &(left_bound, right_bound))?
.remap_types::<FacetStringLevelZeroCodec, CboRoaringBitmapCodec>();
Ok(FacetStringLevelZeroRange { iter, field_id })
} }
} }