snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2025-09-06 04:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests and format

Browse Source
This commit is contained in:
Mubelotix
2025-08-12 17:39:58 +02:00
parent fe275397ec
commit 8990f2a14a
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/dump/src/reader/v6/mod.rs
View File

@ -57,6 +57,7 @@ pub struct V6Reader {
instance_uid: Option<Uuid>,
metadata: Metadata,
tasks: BufReader<File>,
tasks2: BufReader<File>,
batches: Option<BufReader<File>>,
keys: BufReader<File>,
features: Option<RuntimeTogglableFeatures>,
@ -123,6 +124,7 @@ impl V6Reader {
metadata: serde_json::from_reader(&*meta_file)?,
instance_uid,
tasks: BufReader::new(File::open(dump.path().join("tasks").join("queue.jsonl"))?),
tasks2: BufReader::new(File::open(dump.path().join("tasks").join("queue.jsonl"))?),
batches,
keys: BufReader::new(File::open(dump.path().join("keys.jsonl"))?),
features,
@ -188,11 +190,22 @@ impl V6Reader {
}))
}
fn tasks2(&mut self) -> Box<dyn Iterator<Item = Result<Task>> + '_> {
Box::new(
(&mut self.tasks2)
.lines()
.map(|line| -> Result<_> { Ok(serde_json::from_str(&line?)?) }),
)
}
pub fn batches(&mut self) -> Box<dyn Iterator<Item = Result<Batch>> + '_> {
// Get batches but filters batches so that those whose tasks have been deleted are not returned
// This is due to bug #5827 that caused them not to be deleted before version 1.18
let mut task_uids = RoaringBitmap::new();
let mut faulty = false;
for task in self.tasks() {
let Ok((task, _)) = task else {
for task in self.tasks2() {
let Ok(task) = task else {
// If we can't read the tasks, just give up trying to filter the batches
// The database may contain phantom batches, but that's not that big of a deal
faulty = true;