From 3efec70ae21510794697e4f80b6064ace37d7d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 1 Dec 2022 16:41:48 +0100 Subject: [PATCH 1/2] Bump milli to v0.33.6 --- Cargo.lock | 80 +++++++++++++++++++++++++++++++++++--- meilisearch-lib/Cargo.toml | 2 +- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 33da05183..38ef6c561 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1132,6 +1132,15 @@ dependencies = [ "nom_locate", ] +[[package]] +name = "filter-parser" +version = "0.33.6" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.33.6#0998f6b3becacb8c88fe9cad0dc5b17b7fb287da" +dependencies = [ + "nom", + "nom_locate", +] + [[package]] name = "firestorm" version = "0.5.1" @@ -1156,6 +1165,14 @@ dependencies = [ "serde_json", ] +[[package]] +name = "flatten-serde-json" +version = "0.33.6" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.33.6#0998f6b3becacb8c88fe9cad0dc5b17b7fb287da" +dependencies = [ + "serde_json", +] + [[package]] name = "float-cmp" version = "0.9.0" @@ -1673,6 +1690,14 @@ dependencies = [ "serde_json", ] +[[package]] +name = "json-depth-checker" +version = "0.33.6" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.33.6#0998f6b3becacb8c88fe9cad0dc5b17b7fb287da" +dependencies = [ + "serde_json", +] + [[package]] name = "jsonwebtoken" version = "8.1.1" @@ -2014,7 +2039,7 @@ dependencies = [ "enum-iterator 0.7.0", "hmac", "meilisearch-types", - "milli", + "milli 0.33.4", "rand", "serde", "serde_json", @@ -2128,7 +2153,7 @@ dependencies = [ "log", "meilisearch-auth", "meilisearch-types", - "milli", + "milli 0.33.6", "mime", "mockall", "nelson", @@ -2211,15 +2236,60 @@ dependencies = [ "crossbeam-channel", "csv", "either", - "filter-parser", - "flatten-serde-json", + "filter-parser 0.33.4", + "flatten-serde-json 0.33.4", "fst", "fxhash", "geoutils", "grenad", "heed", "itertools", - "json-depth-checker", + "json-depth-checker 0.33.4", + "levenshtein_automata", + "log", + "logging_timer", + "memmap2", + "obkv", + "once_cell", + "ordered-float", + "rayon", + "roaring", + "rstar", + "serde", + "serde_json", + "slice-group-by", + "smallstr", + "smallvec", + "smartstring", + "tempfile", + "thiserror", + "time 0.3.14", + "uuid", +] + +[[package]] +name = "milli" +version = "0.33.6" +source = "git+https://github.com/meilisearch/milli.git?tag=v0.33.6#0998f6b3becacb8c88fe9cad0dc5b17b7fb287da" +dependencies = [ + "bimap", + "bincode", + "bstr", + "byteorder", + "charabia", + "concat-arrays", + "crossbeam-channel", + "csv", + "either", + "filter-parser 0.33.6", + "flatten-serde-json 0.33.6", + "fst", + "fxhash", + "geoutils", + "grenad", + "heed", + "itertools", + "json-depth-checker 0.33.6", "levenshtein_automata", "log", "logging_timer", diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml index 8d2e07dd1..1fe350fe0 100644 --- a/meilisearch-lib/Cargo.toml +++ b/meilisearch-lib/Cargo.toml @@ -28,7 +28,7 @@ lazy_static = "1.4.0" log = "0.4.14" meilisearch-auth = { path = "../meilisearch-auth" } meilisearch-types = { path = "../meilisearch-types" } -milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.33.5" } +milli = { git = "https://github.com/meilisearch/milli.git", tag = "v0.33.6" } mime = "0.3.16" num_cpus = "1.13.1" obkv = "0.2.0" From 236ffce26a07d90eff4ec480b7b785d17c58a644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 1 Dec 2022 16:43:23 +0100 Subject: [PATCH 2/2] Bump Meilisearch to 0.29.3 --- Cargo.lock | 10 +++++----- meilisearch-auth/Cargo.toml | 2 +- meilisearch-http/Cargo.toml | 2 +- meilisearch-lib/Cargo.toml | 2 +- meilisearch-types/Cargo.toml | 2 +- permissive-json-pointer/Cargo.toml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38ef6c561..b1b236812 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2034,7 +2034,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "meilisearch-auth" -version = "0.29.2" +version = "0.29.3" dependencies = [ "enum-iterator 0.7.0", "hmac", @@ -2051,7 +2051,7 @@ dependencies = [ [[package]] name = "meilisearch-http" -version = "0.29.2" +version = "0.29.3" dependencies = [ "actix-cors", "actix-rt", @@ -2126,7 +2126,7 @@ dependencies = [ [[package]] name = "meilisearch-lib" -version = "0.29.2" +version = "0.29.3" dependencies = [ "actix-rt", "actix-web", @@ -2189,7 +2189,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "0.29.2" +version = "0.29.3" dependencies = [ "actix-web", "proptest", @@ -2604,7 +2604,7 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "permissive-json-pointer" -version = "0.29.2" +version = "0.29.3" dependencies = [ "big_s", "serde_json", diff --git a/meilisearch-auth/Cargo.toml b/meilisearch-auth/Cargo.toml index e8bd9bd63..e25ee9b2c 100644 --- a/meilisearch-auth/Cargo.toml +++ b/meilisearch-auth/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-auth" -version = "0.29.2" +version = "0.29.3" edition = "2021" [dependencies] diff --git a/meilisearch-http/Cargo.toml b/meilisearch-http/Cargo.toml index 63f2fb200..91663103f 100644 --- a/meilisearch-http/Cargo.toml +++ b/meilisearch-http/Cargo.toml @@ -4,7 +4,7 @@ description = "Meilisearch HTTP server" edition = "2021" license = "MIT" name = "meilisearch-http" -version = "0.29.2" +version = "0.29.3" [[bin]] name = "meilisearch" diff --git a/meilisearch-lib/Cargo.toml b/meilisearch-lib/Cargo.toml index 1fe350fe0..0db987fe7 100644 --- a/meilisearch-lib/Cargo.toml +++ b/meilisearch-lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-lib" -version = "0.29.2" +version = "0.29.3" edition = "2021" [dependencies] diff --git a/meilisearch-types/Cargo.toml b/meilisearch-types/Cargo.toml index 5e03e050f..3cc0409ee 100644 --- a/meilisearch-types/Cargo.toml +++ b/meilisearch-types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "meilisearch-types" -version = "0.29.2" +version = "0.29.3" authors = ["marin "] edition = "2021" diff --git a/permissive-json-pointer/Cargo.toml b/permissive-json-pointer/Cargo.toml index 21fad5f53..885093bf5 100644 --- a/permissive-json-pointer/Cargo.toml +++ b/permissive-json-pointer/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "permissive-json-pointer" -version = "0.29.2" +version = "0.29.3" edition = "2021" description = "A permissive json pointer" readme = "README.md"