From f32e6c32fc198848771c21eafba6cc86515d3e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Fri, 10 May 2024 19:42:44 +0200 Subject: [PATCH] Rename editionCode to function --- index-scheduler/src/batch.rs | 21 ++++++++++----------- index-scheduler/src/insta_snapshot.rs | 4 ++-- meilisearch-types/src/task_view.rs | 6 +++--- meilisearch-types/src/tasks.rs | 12 ++++++------ meilisearch/src/routes/indexes/documents.rs | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/index-scheduler/src/batch.rs b/index-scheduler/src/batch.rs index 254af6a1e..04dc49a52 100644 --- a/index-scheduler/src/batch.rs +++ b/index-scheduler/src/batch.rs @@ -1411,28 +1411,27 @@ impl IndexScheduler { Ok(tasks) } IndexOperation::DocumentEdition { mut task, .. } => { - let (filter, edition_code) = - if let KindWithContent::DocumentEdition { filter_expr, edition_code, .. } = + let (filter, function) = + if let KindWithContent::DocumentEdition { filter_expr, function, .. } = &task.kind { - (filter_expr, edition_code) + (filter_expr, function) } else { unreachable!() }; let edited_documents = edit_documents_by_function( index_wtxn, filter, - edition_code, + function, self.index_mapper.indexer_config(), self.must_stop_processing.clone(), index, ); - let (original_filter, edition_code) = - if let Some(Details::DocumentEdition { - original_filter, edition_code, .. - }) = task.details + let (original_filter, function) = + if let Some(Details::DocumentEdition { original_filter, function, .. }) = + task.details { - (original_filter, edition_code) + (original_filter, function) } else { // In the case of a `documentDeleteByFilter` the details MUST be set unreachable!(); @@ -1443,7 +1442,7 @@ impl IndexScheduler { task.status = Status::Succeeded; task.details = Some(Details::DocumentEdition { original_filter, - edition_code, + function, edited_documents: Some(edited_documents), }); } @@ -1451,7 +1450,7 @@ impl IndexScheduler { task.status = Status::Failed; task.details = Some(Details::DocumentEdition { original_filter, - edition_code, + function, edited_documents: Some(0), }); task.error = Some(e.into()); diff --git a/index-scheduler/src/insta_snapshot.rs b/index-scheduler/src/insta_snapshot.rs index f202eca03..b54b43652 100644 --- a/index-scheduler/src/insta_snapshot.rs +++ b/index-scheduler/src/insta_snapshot.rs @@ -179,10 +179,10 @@ fn snapshot_details(d: &Details) -> String { } Details::DocumentEdition { edited_documents, - edition_code, + function, original_filter, } => { - format!("{{ edited_documents: {edited_documents:?}, edition_code: {edition_code:?}, original_filter: {original_filter:?} }}") + format!("{{ edited_documents: {edited_documents:?}, function: {function:?}, original_filter: {original_filter:?} }}") } Details::SettingsUpdate { settings } => { format!("{{ settings: {settings:?} }}") diff --git a/meilisearch-types/src/task_view.rs b/meilisearch-types/src/task_view.rs index b8e55e8a8..a402e470c 100644 --- a/meilisearch-types/src/task_view.rs +++ b/meilisearch-types/src/task_view.rs @@ -72,7 +72,7 @@ pub struct DetailsView { #[serde(skip_serializing_if = "Option::is_none")] pub dump_uid: Option>, #[serde(skip_serializing_if = "Option::is_none")] - pub edition_code: Option, + pub function: Option, #[serde(skip_serializing_if = "Option::is_none")] #[serde(flatten)] pub settings: Option>>, @@ -90,11 +90,11 @@ impl From
for DetailsView { ..DetailsView::default() } } - Details::DocumentEdition { edited_documents, original_filter, edition_code } => { + Details::DocumentEdition { edited_documents, original_filter, function } => { DetailsView { edited_documents: Some(edited_documents), original_filter: Some(original_filter), - edition_code: Some(edition_code), + function: Some(function), ..DetailsView::default() } } diff --git a/meilisearch-types/src/tasks.rs b/meilisearch-types/src/tasks.rs index 0501ed5ff..7edaa2eee 100644 --- a/meilisearch-types/src/tasks.rs +++ b/meilisearch-types/src/tasks.rs @@ -99,7 +99,7 @@ pub enum KindWithContent { DocumentEdition { index_uid: String, filter_expr: Option, - edition_code: String, + function: String, }, DocumentDeletion { index_uid: String, @@ -211,11 +211,11 @@ impl KindWithContent { indexed_documents: None, }) } - KindWithContent::DocumentEdition { index_uid: _, edition_code, filter_expr } => { + KindWithContent::DocumentEdition { index_uid: _, function, filter_expr } => { Some(Details::DocumentEdition { edited_documents: None, original_filter: filter_expr.as_ref().map(|v| v.to_string()), - edition_code: edition_code.clone(), + function: function.clone(), }) } KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => { @@ -266,11 +266,11 @@ impl KindWithContent { indexed_documents: Some(0), }) } - KindWithContent::DocumentEdition { index_uid: _, filter_expr, edition_code } => { + KindWithContent::DocumentEdition { index_uid: _, filter_expr, function } => { Some(Details::DocumentEdition { edited_documents: Some(0), original_filter: filter_expr.as_ref().map(|v| v.to_string()), - edition_code: edition_code.clone(), + function: function.clone(), }) } KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => { @@ -531,7 +531,7 @@ pub enum Details { DocumentEdition { edited_documents: Option, original_filter: Option, - edition_code: String, + function: String, }, SettingsUpdate { settings: Box>, diff --git a/meilisearch/src/routes/indexes/documents.rs b/meilisearch/src/routes/indexes/documents.rs index 5571b02eb..b15232419 100644 --- a/meilisearch/src/routes/indexes/documents.rs +++ b/meilisearch/src/routes/indexes/documents.rs @@ -613,7 +613,7 @@ pub async fn edit_documents_by_function( .map_err(|err| ResponseError::from_msg(err.message, Code::InvalidDocumentFilter))?; } let task = - KindWithContent::DocumentEdition { index_uid, filter_expr: filter, edition_code: function }; + KindWithContent::DocumentEdition { index_uid, filter_expr: filter, function: function }; let uid = get_task_id(&req, &opt)?; let dry_run = is_dry_run(&req, &opt)?;