snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 02:27:40 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge #3190

Browse Source 
3190: Fix the dump date-import of the dumpv4 r=irevoire a=irevoire

# Pull Request
After merging https://github.com/meilisearch/meilisearch/pull/3012 I realized that the tests on the date of the dump-v4 were still ignored, thus, I fixed them and then noticed #3012 wasn't working properly.

## Related issue
Fixes https://github.com/meilisearch/meilisearch/issues/2987 a second time


`@funilrys` since you wrote most of the code you might be interested, but don't feel obligated to review this code. 
Someone from the team will double-check it works 😁 

Co-authored-by: Tamo <tamo@meilisearch.com>
This commit is contained in:
bors[bot] 2022-12-06 10:47:00 +00:00 committed by GitHub
commit 2867d2e91a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dump/src/reader/mod.rs
View File

@ -299,12 +299,12 @@ pub(crate) mod test {
assert!(indexes.is_empty()); assert!(indexes.is_empty());
// products // products
insta::assert_json_snapshot!(products.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(products.metadata(), @r###"
{ {
"uid": "products", "uid": "products",
"primaryKey": "sku", "primaryKey": "sku",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:39.360187055Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:40.603035979Z"
} }
"###); "###);
@ -314,12 +314,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b01c8371aea4c7171af0d4d846a2bdca"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b01c8371aea4c7171af0d4d846a2bdca");
// movies // movies
insta::assert_json_snapshot!(movies.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(movies.metadata(), @r###"
{ {
"uid": "movies", "uid": "movies",
"primaryKey": "id", "primaryKey": "id",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:38.710611568Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:49.785862546Z"
} }
"###); "###);
@ -329,12 +329,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"786022a66ecb992c8a2a60fee070a5ab"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"786022a66ecb992c8a2a60fee070a5ab");
// spells // spells
insta::assert_json_snapshot!(spells.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(spells.metadata(), @r###"
{ {
"uid": "dnd_spells", "uid": "dnd_spells",
"primaryKey": "index", "primaryKey": "index",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:40.831649057Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:41.116036186Z"
} }
"###); "###);

37
dump/src/reader/v4/mod.rs
View File

@ -167,27 +167,28 @@ impl V4IndexReader {
let task: Task = serde_json::from_str(&line?)?; let task: Task = serde_json::from_str(&line?)?;
if task.index_uid.to_string() == name { if task.index_uid.to_string() == name {
// The first task to match our index_uid that succeeded (ie. processed_at returns Some)
// is our `last_updated_at`.
if updated_at.is_none() { if updated_at.is_none() {
updated_at = task.updated_at() updated_at = task.processed_at()
}
if created_at.is_none() {
created_at = task.created_at()
} }
// Once we reach the `creation_task_id` we can stop iterating on the task queue and
// this task represents our `created_at`.
if task.id as usize == index_metadata.creation_task_id { if task.id as usize == index_metadata.creation_task_id {
created_at = task.processed_at(); created_at = task.created_at();
break; break;
} }
} }
} }
let current_time = OffsetDateTime::now_utc();
let metadata = IndexMetadata { let metadata = IndexMetadata {
uid: name, uid: name,
primary_key: meta.primary_key, primary_key: meta.primary_key,
created_at: created_at.unwrap_or_else(OffsetDateTime::now_utc), created_at: created_at.unwrap_or(current_time),
updated_at: updated_at.unwrap_or_else(OffsetDateTime::now_utc), updated_at: updated_at.unwrap_or(current_time),
}; };
let ret = V4IndexReader { let ret = V4IndexReader {
@ -290,12 +291,12 @@ pub(crate) mod test {
assert!(indexes.is_empty()); assert!(indexes.is_empty());
// products // products
insta::assert_json_snapshot!(products.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(products.metadata(), @r###"
{ {
"uid": "products", "uid": "products",
"primaryKey": "sku", "primaryKey": "sku",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:39.360187055Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:40.603035979Z"
} }
"###); "###);
@ -305,12 +306,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b01c8371aea4c7171af0d4d846a2bdca"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b01c8371aea4c7171af0d4d846a2bdca");
// movies // movies
insta::assert_json_snapshot!(movies.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(movies.metadata(), @r###"
{ {
"uid": "movies", "uid": "movies",
"primaryKey": "id", "primaryKey": "id",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:38.710611568Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:49.785862546Z"
} }
"###); "###);
@ -320,12 +321,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"786022a66ecb992c8a2a60fee070a5ab"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"786022a66ecb992c8a2a60fee070a5ab");
// spells // spells
insta::assert_json_snapshot!(spells.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(spells.metadata(), @r###"
{ {
"uid": "dnd_spells", "uid": "dnd_spells",
"primaryKey": "index", "primaryKey": "index",
"createdAt": "[now]", "createdAt": "2022-10-06T12:53:40.831649057Z",
"updatedAt": "[now]" "updatedAt": "2022-10-06T12:53:41.116036186Z"
} }
"###); "###);

7
dump/src/reader/v4/tasks.rs
View File

@ -111,13 +111,6 @@ impl Task {
} }
} }
pub fn updated_at(&self) -> Option<OffsetDateTime> {
match self.events.last() {
Some(TaskEvent::Created(ts)) => Some(*ts),
_ => None,
}
}
pub fn created_at(&self) -> Option<OffsetDateTime> { pub fn created_at(&self) -> Option<OffsetDateTime> {
match &self.content { match &self.content {
TaskContent::IndexCreation { primary_key: _ } => match self.events.first() { TaskContent::IndexCreation { primary_key: _ } => match self.events.first() {