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 #3188

Browse Source 
3188: re-enable the dump test on the dates r=irevoire a=irevoire

I just noticed that we have the real date in the dump-v1 contrarily to the dump-v2/3/4/5, thus we can ensure it doesn't change unexpectedly 👍 

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

24
dump/src/reader/compat/v1_to_v2.rs
View File

@ -1,8 +1,8 @@
use std::{collections::BTreeSet, str::FromStr}; use std::collections::BTreeSet;
use std::str::FromStr;
use crate::reader::{v1, v2, Document};
use super::v2_to_v3::CompatV2ToV3; use super::v2_to_v3::CompatV2ToV3;
use crate::reader::{v1, v2, Document};
use crate::Result; use crate::Result;
pub struct CompatV1ToV2 { pub struct CompatV1ToV2 {
@ -367,12 +367,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-02T13:23:39.976870431Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:27:54.353262482Z"
} }
"###); "###);
@ -382,12 +382,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-02T13:15:29.477512777Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:21:12.671204856Z"
} }
"###); "###);
@ -397,12 +397,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b63dbed5bbc059f3e32bc471ae699bf5"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b63dbed5bbc059f3e32bc471ae699bf5");
// 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-02T13:38:26.358882984Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:38:26.385609433Z"
} }
"###); "###);

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

@ -562,12 +562,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-02T13:23:39.976870431Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:27:54.353262482Z"
} }
"###); "###);
@ -577,12 +577,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-02T13:15:29.477512777Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:21:12.671204856Z"
} }
"###); "###);
@ -592,12 +592,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b63dbed5bbc059f3e32bc471ae699bf5"); meili_snap::snapshot_hash!(format!("{:#?}", documents), @"b63dbed5bbc059f3e32bc471ae699bf5");
// 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-02T13:38:26.358882984Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:38:26.385609433Z"
} }
"###); "###);

31
dump/src/reader/v1/mod.rs
View File

@ -1,15 +1,14 @@
use std::{ use std::fs::{self, File};
fs::{self, File}, use std::io::{BufRead, BufReader};
io::{BufRead, BufReader}, use std::path::{Path, PathBuf};
path::{Path, PathBuf},
};
use serde::Deserialize;
use tempfile::TempDir; use tempfile::TempDir;
use time::OffsetDateTime; use time::OffsetDateTime;
use super::{compat::v1_to_v2::CompatV1ToV2, Document}; use super::compat::v1_to_v2::CompatV1ToV2;
use super::Document;
use crate::{IndexMetadata, Result, Version}; use crate::{IndexMetadata, Result, Version};
use serde::Deserialize;
pub mod settings; pub mod settings;
pub mod update; pub mod update;
@ -204,12 +203,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-02T13:23:39.976870431Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:27:54.353262482Z"
} }
"###); "###);
@ -223,12 +222,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(meili_snap::json_string!(tasks), @"91de507f206ad21964584021932ba7a7"); meili_snap::snapshot_hash!(meili_snap::json_string!(tasks), @"91de507f206ad21964584021932ba7a7");
// 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-02T13:15:29.477512777Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:21:12.671204856Z"
} }
"###); "###);
@ -242,12 +241,12 @@ pub(crate) mod test {
meili_snap::snapshot_hash!(meili_snap::json_string!(tasks), @"55eef4de2bef7e84c5ce0bee47488f56"); meili_snap::snapshot_hash!(meili_snap::json_string!(tasks), @"55eef4de2bef7e84c5ce0bee47488f56");
// spells // spells
insta::assert_json_snapshot!(dnd_spells.metadata(), { ".createdAt" => "[now]", ".updatedAt" => "[now]" }, @r###" insta::assert_json_snapshot!(dnd_spells.metadata(), @r###"
{ {
"uid": "dnd_spells", "uid": "dnd_spells",
"primaryKey": "index", "primaryKey": "index",
"createdAt": "[now]", "createdAt": "2022-10-02T13:38:26.358882984Z",
"updatedAt": "[now]" "updatedAt": "2022-10-02T13:38:26.385609433Z"
} }
"###); "###);