update tantivy

quickwit-oss · Oct 30, 2023 · ebc0a31 · ebc0a31
1 parent 601c231
commit ebc0a31
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git 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
@@ -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
@@ -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};
 

diff --git a/quickwit/quickwit-search/src/collector.rs b/quickwit/quickwit-search/src/collector.rs
@@ -1227,8 +1227,9 @@ mod tests {
     }
 
     fn make_index() -> tantivy::Index {
+        use tantivy::indexer::UserOperation;
         use tantivy::schema::{NumericOptions, Schema};
-        use tantivy::{Index, UserOperation};
+        use tantivy::Index;
 
         let dataset = sort_dataset();