diff --git a/Cargo.lock b/Cargo.lock index 06e930f..b11b986 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,6 +55,12 @@ version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + [[package]] name = "async-stream" version = "0.3.3" @@ -188,7 +194,7 @@ dependencies = [ "serde", "serde_json", "signal-hook", - "tantivy", + "tantivy 0.19.2", "tempdir", "thiserror", "time", @@ -722,8 +728,22 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dff2ee906bb242438742b5ecac909c0719cbd9db546f6c3d9ac86bd93f5b07e" dependencies = [ - "tantivy-bitpacker", - "tantivy-common", + "tantivy-bitpacker 0.2.0", + "tantivy-common 0.3.0", +] + +[[package]] +name = "fastfield_codecs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374a3a53c1bd5fb31b10084229290eafb0a05f260ec90f1f726afffda4877a8a" +dependencies = [ + "fastdivide", + "itertools", + "log", + "ownedbytes 0.4.0", + "tantivy-bitpacker 0.3.0", + "tantivy-common 0.4.0", ] [[package]] @@ -1356,7 +1376,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dabdf971e0cce1071abf88ae51175d0013f7670f7734b4a1747df25552fd3cf7" dependencies = [ "lindera", - "tantivy", + "tantivy 0.18.1", ] [[package]] @@ -1406,6 +1426,7 @@ checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ "cfg-if 1.0.0", "generator", + "pin-utils", "scoped-tls", "tracing", "tracing-subscriber", @@ -1664,9 +1685,9 @@ checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "oneshot" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b8d98df258e762e901eb4349d66d5a5f5a7a994db8df82ff596011773be535" +checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb" dependencies = [ "loom", ] @@ -1707,6 +1728,15 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "ownedbytes" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e957eaa64a299f39755416e5b3128c505e9d63a91d0453771ad2ccd3907f8db" +dependencies = [ + "stable_deref_trait", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2144,6 +2174,12 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + [[package]] name = "rustversion" version = "1.0.8" @@ -2330,9 +2366,9 @@ checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" [[package]] name = "tantivy" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3da9d47a874779d5a97c5f01c2d0a85fc96e38ed6d51ad21a3cf6d6eb8c47" +checksum = "69d1878f2daa432d6b907e1a7e16a25ba7eab6cc0da059e69943276a5165d81b" dependencies = [ "async-trait", "base64", @@ -2344,7 +2380,7 @@ dependencies = [ "downcast-rs", "fail", "fastdivide", - "fastfield_codecs", + "fastfield_codecs 0.2.0", "fnv", "fs2", "htmlescape", @@ -2359,7 +2395,7 @@ dependencies = [ "num_cpus", "once_cell", "oneshot", - "ownedbytes", + "ownedbytes 0.3.0", "pretty_assertions", "rayon", "regex", @@ -2368,10 +2404,62 @@ dependencies = [ "serde_json", "smallvec", "stable_deref_trait", - "tantivy-bitpacker", - "tantivy-common", - "tantivy-fst", - "tantivy-query-grammar", + "tantivy-bitpacker 0.2.0", + "tantivy-common 0.3.0", + "tantivy-fst 0.3.0", + "tantivy-query-grammar 0.18.0", + "tempfile", + "thiserror", + "time", + "uuid", + "winapi", +] + +[[package]] +name = "tantivy" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb26a6b22c84d8be41d99a14016d6f04d30d8d31a2ea411a8ab553af5cc490d" +dependencies = [ + "aho-corasick", + "arc-swap", + "async-trait", + "base64", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fail", + "fastdivide", + "fastfield_codecs 0.3.1", + "fs2", + "htmlescape", + "itertools", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "murmurhash32", + "num_cpus", + "once_cell", + "oneshot", + "ownedbytes 0.4.0", + "rayon", + "regex", + "rust-stemmers", + "rustc-hash", + "serde", + "serde_json", + "smallvec", + "stable_deref_trait", + "tantivy-bitpacker 0.3.0", + "tantivy-common 0.4.0", + "tantivy-fst 0.4.0", + "tantivy-query-grammar 0.19.0", "tempfile", "thiserror", "time", @@ -2385,6 +2473,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90f95c862d26a32e1fdb161ab139c5a3bba221f5fac512af40034e13e25f3131" +[[package]] +name = "tantivy-bitpacker" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e71a0c95b82d4292b097a09b989a6380d28c3a86800c841a2d03bae1fc8b9fa6" + [[package]] name = "tantivy-common" version = "0.3.0" @@ -2392,7 +2486,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dec19155b3ed963ae1653bc4995ab8175281f68400c39081205ae25b53fd9750" dependencies = [ "byteorder", - "ownedbytes", + "ownedbytes 0.3.0", +] + +[[package]] +name = "tantivy-common" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14fef4182bb60df9a4b92cd8ecab39ba2e50a05542934af17eef1f49660705cb" +dependencies = [ + "byteorder", + "ownedbytes 0.4.0", ] [[package]] @@ -2406,6 +2510,17 @@ dependencies = [ "utf8-ranges", ] +[[package]] +name = "tantivy-fst" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3c506b1a8443a3a65352df6382a1fb6a7afe1a02e871cee0d25e2c3d5f3944" +dependencies = [ + "byteorder", + "regex-syntax 0.6.27", + "utf8-ranges", +] + [[package]] name = "tantivy-query-grammar" version = "0.18.0" @@ -2417,6 +2532,17 @@ dependencies = [ "regex", ] +[[package]] +name = "tantivy-query-grammar" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343e3ada4c1c480953f6960f8a21ce9c76611480ffdd4f4e230fdddce0fc5331" +dependencies = [ + "combine", + "once_cell", + "regex", +] + [[package]] name = "tar" version = "0.4.38" diff --git a/bayard/Cargo.toml b/bayard/Cargo.toml index 00b92e6..02e0d29 100644 --- a/bayard/Cargo.toml +++ b/bayard/Cargo.toml @@ -37,7 +37,7 @@ regex = "1.6.0" serde = { version = "1.0.145", features = ["derive"] } serde_json = "1.0.86" signal-hook = { version = "0.3.14", features = ["extended-siginfo"] } -tantivy = "0.18.0" +tantivy = "0.19.2" thiserror = "1.0.37" time = { version = "0.3.15", features = ["std"] } tokio = { version = "1.21.1", features = ["full"] }