fix bugs after rebase

This commit is contained in:
Tamo 2025-01-14 16:36:09 +01:00 committed by Louis Dureuil
parent d3654906bf
commit e70ac35e02
No known key found for this signature in database
4 changed files with 5 additions and 6 deletions

View file

@ -3,7 +3,7 @@ use std::fmt::Display;
use meilisearch_types::batches::BatchId;
use meilisearch_types::error::{Code, ErrorCode};
use meilisearch_types::tasks::{Kind, Status};
use meilisearch_types::{heed, milli, versioning};
use meilisearch_types::{heed, milli};
use thiserror::Error;
use crate::TaskId;

View file

@ -2,7 +2,6 @@ use meilisearch_types::{
milli,
milli::progress::{Progress, VariableNameStep},
tasks::{KindWithContent, Status, Task},
versioning::{VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH},
};
use crate::{processing::UpgradeDatabaseProgress, Error, IndexScheduler, Result};
@ -30,7 +29,8 @@ impl IndexScheduler {
indexes.len() as u32,
));
let index = self.index(uid)?;
milli::update::upgrade::upgrade(&index, from, progress.clone());
milli::update::upgrade::upgrade(&index, from, progress.clone())
.map_err(|e| Error::from_milli(e, Some(uid.to_string())))?;
}
for task in tasks.iter_mut() {