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

Make milli use edition 2021 (#4770)

Browse Source 
* Make milli use edition 2021

* Add lifetime annotations to milli.

* Run cargo fmt
This commit is contained in:
hanbings
2024-07-09 11:25:39 -04:00
committed by GitHub
parent aac15f6719
commit 0a40a98bb6
73 changed files with 406 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
milli/src/update/facet/bulk.rs
View File

@ -67,7 +67,7 @@ impl<'i> FacetsUpdateBulk<'i> {
}
#[tracing::instrument(level = "trace", skip_all, target = "indexing::facets::bulk")]
pub fn execute(self, wtxn: &mut heed::RwTxn) -> Result<()> {
pub fn execute(self, wtxn: &mut heed::RwTxn<'_>) -> Result<()> {
let Self { index, field_ids, group_size, min_level_size, facet_type, delta_data } = self;
let db = match facet_type {
@ -95,7 +95,7 @@ pub(crate) struct FacetsUpdateBulkInner<R: std::io::Read + std::io::Seek> {
pub min_level_size: u8,
}
impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
pub fn update(mut self, wtxn: &mut RwTxn, field_ids: &[u16]) -> Result<()> {
pub fn update(mut self, wtxn: &mut RwTxn<'_>, field_ids: &[u16]) -> Result<()> {
self.update_level0(wtxn)?;
for &field_id in field_ids.iter() {
self.clear_levels(wtxn, field_id)?;
@ -114,7 +114,7 @@ impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
Ok(())
}
fn clear_levels(&self, wtxn: &mut heed::RwTxn, field_id: FieldId) -> Result<()> {
fn clear_levels(&self, wtxn: &mut heed::RwTxn<'_>, field_id: FieldId) -> Result<()> {
let left = FacetGroupKey::<&[u8]> { field_id, level: 1, left_bound: &[] };
let right = FacetGroupKey::<&[u8]> { field_id, level: u8::MAX, left_bound: &[] };
let range = left..=right;
@ -122,7 +122,7 @@ impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
Ok(())
}
fn update_level0(&mut self, wtxn: &mut RwTxn) -> Result<()> {
fn update_level0(&mut self, wtxn: &mut RwTxn<'_>) -> Result<()> {
let delta_data = match self.delta_data.take() {
Some(x) => x,
None => return Ok(()),
@ -198,7 +198,7 @@ impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
fn compute_levels_for_field_id(
&self,
field_id: FieldId,
txn: &RoTxn,
txn: &RoTxn<'_>,
) -> Result<Vec<grenad::Reader<BufReader<File>>>> {
let subwriters = self.compute_higher_levels(txn, field_id, 32, &mut |_, _| Ok(()))?;
@ -207,7 +207,7 @@ impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
#[allow(clippy::type_complexity)]
fn read_level_0<'t>(
&self,
rtxn: &'t RoTxn,
rtxn: &'t RoTxn<'t>,
field_id: u16,
handle_group: &mut dyn FnMut(&[RoaringBitmap], &'t [u8]) -> Result<()>,
) -> Result<()> {
@ -261,7 +261,7 @@ impl<R: std::io::Read + std::io::Seek> FacetsUpdateBulkInner<R> {
#[allow(clippy::type_complexity)]
fn compute_higher_levels<'t>(
&self,
rtxn: &'t RoTxn,
rtxn: &'t RoTxn<'t>,
field_id: u16,
level: u8,
handle_group: &mut dyn FnMut(&[RoaringBitmap], &'t [u8]) -> Result<()>,

20
milli/src/update/facet/incremental.rs
View File

@ -88,7 +88,7 @@ impl FacetsUpdateIncremental {
}
#[tracing::instrument(level = "trace", skip_all, target = "indexing::facets::incremental")]
pub fn execute(self, wtxn: &mut RwTxn) -> crate::Result<()> {
pub fn execute(self, wtxn: &mut RwTxn<'_>) -> crate::Result<()> {
let mut current_field_id = None;
let mut facet_level_may_be_updated = false;
let mut iter = self.delta_data.into_stream_merger_iter()?;
@ -172,7 +172,7 @@ impl FacetsUpdateIncrementalInner {
field_id: u16,
level: u8,
facet_value: &[u8],
txn: &RoTxn,
txn: &RoTxn<'_>,
) -> Result<(FacetGroupKey<Vec<u8>>, FacetGroupValue)> {
assert!(level > 0);
match self.db.get_lower_than_or_equal_to(
@ -215,7 +215,7 @@ impl FacetsUpdateIncrementalInner {
/// See documentation of `insert_in_level`
fn modify_in_level_0(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
facet_value: &[u8],
add_docids: Option<&RoaringBitmap>,
@ -277,7 +277,7 @@ impl FacetsUpdateIncrementalInner {
/// Returns `ModificationResult::Insert` if the split is successful.
fn split_group(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
level: u8,
insertion_key: FacetGroupKey<Vec<u8>>,
@ -346,7 +346,7 @@ impl FacetsUpdateIncrementalInner {
/// This process is needed to avoid removing docids from a group node where the docid is present in several sub-nodes.
fn trim_del_docids<'a>(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
level: u8,
insertion_key: &FacetGroupKey<Vec<u8>>,
@ -383,7 +383,7 @@ impl FacetsUpdateIncrementalInner {
///
fn modify_in_level(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
level: u8,
facet_value: &[u8],
@ -523,7 +523,7 @@ impl FacetsUpdateIncrementalInner {
/// Otherwise returns `false` if the tree-nodes have been modified in place.
pub fn modify(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
facet_value: &[u8],
add_docids: Option<&RoaringBitmap>,
@ -558,7 +558,7 @@ impl FacetsUpdateIncrementalInner {
/// If it has, we must build an addition level above it.
/// Then check whether the highest level is under `min_level_size`.
/// If it has, we must remove the complete level.
pub(crate) fn add_or_delete_level(&self, txn: &mut RwTxn, field_id: u16) -> Result<()> {
pub(crate) fn add_or_delete_level(&self, txn: &mut RwTxn<'_>, field_id: u16) -> Result<()> {
let highest_level = get_highest_level(txn, self.db, field_id)?;
let mut highest_level_prefix = vec![];
highest_level_prefix.extend_from_slice(&field_id.to_be_bytes());
@ -577,7 +577,7 @@ impl FacetsUpdateIncrementalInner {
}
/// Delete a level.
fn delete_level(&self, txn: &mut RwTxn, highest_level_prefix: &[u8]) -> Result<()> {
fn delete_level(&self, txn: &mut RwTxn<'_>, highest_level_prefix: &[u8]) -> Result<()> {
let mut to_delete = vec![];
let mut iter =
self.db.remap_types::<Bytes, Bytes>().prefix_iter(txn, highest_level_prefix)?;
@ -599,7 +599,7 @@ impl FacetsUpdateIncrementalInner {
/// Build an additional level for the field id.
fn add_level(
&self,
txn: &mut RwTxn,
txn: &mut RwTxn<'_>,
field_id: u16,
highest_level: u8,
highest_level_prefix: &[u8],

14
milli/src/update/facet/mod.rs
View File

@ -141,7 +141,7 @@ impl<'i> FacetsUpdate<'i> {
}
}
pub fn execute(self, wtxn: &mut heed::RwTxn) -> Result<()> {
pub fn execute(self, wtxn: &mut heed::RwTxn<'_>) -> Result<()> {
if self.data_size == 0 {
return Ok(());
}
@ -181,7 +181,7 @@ impl<'i> FacetsUpdate<'i> {
}
fn index_facet_search(
wtxn: &mut heed::RwTxn,
wtxn: &mut heed::RwTxn<'_>,
normalized_delta_data: Merger<BufReader<File>, MergeFn>,
index: &Index,
) -> Result<()> {
@ -417,7 +417,7 @@ pub(crate) mod test_helpers {
pub fn insert<'a>(
&self,
wtxn: &'a mut RwTxn,
wtxn: &'a mut RwTxn<'_>,
field_id: u16,
key: &'a <BoundCodec as BytesEncode<'a>>::EItem,
docids: &RoaringBitmap,
@ -434,7 +434,7 @@ pub(crate) mod test_helpers {
}
pub fn delete_single_docid<'a>(
&self,
wtxn: &'a mut RwTxn,
wtxn: &'a mut RwTxn<'_>,
field_id: u16,
key: &'a <BoundCodec as BytesEncode<'a>>::EItem,
docid: u32,
@ -444,7 +444,7 @@ pub(crate) mod test_helpers {
pub fn delete<'a>(
&self,
wtxn: &'a mut RwTxn,
wtxn: &'a mut RwTxn<'_>,
field_id: u16,
key: &'a <BoundCodec as BytesEncode<'a>>::EItem,
docids: &RoaringBitmap,
@ -462,7 +462,7 @@ pub(crate) mod test_helpers {
pub fn bulk_insert<'a, 'b>(
&self,
wtxn: &'a mut RwTxn,
wtxn: &'a mut RwTxn<'_>,
field_ids: &[u16],
els: impl IntoIterator<
Item = &'a ((u16, <BoundCodec as BytesEncode<'a>>::EItem), RoaringBitmap),
@ -498,7 +498,7 @@ pub(crate) mod test_helpers {
update.update(wtxn, field_ids).unwrap();
}
pub fn verify_structure_validity(&self, txn: &RoTxn, field_id: u16) {
pub fn verify_structure_validity(&self, txn: &RoTxn<'_>, field_id: u16) {
let mut field_id_prefix = vec![];
field_id_prefix.extend_from_slice(&field_id.to_be_bytes());