searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-15 13:58:36 +02:00
Code Issues Releases Wiki Activity

fix the tests

Browse source
This commit is contained in:
Tamo 2022-10-03 18:50:06 +02:00 • committed by Clément Renault
parent e3bc87bf22
commit b5ebab5c66
No known key found for this signature in database
GPG key ID: 92ADA4E935E71FA4
9 changed files with 327 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dump/src/reader/v6.rs
View file

@ -4,9 +4,10 @@ use std::{
path::Path,
};
use index::Unchecked;
use index::{Checked, Unchecked};
use tempfile::TempDir;
use time::OffsetDateTime;
use uuid::Uuid;
use crate::{Error, Result, Version};
@ -61,7 +62,7 @@ impl V6Reader {
impl DumpReader for V6Reader {
type Document = serde_json::Map<String, serde_json::Value>;
type Settings = index::Settings<Unchecked>;
type Settings = index::Settings<Checked>;
type Task = index_scheduler::TaskView;
type UpdateFile = File;
@ -76,6 +77,11 @@ impl DumpReader for V6Reader {
Some(self.metadata.dump_date)
}
fn instance_uid(&self) -> Result<Option<Uuid>> {
let uuid = fs::read_to_string(self.dump.path().join("instance-uid"))?;
Ok(Some(Uuid::parse_str(&uuid)?))
}
fn indexes(
&self,
) -> Result<
@ -125,7 +131,11 @@ impl DumpReader for V6Reader {
&mut self,
) -> Box<dyn Iterator<Item = Result<(Self::Task, Option<Self::UpdateFile>)>> + '_> {
Box::new((&mut self.tasks).lines().map(|line| -> Result<_> {
let task: index_scheduler::TaskView = serde_json::from_str(&line?)?;
let mut task: index_scheduler::TaskView = serde_json::from_str(&line?)?;
// TODO: this can be removed once we can `Deserialize` the duration from the `TaskView`.
if let Some((started_at, finished_at)) = task.started_at.zip(task.finished_at) {
task.duration = Some(finished_at - started_at);
}
let update_file_path = self
.dump
.path()
@ -152,7 +162,7 @@ impl DumpReader for V6Reader {
impl IndexReader for V6IndexReader {
type Document = serde_json::Map<String, serde_json::Value>;
type Settings = index::Settings<Unchecked>;
type Settings = index::Settings<Checked>;
fn name(&self) -> &str {
&self.name
@ -165,6 +175,7 @@ impl IndexReader for V6IndexReader {
}
fn settings(&mut self) -> Result<Self::Settings> {
Ok(serde_json::from_reader(&mut self.settings)?)
let settings: index::Settings<Unchecked> = serde_json::from_reader(&mut self.settings)?;
Ok(settings.check())
}
}