snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-26 12:05:05 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update to latest milli and deserr

Browse Source
This commit is contained in:
Loïc Lecrenier 2023-01-17 13:10:38 +01:00
parent b781f9a0f9
commit c71a8ea183
4 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Cargo.lock generated
View File

@ -1009,39 +1009,20 @@ dependencies = [
[[package]] [[package]]
name = "deserr" name = "deserr"
version = "0.1.4" version = "0.1.5"
dependencies = [
"deserr-internal 0.1.4",
"serde-cs",
"serde_json",
]
[[package]]
name = "deserr"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86290491a2b5c21a1a5083da8dae831006761258fabd5617309c3eebc5f89468" checksum = "5d3c6417f0bf7561774690e3d47f9659b0cbc3614c7af7bfda404fda7a2c11d3"
dependencies = [ dependencies = [
"deserr-internal 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "deserr-internal",
"serde-cs", "serde-cs",
"serde_json", "serde_json",
] ]
[[package]] [[package]]
name = "deserr-internal" name = "deserr-internal"
version = "0.1.4" version = "0.1.5"
dependencies = [
"convert_case 0.5.0",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "deserr-internal"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7131de1c27581bc376a22166c9f570be91b76cb096be2f6aecf224c27bf7c49a" checksum = "196415cbd3b782cddecbdd69da18cd9b19e1bb0bdbb649e87b5afd83fa8d322b"
dependencies = [ dependencies = [
"convert_case 0.5.0", "convert_case 0.5.0",
"proc-macro2", "proc-macro2",
@ -1319,7 +1300,8 @@ dependencies = [
[[package]] [[package]]
name = "filter-parser" name = "filter-parser"
version = "0.38.0" version = "0.39.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
dependencies = [ dependencies = [
"nom", "nom",
"nom_locate", "nom_locate",
@ -1337,7 +1319,8 @@ dependencies = [
[[package]] [[package]]
name = "flatten-serde-json" name = "flatten-serde-json"
version = "0.38.0" version = "0.39.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
dependencies = [ dependencies = [
"serde_json", "serde_json",
] ]
@ -1901,7 +1884,8 @@ dependencies = [
[[package]] [[package]]
name = "json-depth-checker" name = "json-depth-checker"
version = "0.38.0" version = "0.39.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
dependencies = [ dependencies = [
"serde_json", "serde_json",
] ]
@ -2308,7 +2292,7 @@ dependencies = [
"cargo_toml", "cargo_toml",
"clap 4.0.32", "clap 4.0.32",
"crossbeam-channel", "crossbeam-channel",
"deserr 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "deserr",
"dump", "dump",
"either", "either",
"env_logger", "env_logger",
@ -2399,7 +2383,7 @@ dependencies = [
"anyhow", "anyhow",
"convert_case 0.6.0", "convert_case 0.6.0",
"csv", "csv",
"deserr 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "deserr",
"either", "either",
"enum-iterator", "enum-iterator",
"file-store", "file-store",
@ -2447,7 +2431,8 @@ dependencies = [
[[package]] [[package]]
name = "milli" name = "milli"
version = "0.38.0" version = "0.39.1"
source = "git+https://github.com/meilisearch/milli.git?tag=v0.39.1#0c7d1f761e5db6d086f27d3f0f47a97c7f4a5f08"
dependencies = [ dependencies = [
"bimap", "bimap",
"bincode", "bincode",
@ -2457,7 +2442,7 @@ dependencies = [
"concat-arrays", "concat-arrays",
"crossbeam-channel", "crossbeam-channel",
"csv", "csv",
"deserr 0.1.4", "deserr",
"either", "either",
"filter-parser", "filter-parser",
"flatten-serde-json", "flatten-serde-json",

4
meilisearch-types/Cargo.toml
View File

@ -9,14 +9,14 @@ actix-web = { version = "4.2.1", default-features = false }
anyhow = "1.0.65" anyhow = "1.0.65"
convert_case = "0.6.0" convert_case = "0.6.0"
csv = "1.1.6" csv = "1.1.6"
deserr = "0.1.4" deserr = "0.1.5"
either = { version = "1.6.1", features = ["serde"] } either = { version = "1.6.1", features = ["serde"] }
enum-iterator = "1.1.3" enum-iterator = "1.1.3"
file-store = { path = "../file-store" } file-store = { path = "../file-store" }
flate2 = "1.0.24" flate2 = "1.0.24"
fst = "0.4.7" fst = "0.4.7"
memmap2 = "0.5.7" memmap2 = "0.5.7"
milli = { path = "/Users/meilisearch/Documents/milli2/milli", default-features = false } milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.39.1", default-features = false }
roaring = { version = "0.10.0", features = ["serde"] } roaring = { version = "0.10.0", features = ["serde"] }
serde = { version = "1.0.145", features = ["derive"] } serde = { version = "1.0.145", features = ["derive"] }
serde-cs = "0.2.4" serde-cs = "0.2.4"

3
meilisearch-types/src/lib.rs
View File

@ -8,10 +8,11 @@ pub mod settings;
pub mod star_or; pub mod star_or;
pub mod tasks; pub mod tasks;
pub mod versioning; pub mod versioning;
pub use milli;
pub use milli::{heed, Index}; pub use milli::{heed, Index};
pub use serde_cs;
use uuid::Uuid; use uuid::Uuid;
pub use versioning::VERSION_FILE_NAME; pub use versioning::VERSION_FILE_NAME;
pub use {milli, serde_cs};
pub type Document = serde_json::Map<String, serde_json::Value>; pub type Document = serde_json::Map<String, serde_json::Value>;
pub type InstanceUid = Uuid; pub type InstanceUid = Uuid;

2
meilisearch/Cargo.toml
View File

@ -19,7 +19,7 @@ byte-unit = { version = "4.0.14", default-features = false, features = ["std", "
bytes = "1.2.1" bytes = "1.2.1"
clap = { version = "4.0.9", features = ["derive", "env"] } clap = { version = "4.0.9", features = ["derive", "env"] }
crossbeam-channel = "0.5.6" crossbeam-channel = "0.5.6"
deserr = "0.1.4" deserr = "0.1.5"
dump = { path = "../dump" } dump = { path = "../dump" }
either = "1.8.0" either = "1.8.0"
env_logger = "0.9.1" env_logger = "0.9.1"