searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

start moving a lot of task types to meilisearch_types

Browse source
This commit is contained in:
Tamo 2022-10-12 00:43:24 +02:00 • committed by Clément Renault
parent 974b40ba04
commit e6c033bd6b
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
18 changed files with 416 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dump/src/reader/compat/v5_to_v6.rs
View file

@ -102,9 +102,7 @@ impl CompatV5ToV6 {
},
v5::tasks::TaskContent::Dump { .. } => v6::Kind::DumpExport,
},
details: todo!(),
/*
task_view.details.map(|details| match details {
details: task_view.details.map(|details| match details {
v5::Details::DocumentAddition {
received_documents,
indexed_documents,
@ -130,9 +128,7 @@ impl CompatV5ToV6 {
}
v5::Details::Dump { dump_uid } => v6::Details::Dump { dump_uid },
}),
*/
error: task_view.error.map(|e| e.into()),
duration: task_view.duration,
enqueued_at: task_view.enqueued_at,
started_at: task_view.started_at,
finished_at: task_view.finished_at,

15
dump/src/reader/v6.rs
View file

@ -21,14 +21,14 @@ pub type Settings<T> = meilisearch_types::settings::Settings<T>;
pub type Checked = meilisearch_types::settings::Checked;
pub type Unchecked = meilisearch_types::settings::Unchecked;
pub type Task = index_scheduler::TaskView;
pub type Task = meilisearch_types::tasks::TaskDump;
pub type Key = meilisearch_auth::Key;
// ===== Other types to clarify the code of the compat module
// everything related to the tasks
pub type Status = index_scheduler::Status;
pub type Kind = index_scheduler::Kind;
pub type Details = index_scheduler::Details;
pub type Status = meilisearch_types::tasks::Status;
pub type Kind = meilisearch_types::tasks::Kind;
pub type Details = meilisearch_types::tasks::Details;
// everything related to the settings
pub type Setting<T> = meilisearch_types::milli::update::Setting<T>;
@ -109,11 +109,8 @@ impl V6Reader {
&mut self,
) -> Box<dyn Iterator<Item = Result<(Task, Option<Box<super::UpdateFile>>)>> + '_> {
Box::new((&mut self.tasks).lines().map(|line| -> Result<_> {
let mut task: index_scheduler::TaskView = todo!(); // serde_json::from_str(&line?)?;
// TODO: this can be removed once we can `Deserialize` the duration from the `TaskView`.
if let Some((started_at, finished_at)) = task.started_at.zip(task.finished_at) {
task.duration = Some(finished_at - started_at);
}
let task: Task = serde_json::from_str(&line?)?;
let update_file_path = self
.dump
.path()