From f0225b844175df3dba536d55d3c299ce7bbfb0ff Mon Sep 17 00:00:00 2001 From: PSeitz Date: Mon, 16 Oct 2023 14:41:36 +0200 Subject: [PATCH] update tantivy (#3962) * update tantivy * update lru --- quickwit/Cargo.lock | 45 ++++++++++++++++++++++++++++++++------------- quickwit/Cargo.toml | 4 ++-- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index a8a400d0242..ae7c6c840be 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -3509,9 +3509,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ "hashbrown 0.14.1", ] @@ -4200,7 +4200,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "stable_deref_trait", ] @@ -7241,7 +7241,7 @@ dependencies = [ [[package]] name = "tantivy" version = "0.21.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "aho-corasick", "arc-swap", @@ -7254,6 +7254,7 @@ dependencies = [ "crossbeam-channel", "downcast-rs", "fastdivide", + "fnv", "fs4", "futures-util", "htmlescape", @@ -7289,13 +7290,13 @@ dependencies = [ "time", "uuid", "winapi 0.3.9", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] name = "tantivy-bitpacker" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "bitpacking", ] @@ -7303,7 +7304,7 @@ dependencies = [ [[package]] name = "tantivy-columnar" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "fastdivide", "fnv", @@ -7318,7 +7319,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "async-trait", "byteorder", @@ -7341,7 +7342,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.21.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "nom", ] @@ -7349,17 +7350,17 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "tantivy-common", "tantivy-fst", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] name = "tantivy-stacker" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "murmurhash32", "tantivy-common", @@ -7368,7 +7369,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=b700c42#b700c42246f4352dccb8fbd481f80a2a66bbdfb6" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=182f58c#182f58cea6bb012fc81b20a92317484e861e0e80" dependencies = [ "serde", ] @@ -8954,6 +8955,15 @@ dependencies = [ "zstd-safe 6.0.6", ] +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe 7.0.0", +] + [[package]] name = "zstd-safe" version = "5.0.2+zstd.1.5.2" @@ -8974,6 +8984,15 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.8+zstd.1.5.5" diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 0543a8365be..cf9987ada85 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -92,7 +92,7 @@ indicatif = "0.17.3" itertools = "0.11" json_comments = "0.2" libz-sys = "1.1.8" -lru = "0.11" +lru = "0.12" lindera-core = "0.27.0" lindera-dictionary = "0.27.0" lindera-tokenizer = { version = "0.27.0", features = ["ipadic", "ipadic-compress", "cc-cedict", "cc-cedict-compress", "ko-dic", "ko-dic-compress"] } @@ -231,7 +231,7 @@ quickwit-serve = { version = "0.6.3", path = "./quickwit-serve" } quickwit-storage = { version = "0.6.3", path = "./quickwit-storage" } quickwit-telemetry = { version = "0.6.3", path = "./quickwit-telemetry" } -tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "b700c42", default-features = false, features = [ +tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "182f58c", default-features = false, features = [ "mmap", "lz4-compression", "zstd-compression",