snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-27 04:25:06 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename matchedDocuments into providedIds

Browse Source
This commit is contained in:
Clément Renault 2022-11-17 13:48:23 +01:00
parent 49bc45e0d4
commit 9fe32e1e3b
No known key found for this signature in database
GPG Key ID: 92ADA4E935E71FA4
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dump/src/reader/compat/v5_to_v6.rs
View File

@ -143,7 +143,7 @@ impl CompatV5ToV6 {
received_document_ids, received_document_ids,
deleted_documents, deleted_documents,
} => v6::Details::DocumentDeletion { } => v6::Details::DocumentDeletion {
matched_documents: received_document_ids, provided_ids: received_document_ids,
deleted_documents, deleted_documents,
}, },
v5::Details::ClearAll { deleted_documents } => { v5::Details::ClearAll { deleted_documents } => {

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

@ -1075,7 +1075,7 @@ impl IndexScheduler {
for (task, documents) in tasks.iter_mut().zip(documents) { for (task, documents) in tasks.iter_mut().zip(documents) {
task.status = Status::Succeeded; task.status = Status::Succeeded;
task.details = Some(Details::DocumentDeletion { task.details = Some(Details::DocumentDeletion {
matched_documents: documents.len(), provided_ids: documents.len(),
deleted_documents: Some(deleted_documents.min(documents.len() as u64)), deleted_documents: Some(deleted_documents.min(documents.len() as u64)),
}); });
} }

2
index-scheduler/src/insta_snapshot.rs
View File

@ -175,7 +175,7 @@ fn snapshot_details(d: &Details) -> String {
format!("{{ primary_key: {primary_key:?} }}") format!("{{ primary_key: {primary_key:?} }}")
} }
Details::DocumentDeletion { Details::DocumentDeletion {
matched_documents: received_document_ids, provided_ids: received_document_ids,
deleted_documents, deleted_documents,
} => format!("{{ received_document_ids: {received_document_ids}, deleted_documents: {deleted_documents:?} }}"), } => format!("{{ received_document_ids: {received_document_ids}, deleted_documents: {deleted_documents:?} }}"),
Details::ClearAll { deleted_documents } => { Details::ClearAll { deleted_documents } => {

2
index-scheduler/src/utils.rs
View File

@ -427,7 +427,7 @@ impl IndexScheduler {
_ => panic!(), _ => panic!(),
}, },
Details::DocumentDeletion { Details::DocumentDeletion {
matched_documents: received_document_ids, provided_ids: received_document_ids,
deleted_documents, deleted_documents,
} => { } => {
if let Some(deleted_documents) = deleted_documents { if let Some(deleted_documents) = deleted_documents {

6
meilisearch-http/src/routes/tasks.rs
View File

@ -86,7 +86,7 @@ pub struct DetailsView {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub primary_key: Option<Option<String>>, pub primary_key: Option<Option<String>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub matched_documents: Option<usize>, pub provided_ids: Option<usize>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub deleted_documents: Option<Option<u64>>, pub deleted_documents: Option<Option<u64>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -123,10 +123,10 @@ impl From<Details> for DetailsView {
DetailsView { primary_key: Some(primary_key), ..DetailsView::default() } DetailsView { primary_key: Some(primary_key), ..DetailsView::default() }
} }
Details::DocumentDeletion { Details::DocumentDeletion {
matched_documents: received_document_ids, provided_ids: received_document_ids,
deleted_documents, deleted_documents,
} => DetailsView { } => DetailsView {
matched_documents: Some(received_document_ids), provided_ids: Some(received_document_ids),
deleted_documents: Some(deleted_documents), deleted_documents: Some(deleted_documents),
..DetailsView::default() ..DetailsView::default()
}, },

8
meilisearch-http/tests/tasks/mod.rs
View File

@ -411,7 +411,7 @@ async fn test_summarized_delete_batch() {
"type": "documentDeletion", "type": "documentDeletion",
"canceledBy": null, "canceledBy": null,
"details": { "details": {
"matchedDocuments": 3, "providedIds": 3,
"deletedDocuments": 0 "deletedDocuments": 0
}, },
"error": { "error": {
@ -441,7 +441,7 @@ async fn test_summarized_delete_batch() {
"type": "documentDeletion", "type": "documentDeletion",
"canceledBy": null, "canceledBy": null,
"details": { "details": {
"matchedDocuments": 1, "providedIds": 1,
"deletedDocuments": 0 "deletedDocuments": 0
}, },
"error": null, "error": null,
@ -470,7 +470,7 @@ async fn test_summarized_delete_document() {
"type": "documentDeletion", "type": "documentDeletion",
"canceledBy": null, "canceledBy": null,
"details": { "details": {
"matchedDocuments": 1, "providedIds": 1,
"deletedDocuments": 0 "deletedDocuments": 0
}, },
"error": { "error": {
@ -500,7 +500,7 @@ async fn test_summarized_delete_document() {
"type": "documentDeletion", "type": "documentDeletion",
"canceledBy": null, "canceledBy": null,
"details": { "details": {
"matchedDocuments": 1, "providedIds": 1,
"deletedDocuments": 0 "deletedDocuments": 0
}, },
"error": null, "error": null,

6
meilisearch-types/src/tasks.rs
View File

@ -196,7 +196,7 @@ impl KindWithContent {
} }
KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => { KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => {
Some(Details::DocumentDeletion { Some(Details::DocumentDeletion {
matched_documents: documents_ids.len(), provided_ids: documents_ids.len(),
deleted_documents: None, deleted_documents: None,
}) })
} }
@ -239,7 +239,7 @@ impl KindWithContent {
} }
KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => { KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => {
Some(Details::DocumentDeletion { Some(Details::DocumentDeletion {
matched_documents: documents_ids.len(), provided_ids: documents_ids.len(),
deleted_documents: Some(0), deleted_documents: Some(0),
}) })
} }
@ -466,7 +466,7 @@ pub enum Details {
DocumentAdditionOrUpdate { received_documents: u64, indexed_documents: Option<u64> }, DocumentAdditionOrUpdate { received_documents: u64, indexed_documents: Option<u64> },
SettingsUpdate { settings: Box<Settings<Unchecked>> }, SettingsUpdate { settings: Box<Settings<Unchecked>> },
IndexInfo { primary_key: Option<String> }, IndexInfo { primary_key: Option<String> },
DocumentDeletion { matched_documents: usize, deleted_documents: Option<u64> }, DocumentDeletion { provided_ids: usize, deleted_documents: Option<u64> },
ClearAll { deleted_documents: Option<u64> }, ClearAll { deleted_documents: Option<u64> },
TaskCancelation { matched_tasks: u64, canceled_tasks: Option<u64>, original_filters: String }, TaskCancelation { matched_tasks: u64, canceled_tasks: Option<u64>, original_filters: String },
TaskDeletion { matched_tasks: u64, deleted_tasks: Option<u64>, original_filters: String }, TaskDeletion { matched_tasks: u64, deleted_tasks: Option<u64>, original_filters: String },