snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-12-02 01:55:03 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge #2995

Browse Source 
2995: merge the settings and do one indexation at the end r=irevoire a=irevoire



Co-authored-by: Irevoire <tamo@meilisearch.com>
This commit is contained in:
bors[bot] 2022-10-27 21:24:21 +00:00 committed by GitHub
commit dd1011ba76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index-scheduler/src/batch.rs
View File

@ -84,7 +84,7 @@ pub(crate) enum IndexOperation {
}, },
Settings { Settings {
index_uid: String, index_uid: String,
// TODO what's that boolean, does it mean that it removes things or what? // The boolean indicates if it's a settings deletion or creation.
settings: Vec<(bool, Settings<Unchecked>)>, settings: Vec<(bool, Settings<Unchecked>)>,
tasks: Vec<Task>, tasks: Vec<Task>,
}, },
@ -92,7 +92,7 @@ pub(crate) enum IndexOperation {
index_uid: String, index_uid: String,
cleared_tasks: Vec<Task>, cleared_tasks: Vec<Task>,
// TODO what's that boolean, does it mean that it removes things or what? // The boolean indicates if it's a settings deletion or creation.
settings: Vec<(bool, Settings<Unchecked>)>, settings: Vec<(bool, Settings<Unchecked>)>,
settings_tasks: Vec<Task>, settings_tasks: Vec<Task>,
}, },
@ -105,7 +105,7 @@ pub(crate) enum IndexOperation {
content_files: Vec<Uuid>, content_files: Vec<Uuid>,
document_import_tasks: Vec<Task>, document_import_tasks: Vec<Task>,
// TODO what's that boolean, does it mean that it removes things or what? // The boolean indicates if it's a settings deletion or creation.
settings: Vec<(bool, Settings<Unchecked>)>, settings: Vec<(bool, Settings<Unchecked>)>,
settings_tasks: Vec<Task>, settings_tasks: Vec<Task>,
}, },
@ -1049,23 +1049,24 @@ impl IndexScheduler {
} }
IndexOperation::Settings { index_uid: _, settings, mut tasks } => { IndexOperation::Settings { index_uid: _, settings, mut tasks } => {
let indexer_config = self.index_mapper.indexer_config(); let indexer_config = self.index_mapper.indexer_config();
// TODO merge the settings to only do *one* reindexation. let mut builder = milli::update::Settings::new(index_wtxn, index, indexer_config);
for (task, (_, settings)) in tasks.iter_mut().zip(settings) { for (task, (_, settings)) in tasks.iter_mut().zip(settings) {
let checked_settings = settings.clone().check(); let checked_settings = settings.clone().check();
task.details = Some(Details::SettingsUpdate { settings: Box::new(settings) }); task.details = Some(Details::SettingsUpdate { settings: Box::new(settings) });
let mut builder =
milli::update::Settings::new(index_wtxn, index, indexer_config);
apply_settings_to_builder(&checked_settings, &mut builder); apply_settings_to_builder(&checked_settings, &mut builder);
// We can apply the status right now and if an update fail later
// the whole batch will be marked as failed.
task.status = Status::Succeeded;
}
let must_stop_processing = self.must_stop_processing.clone(); let must_stop_processing = self.must_stop_processing.clone();
builder.execute( builder.execute(
|indexing_step| debug!("update: {:?}", indexing_step), |indexing_step| debug!("update: {:?}", indexing_step),
|| must_stop_processing.get(), || must_stop_processing.get(),
)?; )?;
task.status = Status::Succeeded;
}
Ok(tasks) Ok(tasks)
} }
IndexOperation::SettingsAndDocumentImport { IndexOperation::SettingsAndDocumentImport {