From 0cd66c3a89576f41b97fab8f4d2e0d1a11841bec Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Mon, 16 Aug 2021 18:45:58 +0200 Subject: [PATCH] Bump the milli version --- Cargo.lock | 87 ++++++++------------ meilisearch-http/src/index/update_handler.rs | 6 -- 2 files changed, 33 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1a495f82..47db33f78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -807,12 +807,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - [[package]] name = "downcast" version = "0.10.0" @@ -1123,15 +1117,14 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "grenad" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a631f65b886f839c561fc5d086ba0fb1a27df5bb52f57439e415238329ce08" +checksum = "7824d499230110f4e4a8d4fd3fd4dc15c1347fce5082e4bba82eef17f43e1ed8" dependencies = [ "bytemuck", "byteorder", "flate2", - "log", - "nix", + "lz4_flex", "snap", "tempfile", "zstd", @@ -1562,6 +1555,15 @@ dependencies = [ "syn 0.15.44", ] +[[package]] +name = "lz4_flex" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827b976d911b5d2e42b2ccfc7c0d2461a1414e8280436885218762fc529b3f8" +dependencies = [ + "twox-hash", +] + [[package]] name = "main_error" version = "0.1.1" @@ -1622,7 +1624,7 @@ dependencies = [ "log", "main_error", "meilisearch-error", - "meilisearch-tokenizer 0.2.4", + "meilisearch-tokenizer", "memmap", "milli", "mime", @@ -1647,7 +1649,7 @@ dependencies = [ "siphasher", "slice-group-by", "structopt", - "sysinfo 0.20.0", + "sysinfo", "tar", "tempdir", "tempfile", @@ -1674,7 +1676,7 @@ dependencies = [ "once_cell", "slice-group-by", "unicode-segmentation", - "whatlang 0.12.0", + "whatlang", ] [[package]] @@ -1704,8 +1706,7 @@ dependencies = [ [[package]] name = "milli" -version = "0.11.0" -source = "git+https://github.com/meilisearch/milli.git?branch=plug-new-indexer#a1dc915af8d62c77f0431bb1d0fc4e53cc35ff42" + dependencies = [ "bstr", "byte-unit", @@ -1726,7 +1727,7 @@ dependencies = [ "linked-hash-map", "log", "logging_timer", - "meilisearch-tokenizer 0.2.3", + "meilisearch-tokenizer", "memmap", "obkv", "once_cell", @@ -1740,7 +1741,6 @@ dependencies = [ "slice-group-by", "smallstr", "smallvec", - "sysinfo 0.19.2", "tempfile", "uuid", ] @@ -1820,18 +1820,6 @@ dependencies = [ "syn 1.0.73", ] -[[package]] -name = "nix" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2722,6 +2710,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stdweb" version = "0.4.20" @@ -2844,22 +2838,6 @@ dependencies = [ "unicode-xid 0.2.2", ] -[[package]] -name = "sysinfo" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7de153d0438a648bb71e06e300e54fc641685e96af96d49b843f43172d341c" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "doc-comment", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi", -] - [[package]] name = "sysinfo" version = "0.20.0" @@ -3115,6 +3093,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "twox-hash" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" +dependencies = [ + "cfg-if 1.0.0", + "static_assertions", +] + [[package]] name = "typenum" version = "1.13.0" @@ -3382,15 +3370,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "whatlang" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0289c1d1548414a5645e6583e118e9c569c579ec2a0c32417cc3dbf7a89075" -dependencies = [ - "hashbrown 0.7.2", -] - [[package]] name = "whatlang" version = "0.12.0" diff --git a/meilisearch-http/src/index/update_handler.rs b/meilisearch-http/src/index/update_handler.rs index 0bca4f9b8..f3977a00d 100644 --- a/meilisearch-http/src/index/update_handler.rs +++ b/meilisearch-http/src/index/update_handler.rs @@ -15,9 +15,7 @@ pub struct UpdateHandler { thread_pool: ThreadPool, log_frequency: usize, max_memory: Option, - linked_hash_map_size: usize, chunk_compression_type: CompressionType, - chunk_fusing_shrink_size: u64, } impl UpdateHandler { @@ -32,9 +30,7 @@ impl UpdateHandler { thread_pool, log_frequency: opt.log_every_n, max_memory: opt.max_memory.map(|m| m.get_bytes() as usize), - linked_hash_map_size: opt.linked_hash_map_size, chunk_compression_type: opt.chunk_compression_type, - chunk_fusing_shrink_size: opt.chunk_fusing_shrink_size.get_bytes(), }) } @@ -52,9 +48,7 @@ impl UpdateHandler { if let Some(max_memory) = self.max_memory { update_builder.max_memory(max_memory); } - update_builder.linked_hash_map_size(self.linked_hash_map_size); update_builder.chunk_compression_type(self.chunk_compression_type); - update_builder.chunk_fusing_shrink_size(self.chunk_fusing_shrink_size); update_builder }