Skip to content

Commit

Permalink
update tantivy
Browse files Browse the repository at this point in the history
includes cardinality aggregation and term aggregation perf improvement
for large "size" parameters
  • Loading branch information
PSeitz committed Jul 3, 2024
1 parent 694cd5c commit e330113
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
28 changes: 19 additions & 9 deletions quickwit/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion quickwit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,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",
Expand Down
2 changes: 1 addition & 1 deletion quickwit/quickwit-doc-mapper/src/doc_mapper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,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 }"#
);
}

Expand Down
4 changes: 1 addition & 3 deletions quickwit/quickwit-indexing/src/actors/indexer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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| {
Expand Down Expand Up @@ -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(())
}
Expand Down

0 comments on commit e330113

Please sign in to comment.