snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-07-27 08:41:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add batch_uid to all successful and failed tasks too

Browse Source 
Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
This commit is contained in:
Martin Tzvetanov Grigorov
2025-06-05 11:11:54 +03:00
parent 139ec8c782
commit 9e31d6ceff
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/index-scheduler/src/queue/tasks.rs
View File

@ -530,7 +530,12 @@ impl Queue {
..task ..task
} }
} else { } else {
task dbg!(&task);
if task.status == Status::Succeeded || task.status == Status::Failed {
Task { batch_uid: Some(batch.uid), ..task }
} else {
task
}
} }
}) })
.collect(), .collect(),

20
crates/meilisearch/tests/batches/mod.rs
View File

@ -1,7 +1,7 @@
mod errors; mod errors;
use meili_snap::insta::assert_json_snapshot; use meili_snap::insta::assert_json_snapshot;
use meili_snap::snapshot; use meili_snap::{json_string, snapshot};
use crate::common::Server; use crate::common::Server;
use crate::json; use crate::json;
@ -119,21 +119,21 @@ async fn list_batches_with_star_filters() {
let (response, code) = let (response, code) =
index.service.get("/batches?types=*,documentAdditionOrUpdate&statuses=*").await; index.service.get("/batches?types=*,documentAdditionOrUpdate&statuses=*").await;
assert_eq!(code, 200, "{:?}", response); assert_eq!(code, 200, "{response:?}");
assert_eq!(response["results"].as_array().unwrap().len(), 2); assert_eq!(response["results"].as_array().unwrap().len(), 2);
let (response, code) = index let (response, code) = index
.service .service
.get("/batches?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test") .get("/batches?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test")
.await; .await;
assert_eq!(code, 200, "{:?}", response); assert_eq!(code, 200, "{response:?}");
assert_eq!(response["results"].as_array().unwrap().len(), 2); assert_eq!(response["results"].as_array().unwrap().len(), 2);
let (response, code) = index let (response, code) = index
.service .service
.get("/batches?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test,*") .get("/batches?types=*,documentAdditionOrUpdate&statuses=*,failed&indexUids=test,*")
.await; .await;
assert_eq!(code, 200, "{:?}", response); assert_eq!(code, 200, "{response:?}");
assert_eq!(response["results"].as_array().unwrap().len(), 2); assert_eq!(response["results"].as_array().unwrap().len(), 2);
} }
@ -223,7 +223,7 @@ async fn list_batch_filter_error() {
let (response, code) = server.batches_filter("lol=pied").await; let (response, code) = server.batches_filter("lol=pied").await;
assert_eq!(code, 400, "{response}"); assert_eq!(code, 400, "{response}");
meili_snap::snapshot!(meili_snap::json_string!(response), @r#" snapshot!(json_string!(response), @r#"
{ {
"message": "Unknown parameter `lol`: expected one of `limit`, `from`, `reverse`, `batchUids`, `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`", "message": "Unknown parameter `lol`: expected one of `limit`, `from`, `reverse`, `batchUids`, `uids`, `canceledBy`, `types`, `statuses`, `indexUids`, `afterEnqueuedAt`, `beforeEnqueuedAt`, `afterStartedAt`, `beforeStartedAt`, `afterFinishedAt`, `beforeFinishedAt`",
"code": "bad_request", "code": "bad_request",
@ -234,7 +234,7 @@ async fn list_batch_filter_error() {
let (response, code) = server.batches_filter("uids=pied").await; let (response, code) = server.batches_filter("uids=pied").await;
assert_eq!(code, 400, "{response}"); assert_eq!(code, 400, "{response}");
meili_snap::snapshot!(meili_snap::json_string!(response), @r#" snapshot!(json_string!(response), @r#"
{ {
"message": "Invalid value in parameter `uids`: could not parse `pied` as a positive integer", "message": "Invalid value in parameter `uids`: could not parse `pied` as a positive integer",
"code": "invalid_task_uids", "code": "invalid_task_uids",
@ -245,7 +245,7 @@ async fn list_batch_filter_error() {
let (response, code) = server.batches_filter("from=pied").await; let (response, code) = server.batches_filter("from=pied").await;
assert_eq!(code, 400, "{response}"); assert_eq!(code, 400, "{response}");
meili_snap::snapshot!(meili_snap::json_string!(response), @r#" snapshot!(json_string!(response), @r#"
{ {
"message": "Invalid value in parameter `from`: could not parse `pied` as a positive integer", "message": "Invalid value in parameter `from`: could not parse `pied` as a positive integer",
"code": "invalid_task_from", "code": "invalid_task_from",
@ -256,7 +256,7 @@ async fn list_batch_filter_error() {
let (response, code) = server.batches_filter("beforeStartedAt=pied").await; let (response, code) = server.batches_filter("beforeStartedAt=pied").await;
assert_eq!(code, 400, "{response}"); assert_eq!(code, 400, "{response}");
meili_snap::snapshot!(meili_snap::json_string!(response), @r#" snapshot!(json_string!(response), @r#"
{ {
"message": "Invalid value in parameter `beforeStartedAt`: `pied` is an invalid date-time. It should follow the YYYY-MM-DD or RFC 3339 date-time format.", "message": "Invalid value in parameter `beforeStartedAt`: `pied` is an invalid date-time. It should follow the YYYY-MM-DD or RFC 3339 date-time format.",
"code": "invalid_task_before_started_at", "code": "invalid_task_before_started_at",
@ -685,8 +685,8 @@ async fn test_summarized_settings_update() {
let index = server.unique_index(); let index = server.unique_index();
// here we should find my payload even in the failed batch. // here we should find my payload even in the failed batch.
let (response, code) = index.update_settings(json!({ "rankingRules": ["custom"] })).await; let (response, code) = index.update_settings(json!({ "rankingRules": ["custom"] })).await;
meili_snap::snapshot!(code, @"400 Bad Request"); snapshot!(code, @"400 Bad Request");
meili_snap::snapshot!(meili_snap::json_string!(response), @r###" snapshot!(json_string!(response), @r###"
{ {
"message": "Invalid value at `.rankingRules[0]`: `custom` ranking rule is invalid. Valid ranking rules are words, typo, sort, proximity, attribute, exactness and custom ranking rules.", "message": "Invalid value at `.rankingRules[0]`: `custom` ranking rule is invalid. Valid ranking rules are words, typo, sort, proximity, attribute, exactness and custom ranking rules.",
"code": "invalid_settings_ranking_rules", "code": "invalid_settings_ranking_rules",