From 2a196b93ee62445e64ac3091079a0da74c1a38bd Mon Sep 17 00:00:00 2001 From: Pascal Seitz Date: Mon, 30 Oct 2023 13:47:37 +0800 Subject: [PATCH] update tantivy --- quickwit/Cargo.lock | 30 ++++++++++++------- quickwit/Cargo.toml | 2 +- .../src/actors/merge_executor.rs | 6 ++-- .../src/split_store/indexing_split_store.rs | 4 +-- 4 files changed, 24 insertions(+), 18 deletions(-) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index a3902f31d5d..8cdf66369de 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -941,6 +941,14 @@ dependencies = [ "serde", ] +[[package]] +name = "bitpacking" +version = "0.8.3" +source = "git+https://github.com/quickwit-oss/bitpacking?rev=f730b75#f730b75598589d7c2a9c4eee3fc17025c59e2b2c" +dependencies = [ + "crunchy", +] + [[package]] name = "bitpacking" version = "0.8.4" @@ -4222,7 +4230,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "ownedbytes" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "stable_deref_trait", ] @@ -7313,13 +7321,13 @@ dependencies = [ [[package]] name = "tantivy" version = "0.21.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "aho-corasick", "arc-swap", "async-trait", "base64 0.21.5", - "bitpacking", + "bitpacking 0.8.3", "byteorder", "census", "crc32fast", @@ -7368,15 +7376,15 @@ dependencies = [ [[package]] name = "tantivy-bitpacker" version = "0.5.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ - "bitpacking", + "bitpacking 0.8.4", ] [[package]] name = "tantivy-columnar" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "fastdivide", "fnv", @@ -7391,7 +7399,7 @@ dependencies = [ [[package]] name = "tantivy-common" version = "0.6.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "async-trait", "byteorder", @@ -7414,7 +7422,7 @@ dependencies = [ [[package]] name = "tantivy-query-grammar" version = "0.21.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "nom", ] @@ -7422,7 +7430,7 @@ dependencies = [ [[package]] name = "tantivy-sstable" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "tantivy-common", "tantivy-fst", @@ -7432,7 +7440,7 @@ dependencies = [ [[package]] name = "tantivy-stacker" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "murmurhash32", "tantivy-common", @@ -7441,7 +7449,7 @@ dependencies = [ [[package]] name = "tantivy-tokenizer-api" version = "0.2.0" -source = "git+https://github.com/quickwit-oss/tantivy/?rev=ecb9a89#ecb9a89a9ff0573fba5c2cf8b83f353f35022310" +source = "git+https://github.com/quickwit-oss/tantivy/?rev=1dda2bb#1dda2bb5371360f7f7afda5481ff5374dd0e051c" dependencies = [ "serde", ] diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index e8f45a7bf5a..d428b7f6dbc 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -234,7 +234,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 = "ecb9a89", default-features = false, features = [ +tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "1dda2bb", default-features = false, features = [ "mmap", "lz4-compression", "zstd-compression", diff --git a/quickwit/quickwit-indexing/src/actors/merge_executor.rs b/quickwit/quickwit-indexing/src/actors/merge_executor.rs index ec616fe8192..2df3af506b0 100644 --- a/quickwit/quickwit-indexing/src/actors/merge_executor.rs +++ b/quickwit/quickwit-indexing/src/actors/merge_executor.rs @@ -41,11 +41,9 @@ use quickwit_proto::metastore::{ }; use quickwit_query::get_quickwit_fastfield_normalizer_manager; use quickwit_query::query_ast::QueryAst; -use tantivy::directory::{DirectoryClone, MmapDirectory, RamDirectory}; +use tantivy::directory::{Advice, DirectoryClone, MmapDirectory, RamDirectory}; use tantivy::tokenizer::TokenizerManager; -use tantivy::{ - Advice, DateTime, Directory, Index, IndexMeta, IndexWriter, SegmentId, SegmentReader, -}; +use tantivy::{DateTime, Directory, Index, IndexMeta, IndexWriter, SegmentId, SegmentReader}; use tokio::runtime::Handle; use tracing::{debug, info, instrument, warn}; diff --git a/quickwit/quickwit-indexing/src/split_store/indexing_split_store.rs b/quickwit/quickwit-indexing/src/split_store/indexing_split_store.rs index 50a849c9dac..87815224dcc 100644 --- a/quickwit/quickwit-indexing/src/split_store/indexing_split_store.rs +++ b/quickwit/quickwit-indexing/src/split_store/indexing_split_store.rs @@ -30,8 +30,8 @@ use quickwit_common::io::{IoControls, IoControlsAccess}; use quickwit_common::uri::Uri; use quickwit_metastore::SplitMetadata; use quickwit_storage::{PutPayload, Storage, StorageResult}; -use tantivy::directory::MmapDirectory; -use tantivy::{Advice, Directory}; +use tantivy::directory::{Advice, MmapDirectory}; +use tantivy::Directory; use time::OffsetDateTime; use tracing::{info, info_span, instrument, Instrument};