snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-25 19:45:05 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

clippy fixes

Browse Source
This commit is contained in:
Louis Dureuil 2024-10-30 10:06:38 +01:00
parent 1075dd34bb
commit 4ebedf4dc8
No known key found for this signature in database
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
milli/src/update/new/extract/vectors/mod.rs
View File

@ -358,8 +358,7 @@ impl<'a> Chunks<'a> {
fn set_regenerate(&self, docid: DocumentId, regenerate: bool) { fn set_regenerate(&self, docid: DocumentId, regenerate: bool) {
let mut user_provided = self.user_provided.borrow_mut(); let mut user_provided = self.user_provided.borrow_mut();
let user_provided = let user_provided = user_provided.entry_ref(self.embedder_name).or_default();
user_provided.entry_ref(self.embedder_name).or_insert(Default::default());
if regenerate { if regenerate {
// regenerate == !user_provided // regenerate == !user_provided
user_provided.del.get_or_insert(Default::default()).insert(docid); user_provided.del.get_or_insert(Default::default()).insert(docid);

2
milli/src/update/new/indexer/de.rs
View File

@ -49,7 +49,7 @@ impl<'de, 'p, 'indexer: 'de, Mapper: MutFieldIdMapper> Visitor<'de>
visitor: MutFieldIdMapVisitor(self.fields_ids_map), visitor: MutFieldIdMapVisitor(self.fields_ids_map),
})? })?
{ {
let Some(fid) = fid else { let Some(_fid) = fid else {
return Ok(Err(crate::UserError::AttributeLimitReached)); return Ok(Err(crate::UserError::AttributeLimitReached));
}; };
self.fields_ids_map = fields_ids_map; self.fields_ids_map = fields_ids_map;

2
milli/src/update/new/indexer/document_operation.rs
View File

@ -9,7 +9,7 @@ use IndexDocumentsMethod as Idm;
use super::super::document_change::DocumentChange; use super::super::document_change::DocumentChange;
use super::document_changes::{DocumentChangeContext, DocumentChanges, MostlySend}; use super::document_changes::{DocumentChangeContext, DocumentChanges, MostlySend};
use crate::documents::PrimaryKey; use crate::documents::PrimaryKey;
use crate::update::new::document::{DocumentFromVersions, Versions}; use crate::update::new::document::Versions;
use crate::update::new::{Deletion, Insertion, Update}; use crate::update::new::{Deletion, Insertion, Update};
use crate::update::{AvailableIds, IndexDocumentsMethod}; use crate::update::{AvailableIds, IndexDocumentsMethod};
use crate::{DocumentId, Error, FieldsIdsMap, Index, Result, UserError}; use crate::{DocumentId, Error, FieldsIdsMap, Index, Result, UserError};

7
milli/src/update/new/indexer/mod.rs
View File

@ -16,12 +16,11 @@ use itertools::{EitherOrBoth, Itertools};
pub use partial_dump::PartialDump; pub use partial_dump::PartialDump;
use rand::SeedableRng as _; use rand::SeedableRng as _;
use rayon::ThreadPool; use rayon::ThreadPool;
use roaring::RoaringBitmap;
use time::OffsetDateTime; use time::OffsetDateTime;
pub use update_by_function::UpdateByFunction; pub use update_by_function::UpdateByFunction;
use super::channel::*; use super::channel::*;
use super::document::write_to_obkv; use super::document::{write_to_obkv, Document};
use super::document_change::DocumentChange; use super::document_change::DocumentChange;
use super::extract::*; use super::extract::*;
use super::merger::{merge_grenad_entries, FacetFieldIdsDelta}; use super::merger::{merge_grenad_entries, FacetFieldIdsDelta};
@ -252,7 +251,7 @@ where
} }
/// FIXME: need access to `merger_sender` /// FIXME: need access to `merger_sender`
let embedding_sender = todo!(); let embedding_sender = todo!();
let extractor = EmbeddingExtractor::new(&embedders, &embedding_sender, request_threads()); let extractor = EmbeddingExtractor::new(embedders, &embedding_sender, request_threads());
let datastore = ThreadLocal::with_capacity(pool.current_num_threads()); let datastore = ThreadLocal::with_capacity(pool.current_num_threads());
for_each_document_change(document_changes, &extractor, indexing_context, &mut extractor_allocs, &datastore)?; for_each_document_change(document_changes, &extractor, indexing_context, &mut extractor_allocs, &datastore)?;
@ -324,7 +323,7 @@ where
.inner_as_ref() .inner_as_ref()
.iter() .iter()
.map(|(embedder_name, (embedder, _, was_quantized))| { .map(|(embedder_name, (embedder, _, was_quantized))| {
let embedder_index = index.embedder_category_id.get(wtxn, &embedder_name)?.ok_or( let embedder_index = index.embedder_category_id.get(wtxn, embedder_name)?.ok_or(
InternalError::DatabaseMissingEntry { InternalError::DatabaseMissingEntry {
db_name: "embedder_category_id", db_name: "embedder_category_id",
key: None, key: None,