update tantivy (#5188)

includes cardinality aggregation and term aggregation perf improvement for large "size" parameters
quickwit-oss · Jul 5, 2024 · b373552 · b373552
1 parent 0b4f35f
commit b373552
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml
@@ -325,7 +325,7 @@ quickwit-serve = { path = "quickwit-serve" }
 quickwit-storage = { path = "quickwit-storage" }
 quickwit-telemetry = { path = "quickwit-telemetry" }
 
-tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "08b9fc0", default-features = false, features = [
+tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "13e9885", default-features = false, features = [
   "lz4-compression",
   "mmap",
   "quickwit",

diff --git a/quickwit/quickwit-doc-mapper/src/doc_mapper.rs b/quickwit/quickwit-doc-mapper/src/doc_mapper.rs
@@ -395,7 +395,7 @@ mod tests {
         let (query, _) = doc_mapper.query(schema, &query_ast, true).unwrap();
         assert_eq!(
             format!("{query:?}"),
-            r#"BooleanQuery { subqueries: [(Should, TermQuery(Term(field=1, type=Json, path=toto, type=I64, 5))), (Should, TermQuery(Term(field=1, type=Json, path=toto, type=Str, "5")))] }"#
+            r#"BooleanQuery { subqueries: [(Should, TermQuery(Term(field=1, type=Json, path=toto, type=I64, 5))), (Should, TermQuery(Term(field=1, type=Json, path=toto, type=Str, "5")))], minimum_number_should_match: 1 }"#
         );
     }
 

diff --git a/quickwit/quickwit-indexing/src/actors/indexer.rs b/quickwit/quickwit-indexing/src/actors/indexer.rs
@@ -554,7 +554,6 @@ impl Indexer {
             docstore_blocksize: indexing_settings.docstore_blocksize,
             docstore_compression,
             docstore_compress_dedicated_thread: true,
-            ..Default::default()
         };
         let cooperative_indexing_opt: Option<CooperativeIndexingCycle> =
             cooperative_indexing_permits_opt.map(|cooperative_indexing_permits| {
@@ -881,8 +880,7 @@ mod tests {
             index_checkpoint.source_delta,
             SourceCheckpointDelta::from_range(4..8)
         );
-        let first_split = batch.splits.into_iter().next().unwrap().finalize()?;
-        assert!(first_split.index.settings().sort_by_field.is_none());
+        batch.splits.into_iter().next().unwrap().finalize()?;
         universe.assert_quit().await;
         Ok(())
     }

diff --git a/quickwit/rest-api-tests/scenarii/es_compatibility/0021-cat-indices.yaml b/quickwit/rest-api-tests/scenarii/es_compatibility/0021-cat-indices.yaml
@@ -11,10 +11,10 @@ expected:
   health: green
   index: gharchive
   pri: '1'
-  pri.store.size: 271.8kb
+  pri.store.size: 272.4kb
   rep: '1'
   status: open
-  store.size: 271.8kb
+  store.size: 272.4kb
   #uuid: gharchive:01HN2SDANHDN6WFAFNH7BBMQ8C
 - index: otel-logs-v0_7
   docs.count: '0'
@@ -32,10 +32,10 @@ expected:
   health: green
   index: gharchive
   pri: '1'
-  pri.store.size: 271.8kb
+  pri.store.size: 272.4kb
   rep: '1'
   status: open
-  store.size: 271.8kb
+  store.size: 272.4kb
   #uuid: gharchive:01HN2SDANHDN6WFAFNH7BBMQ8C
 ---
 method: [GET]