mirror of
https://github.com/meilisearch/MeiliSearch
synced 2025-07-15 13:58:36 +02:00
Make clippy happy
This commit is contained in:
parent
2b1f6a7f11
commit
1b78231e18
19 changed files with 115 additions and 139 deletions
|
@ -659,7 +659,9 @@ mod tests {
|
|||
// Delete some documents.
|
||||
let mut builder = DeleteDocuments::new(wtxn, index).unwrap();
|
||||
builder.strategy(strategy);
|
||||
external_ids.iter().for_each(|id| drop(builder.delete_external_id(id)));
|
||||
external_ids.iter().for_each(|id| {
|
||||
builder.delete_external_id(id);
|
||||
});
|
||||
builder.execute().unwrap();
|
||||
|
||||
ids_to_delete
|
||||
|
|
|
@ -882,6 +882,7 @@ mod tests {
|
|||
}
|
||||
|
||||
#[test]
|
||||
#[allow(clippy::needless_range_loop)]
|
||||
fn delete_shuffled() {
|
||||
let index = FacetIndex::<OrderedF64Codec>::new(4, 8, 5);
|
||||
let mut txn = index.env.write_txn().unwrap();
|
||||
|
|
|
@ -254,7 +254,7 @@ pub(crate) mod test_helpers {
|
|||
max_group_size: u8,
|
||||
min_level_size: u8,
|
||||
) -> FacetIndex<BoundCodec> {
|
||||
let group_size = std::cmp::min(127, std::cmp::max(group_size, 2)); // 2 <= x <= 127
|
||||
let group_size = group_size.clamp(2, 127);
|
||||
let max_group_size = std::cmp::min(127, std::cmp::max(group_size * 2, max_group_size)); // 2*group_size <= x <= 127
|
||||
let min_level_size = std::cmp::max(1, min_level_size); // 1 <= x <= inf
|
||||
let mut options = heed::EnvOpenOptions::new();
|
||||
|
@ -307,7 +307,7 @@ pub(crate) mod test_helpers {
|
|||
min_level_size: self.min_level_size.get(),
|
||||
max_group_size: self.max_group_size.get(),
|
||||
};
|
||||
let key_bytes = BoundCodec::bytes_encode(&key).unwrap();
|
||||
let key_bytes = BoundCodec::bytes_encode(key).unwrap();
|
||||
update.insert(wtxn, field_id, &key_bytes, docids).unwrap();
|
||||
}
|
||||
pub fn delete_single_docid<'a>(
|
||||
|
@ -333,7 +333,7 @@ pub(crate) mod test_helpers {
|
|||
min_level_size: self.min_level_size.get(),
|
||||
max_group_size: self.max_group_size.get(),
|
||||
};
|
||||
let key_bytes = BoundCodec::bytes_encode(&key).unwrap();
|
||||
let key_bytes = BoundCodec::bytes_encode(key).unwrap();
|
||||
update.delete(wtxn, field_id, &key_bytes, docids).unwrap();
|
||||
}
|
||||
|
||||
|
@ -354,7 +354,7 @@ pub(crate) mod test_helpers {
|
|||
let key: FacetGroupKey<&[u8]> =
|
||||
FacetGroupKey { field_id: *field_id, level: 0, left_bound: &left_bound_bytes };
|
||||
let key = FacetGroupKeyCodec::<ByteSliceRefCodec>::bytes_encode(&key).unwrap();
|
||||
let value = CboRoaringBitmapCodec::bytes_encode(&docids).unwrap();
|
||||
let value = CboRoaringBitmapCodec::bytes_encode(docids).unwrap();
|
||||
writer.insert(&key, &value).unwrap();
|
||||
}
|
||||
writer.finish().unwrap();
|
||||
|
@ -381,19 +381,19 @@ pub(crate) mod test_helpers {
|
|||
level_no_prefix.extend_from_slice(&field_id.to_be_bytes());
|
||||
level_no_prefix.push(level_no);
|
||||
|
||||
let mut iter = self
|
||||
let iter = self
|
||||
.content
|
||||
.as_polymorph()
|
||||
.prefix_iter::<_, ByteSlice, FacetGroupValueCodec>(txn, &level_no_prefix)
|
||||
.unwrap();
|
||||
while let Some(el) = iter.next() {
|
||||
for el in iter {
|
||||
let (key, value) = el.unwrap();
|
||||
let key = FacetGroupKeyCodec::<ByteSliceRefCodec>::bytes_decode(&key).unwrap();
|
||||
let key = FacetGroupKeyCodec::<ByteSliceRefCodec>::bytes_decode(key).unwrap();
|
||||
|
||||
let mut prefix_start_below = vec![];
|
||||
prefix_start_below.extend_from_slice(&field_id.to_be_bytes());
|
||||
prefix_start_below.push(level_no - 1);
|
||||
prefix_start_below.extend_from_slice(&key.left_bound);
|
||||
prefix_start_below.extend_from_slice(key.left_bound);
|
||||
|
||||
let start_below = {
|
||||
let mut start_below_iter = self
|
||||
|
@ -405,19 +405,19 @@ pub(crate) mod test_helpers {
|
|||
)
|
||||
.unwrap();
|
||||
let (key_bytes, _) = start_below_iter.next().unwrap().unwrap();
|
||||
FacetGroupKeyCodec::<ByteSliceRefCodec>::bytes_decode(&key_bytes).unwrap()
|
||||
FacetGroupKeyCodec::<ByteSliceRefCodec>::bytes_decode(key_bytes).unwrap()
|
||||
};
|
||||
|
||||
assert!(value.size > 0);
|
||||
|
||||
let mut actual_size = 0;
|
||||
let mut values_below = RoaringBitmap::new();
|
||||
let mut iter_below = self
|
||||
let iter_below = self
|
||||
.content
|
||||
.range(txn, &(start_below..))
|
||||
.unwrap()
|
||||
.take(value.size as usize);
|
||||
while let Some(el) = iter_below.next() {
|
||||
for el in iter_below {
|
||||
let (_, value) = el.unwrap();
|
||||
actual_size += 1;
|
||||
values_below |= value.bitmap;
|
||||
|
@ -438,8 +438,8 @@ pub(crate) mod test_helpers {
|
|||
{
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
let txn = self.env.read_txn().unwrap();
|
||||
let mut iter = self.content.iter(&txn).unwrap();
|
||||
while let Some(el) = iter.next() {
|
||||
let iter = self.content.iter(&txn).unwrap();
|
||||
for el in iter {
|
||||
let (key, value) = el.unwrap();
|
||||
let FacetGroupKey { field_id, level, left_bound: bound } = key;
|
||||
let bound = BoundCodec::bytes_decode(bound).unwrap();
|
||||
|
|
|
@ -1126,14 +1126,14 @@ mod tests {
|
|||
}))
|
||||
.unwrap();
|
||||
|
||||
let mut rtxn = index.read_txn().unwrap();
|
||||
let rtxn = index.read_txn().unwrap();
|
||||
|
||||
assert!(index.word_docids.get(&mut rtxn, "0").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&mut rtxn, "64").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&mut rtxn, "256").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&mut rtxn, "1024").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&mut rtxn, "32768").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&mut rtxn, "65535").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "0").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "64").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "256").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "1024").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "32768").unwrap().is_some());
|
||||
assert!(index.word_docids.get(&rtxn, "65535").unwrap().is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -1539,7 +1539,9 @@ mod tests {
|
|||
|
||||
let mut wtxn = index.write_txn().unwrap();
|
||||
let mut builder = DeleteDocuments::new(&mut wtxn, &index).unwrap();
|
||||
(0..5).for_each(|id| drop(builder.delete_external_id(&id.to_string())));
|
||||
(0..5).for_each(|id| {
|
||||
builder.delete_external_id(&id.to_string());
|
||||
});
|
||||
builder.execute().unwrap();
|
||||
|
||||
index
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue