diff --git a/meilisearch-core/src/lib.rs b/meilisearch-core/src/lib.rs index 9cec35976..38a1a3c34 100644 --- a/meilisearch-core/src/lib.rs +++ b/meilisearch-core/src/lib.rs @@ -18,13 +18,13 @@ mod query_words_mapper; mod ranked_map; mod raw_document; mod reordered_attrs; -pub mod update; pub mod criterion; pub mod facets; pub mod raw_indexer; -pub mod settings; pub mod serde; +pub mod settings; pub mod store; +pub mod update; pub use self::database::{BoxUpdateFn, Database, DatabaseOptions, MainT, UpdateT}; pub use self::error::{Error, HeedError, FstError, MResult, pest_error, FacetError}; diff --git a/meilisearch-core/src/update/documents_addition.rs b/meilisearch-core/src/update/documents_addition.rs index 3b1ac6810..d9d1af328 100644 --- a/meilisearch-core/src/update/documents_addition.rs +++ b/meilisearch-core/src/update/documents_addition.rs @@ -13,8 +13,7 @@ use crate::database::{UpdateEvent, UpdateEventsEmitter}; use crate::facets; use crate::raw_indexer::RawIndexer; use crate::serde::Deserializer; -use crate::store::{DocumentsFields, DocumentsFieldsCounts}; -use crate::store; +use crate::store::{self, DocumentsFields, DocumentsFieldsCounts}; use crate::update::helpers::{index_value, value_to_number, extract_document_id}; use crate::update::{apply_documents_deletion, compute_short_prefixes, next_update_id, Update}; use crate::{Error, MResult, RankedMap}; @@ -147,7 +146,7 @@ fn index_document( pub fn apply_addition<'a, 'b>( writer: &'a mut heed::RwTxn<'b, MainT>, index: &store::Index, - addition: Vec>, + new_documents: Vec>, partial: bool ) -> MResult<()> { let mut documents_additions = HashMap::new(); @@ -160,7 +159,7 @@ pub fn apply_addition<'a, 'b>( let primary_key = schema.primary_key().ok_or(Error::MissingPrimaryKey)?; // 1. store documents ids for future deletion - for mut document in addition { + for mut document in new_documents { let document_id = extract_document_id(&primary_key, &document)?; if partial { @@ -172,10 +171,8 @@ pub fn apply_addition<'a, 'b>( fields: None, }; - // retrieve the old document and - // update the new one with missing keys found in the old one - let result = Option::>::deserialize(&mut deserializer)?; - if let Some(old_document) = result { + let old_document = Option::>::deserialize(&mut deserializer)?; + if let Some(old_document) = old_document { for (key, value) in old_document { document.entry(key).or_insert(value); } @@ -242,17 +239,17 @@ pub fn apply_addition<'a, 'b>( pub fn apply_documents_partial_addition<'a, 'b>( writer: &'a mut heed::RwTxn<'b, MainT>, index: &store::Index, - addition: Vec>, + new_documents: Vec>, ) -> MResult<()> { - apply_addition(writer, index, addition, true) + apply_addition(writer, index, new_documents, true) } pub fn apply_documents_addition<'a, 'b>( writer: &'a mut heed::RwTxn<'b, MainT>, index: &store::Index, - addition: Vec>, + new_documents: Vec>, ) -> MResult<()> { - apply_addition(writer, index, addition, false) + apply_addition(writer, index, new_documents, false) } pub fn reindex_all_documents(writer: &mut heed::RwTxn, index: &store::Index) -> MResult<()> { diff --git a/meilisearch-core/src/update/mod.rs b/meilisearch-core/src/update/mod.rs index 3a3499c3e..5b7c33c9d 100644 --- a/meilisearch-core/src/update/mod.rs +++ b/meilisearch-core/src/update/mod.rs @@ -49,16 +49,16 @@ impl Update { } } - fn documents_addition(data: Vec>) -> Update { + fn documents_addition(documents: Vec>) -> Update { Update { - data: UpdateData::DocumentsAddition(data), + data: UpdateData::DocumentsAddition(documents), enqueued_at: Utc::now(), } } - fn documents_partial(data: Vec>) -> Update { + fn documents_partial(documents: Vec>) -> Update { Update { - data: UpdateData::DocumentsPartial(data), + data: UpdateData::DocumentsPartial(documents), enqueued_at: Utc::now(), } }