From 1d99c8465c2538b241dd4b12904ea8a9a58f69cb Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Thu, 20 Feb 2025 10:03:48 +0100 Subject: [PATCH] Hide the batch stats to make insta pass --- crates/index-scheduler/src/insta_snapshot.rs | 9 +++++++-- crates/meilisearch-types/src/batches.rs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/index-scheduler/src/insta_snapshot.rs b/crates/index-scheduler/src/insta_snapshot.rs index bb8827fdc..7b667c67b 100644 --- a/crates/index-scheduler/src/insta_snapshot.rs +++ b/crates/index-scheduler/src/insta_snapshot.rs @@ -1,7 +1,7 @@ use std::collections::BTreeSet; use std::fmt::Write; -use meilisearch_types::batches::{Batch, BatchEnqueuedAt}; +use meilisearch_types::batches::{Batch, BatchEnqueuedAt, BatchStats}; use meilisearch_types::heed::types::{SerdeBincode, SerdeJson, Str}; use meilisearch_types::heed::{Database, RoTxn}; use meilisearch_types::milli::{CboRoaringBitmapCodec, RoaringBitmapCodec, BEU32}; @@ -342,6 +342,11 @@ pub fn snapshot_canceled_by(rtxn: &RoTxn, db: Database String { let mut snap = String::new(); let Batch { uid, details, stats, started_at, finished_at, progress: _, enqueued_at } = batch; + let stats = BatchStats { + call_trace: Default::default(), + write_channel_congestion: None, + ..stats.clone() + }; if let Some(finished_at) = finished_at { assert!(finished_at > started_at); } @@ -352,7 +357,7 @@ pub fn snapshot_batch(batch: &Batch) -> String { snap.push('{'); snap.push_str(&format!("uid: {uid}, ")); snap.push_str(&format!("details: {}, ", serde_json::to_string(details).unwrap())); - snap.push_str(&format!("stats: {}, ", serde_json::to_string(stats).unwrap())); + snap.push_str(&format!("stats: {}, ", serde_json::to_string(&stats).unwrap())); snap.push('}'); snap } diff --git a/crates/meilisearch-types/src/batches.rs b/crates/meilisearch-types/src/batches.rs index 40309ce06..5ec9cbd41 100644 --- a/crates/meilisearch-types/src/batches.rs +++ b/crates/meilisearch-types/src/batches.rs @@ -60,7 +60,8 @@ pub struct BatchStats { pub status: BTreeMap, pub types: BTreeMap, pub index_uids: BTreeMap, + #[serde(default, skip_serializing_if = "serde_json::Map::is_empty")] pub call_trace: serde_json::Map, - #[serde(skip_serializing_if = "Option::is_none")] + #[serde(default, skip_serializing_if = "Option::is_none")] pub write_channel_congestion: Option>, }