From 37a692f942253c128980e31e6d3be75b94a12a0e Mon Sep 17 00:00:00 2001 From: Mubelotix Date: Tue, 1 Jul 2025 14:47:43 +0200 Subject: [PATCH] Keep `IndexUidPattern` --- .../src/scheduler/process_export.rs | 4 ++-- crates/meilisearch-types/src/tasks.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/index-scheduler/src/scheduler/process_export.rs b/crates/index-scheduler/src/scheduler/process_export.rs index b5134deb9..eaad7aa34 100644 --- a/crates/index-scheduler/src/scheduler/process_export.rs +++ b/crates/index-scheduler/src/scheduler/process_export.rs @@ -30,7 +30,7 @@ impl IndexScheduler { payload_size: Option<&Byte>, indexes: &BTreeMap, progress: Progress, - ) -> Result> { + ) -> Result> { #[cfg(test)] self.maybe_fail(crate::test_utils::FailureLocation::ProcessExport)?; @@ -157,7 +157,7 @@ impl IndexScheduler { progress.update_progress(progress_step); output.insert( - uid.clone(), + IndexUidPattern::new_unchecked(uid.clone()), DetailsExportIndexSettings { settings: (*export_settings).clone(), matched_documents: Some(total_documents as u64), diff --git a/crates/meilisearch-types/src/tasks.rs b/crates/meilisearch-types/src/tasks.rs index 423cf539e..99b04f1e3 100644 --- a/crates/meilisearch-types/src/tasks.rs +++ b/crates/meilisearch-types/src/tasks.rs @@ -289,12 +289,12 @@ impl KindWithContent { }), KindWithContent::DumpCreation { .. } => Some(Details::Dump { dump_uid: None }), KindWithContent::SnapshotCreation => None, - KindWithContent::Export { url, api_key, payload_size, indexes: _ } => { + KindWithContent::Export { url, api_key, payload_size, indexes } => { Some(Details::Export { url: url.clone(), api_key: api_key.clone(), payload_size: *payload_size, - indexes: BTreeMap::new(), + indexes: indexes.iter().map(|(p, s)| (p.clone(), s.clone().into())).collect(), }) } KindWithContent::UpgradeDatabase { from } => Some(Details::UpgradeDatabase { @@ -363,12 +363,12 @@ impl KindWithContent { }), KindWithContent::DumpCreation { .. } => Some(Details::Dump { dump_uid: None }), KindWithContent::SnapshotCreation => None, - KindWithContent::Export { url, api_key, payload_size, indexes: _ } => { + KindWithContent::Export { url, api_key, payload_size, indexes } => { Some(Details::Export { url: url.clone(), api_key: api_key.clone(), payload_size: *payload_size, - indexes: BTreeMap::new(), + indexes: indexes.iter().map(|(p, s)| (p.clone(), s.clone().into())).collect(), }) } KindWithContent::UpgradeDatabase { from } => Some(Details::UpgradeDatabase { @@ -419,12 +419,12 @@ impl From<&KindWithContent> for Option
{ }), KindWithContent::DumpCreation { .. } => Some(Details::Dump { dump_uid: None }), KindWithContent::SnapshotCreation => None, - KindWithContent::Export { url, api_key, payload_size, indexes: _ } => { + KindWithContent::Export { url, api_key, payload_size, indexes } => { Some(Details::Export { url: url.clone(), api_key: api_key.clone(), payload_size: *payload_size, - indexes: BTreeMap::new(), + indexes: indexes.iter().map(|(p, s)| (p.clone(), s.clone().into())).collect(), }) } KindWithContent::UpgradeDatabase { from } => Some(Details::UpgradeDatabase { @@ -696,7 +696,7 @@ pub enum Details { url: String, api_key: Option, payload_size: Option, - indexes: BTreeMap, + indexes: BTreeMap, }, UpgradeDatabase { from: (u32, u32, u32),