diff --git a/crates/index-scheduler/src/batch.rs b/crates/index-scheduler/src/batch.rs index 5a1ed3aa7..8e35ec6ac 100644 --- a/crates/index-scheduler/src/batch.rs +++ b/crates/index-scheduler/src/batch.rs @@ -104,7 +104,6 @@ pub(crate) enum IndexOperation { index_uid: String, primary_key: Option, method: IndexDocumentsMethod, - documents_counts: Vec, operations: Vec, tasks: Vec, }, @@ -130,19 +129,6 @@ pub(crate) enum IndexOperation { index_uid: String, cleared_tasks: Vec, - // The boolean indicates if it's a settings deletion or creation. - settings: Vec<(bool, Settings)>, - settings_tasks: Vec, - }, - SettingsAndDocumentOperation { - index_uid: String, - - primary_key: Option, - method: IndexDocumentsMethod, - documents_counts: Vec, - operations: Vec, - document_import_tasks: Vec, - // The boolean indicates if it's a settings deletion or creation. settings: Vec<(bool, Settings)>, settings_tasks: Vec, @@ -174,12 +160,7 @@ impl Batch { IndexOperation::DocumentEdition { task, .. } => { RoaringBitmap::from_sorted_iter(std::iter::once(task.uid)).unwrap() } - IndexOperation::SettingsAndDocumentOperation { - document_import_tasks: tasks, - settings_tasks: other, - .. - } - | IndexOperation::DocumentClearAndSetting { + IndexOperation::DocumentClearAndSetting { cleared_tasks: tasks, settings_tasks: other, .. @@ -239,8 +220,7 @@ impl IndexOperation { | IndexOperation::DocumentDeletion { index_uid, .. } | IndexOperation::DocumentClear { index_uid, .. } | IndexOperation::Settings { index_uid, .. } - | IndexOperation::DocumentClearAndSetting { index_uid, .. } - | IndexOperation::SettingsAndDocumentOperation { index_uid, .. } => index_uid, + | IndexOperation::DocumentClearAndSetting { index_uid, .. } => index_uid, } } } @@ -262,9 +242,6 @@ impl fmt::Display for IndexOperation { IndexOperation::DocumentClearAndSetting { .. } => { f.write_str("IndexOperation::DocumentClearAndSetting") } - IndexOperation::SettingsAndDocumentOperation { .. } => { - f.write_str("IndexOperation::SettingsAndDocumentOperation") - } } } } @@ -330,21 +307,14 @@ impl IndexScheduler { }) .flatten(); - let mut documents_counts = Vec::new(); let mut operations = Vec::new(); for task in tasks.iter() { match task.kind { - KindWithContent::DocumentAdditionOrUpdate { - content_file, - documents_count, - .. - } => { - documents_counts.push(documents_count); + KindWithContent::DocumentAdditionOrUpdate { content_file, .. } => { operations.push(DocumentOperation::Add(content_file)); } KindWithContent::DocumentDeletion { ref documents_ids, .. } => { - documents_counts.push(documents_ids.len() as u64); operations.push(DocumentOperation::Delete(documents_ids.clone())); } _ => unreachable!(), @@ -356,7 +326,6 @@ impl IndexScheduler { index_uid, primary_key, method, - documents_counts, operations, tasks, }, @@ -1243,7 +1212,6 @@ impl IndexScheduler { index_uid: _, primary_key, method, - documents_counts: _, operations, mut tasks, } => { @@ -1633,43 +1601,6 @@ impl IndexScheduler { Ok(tasks) } - IndexOperation::SettingsAndDocumentOperation { - index_uid, - primary_key, - method, - documents_counts, - operations, - document_import_tasks, - settings, - settings_tasks, - } => { - let settings_tasks = self.apply_index_operation( - index_wtxn, - index, - IndexOperation::Settings { - index_uid: index_uid.clone(), - settings, - tasks: settings_tasks, - }, - )?; - - let mut import_tasks = self.apply_index_operation( - index_wtxn, - index, - IndexOperation::DocumentOperation { - index_uid, - primary_key, - method, - documents_counts, - operations, - tasks: document_import_tasks, - }, - )?; - - let mut tasks = settings_tasks; - tasks.append(&mut import_tasks); - Ok(tasks) - } IndexOperation::DocumentClearAndSetting { index_uid, cleared_tasks,