diff --git a/meilidb-core/src/update/mod.rs b/meilidb-core/src/update/mod.rs index 2e391d770..a395279ad 100644 --- a/meilidb-core/src/update/mod.rs +++ b/meilidb-core/src/update/mod.rs @@ -63,7 +63,7 @@ pub fn update_status( } pub fn push_documents_addition( - writer: &mut rkv::Writer, + mut writer: &mut rkv::Writer, updates_store: store::Updates, addition: Vec, ) -> Result @@ -76,7 +76,9 @@ pub fn push_documents_addition( } let update = Update::DocumentsAddition(values); - Ok(updates_store.push_back(writer, &update)?) + let update_id = updates_store.push_back(writer, &update)?; + + Ok(update_id) } pub fn push_documents_deletion( @@ -86,35 +88,34 @@ pub fn push_documents_deletion( ) -> Result { let update = Update::DocumentsDeletion(deletion); - Ok(updates_store.push_back(writer, &update)?) + let update_id = updates_store.push_back(writer, &update)?; + + Ok(update_id) } pub fn update_task( - rkv: Arc>, + writer: &mut rkv::Writer, index: store::Index, mut callback: Option, ) -> MResult<()> { - let rkv = rkv.read().unwrap(); - let mut writer = rkv.write()?; - - if let Some((update_id, update)) = index.updates.pop_back(&mut writer)? { + if let Some((update_id, update)) = index.updates.pop_back(writer)? { let (update_type, result, duration) = match update { Update::DocumentsAddition(documents) => { let update_type = UpdateType::DocumentsAddition { number: documents.len() }; - let schema = match index.main.schema(&writer)? { + let schema = match index.main.schema(writer)? { Some(schema) => schema, None => return Err(Error::SchemaMissing), }; - let ranked_map = match index.main.ranked_map(&writer)? { + let ranked_map = match index.main.ranked_map(writer)? { Some(ranked_map) => ranked_map, None => RankedMap::default(), }; let start = Instant::now(); let result = apply_documents_addition( - &mut writer, + writer, index.main, index.documents_fields, index.postings_lists, @@ -129,18 +130,18 @@ pub fn update_task( Update::DocumentsDeletion(documents) => { let update_type = UpdateType::DocumentsDeletion { number: documents.len() }; - let schema = match index.main.schema(&writer)? { + let schema = match index.main.schema(writer)? { Some(schema) => schema, None => return Err(Error::SchemaMissing), }; - let ranked_map = match index.main.ranked_map(&writer)? { + let ranked_map = match index.main.ranked_map(writer)? { Some(ranked_map) => ranked_map, None => RankedMap::default(), }; let start = Instant::now(); let result = apply_documents_deletion( - &mut writer, + writer, index.main, index.documents_fields, index.postings_lists, @@ -162,14 +163,12 @@ pub fn update_task( detailed_duration, }; - index.updates_results.put_update_result(&mut writer, update_id, &status)?; + index.updates_results.put_update_result(writer, update_id, &status)?; if let Some(callback) = callback.take() { (callback)(status); } } - writer.commit()?; - Ok(()) }