Skip to content

Upgrade tantivy to 0.26 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdettai-sk merged 2 commits into from
Apr 15, 2026
Merged

Upgrade tantivy to 0.26 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0608e68
Upgrade tantivy to 0.26
rdettai-sk Apr 15, 2026
68b9c84
Fix aggregation test precision
rdettai-sk Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 43 additions & 31 deletions quickwit/Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ quickwit-storage = { path = "quickwit-storage" }
quickwit-telemetry = { path = "quickwit-telemetry" }


tantivy = { git = "https://github.com/SekoiaLab/tantivy/", rev = "e9aede4", default-features = false, features = [
tantivy = { version = "0.26.0", default-features = false, features = [
"lz4-compression",
"mmap",
"quickwit",
Expand Down
6 changes: 4 additions & 2 deletions quickwit/quickwit-indexing/src/controlled_directory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl Directory for ControlledDirectory {
self.check_if_alive()
.map_err(|io_err| OpenWriteError::wrap_io_error(io_err, path.to_path_buf()))?;

let underlying_wrt: Box<dyn TerminatingWrite> = self
let underlying_wrt: Box<dyn TerminatingWrite + Send + Sync> = self
.underlying
.open_write(path)?
.into_inner()
Expand Down Expand Up @@ -154,7 +154,9 @@ impl IoControlsAccess for HotswappableIoControls {
}

// Wrapper to work around the orphan rule. (hence the word "Adopted").
struct AdoptedControlledWrite(ControlledWrite<HotswappableIoControls, Box<dyn TerminatingWrite>>);
struct AdoptedControlledWrite(
ControlledWrite<HotswappableIoControls, Box<dyn TerminatingWrite + Send + Sync>>,
);

impl io::Write for AdoptedControlledWrite {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
Expand Down
16 changes: 11 additions & 5 deletions quickwit/rest-api-tests/scenarii/aggregations/0001-aggregations.yaml
View file
Open in desktop
Copy link
Copy Markdown
Collaborator Author

@rdettai-sk rdettai-sk Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some changes affected how these are calculated, but the assertions changed here were actually lacking precision already (floating point and approx cardinality).

Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,16 @@ expected:
response:
values:
- key: 85.0
value: 100.49456770856702
value:
$expect: 'abs(val - 100.4945) < 0.1'
- doc_count: 2
key: 1422662400000.0
key_as_string: '2015-01-31T00:00:00Z'
response:
values:
- key: 85.0
value: 30.26717133872237
value:
$expect: 'abs(val - 30.2617) < 0.1'
---
# Test histogram
method: [GET]
Expand Down Expand Up @@ -353,12 +355,16 @@ json:
field: "date"
expected:
aggregations:
# cardinality queries are currently being improved upstream
unique_names:
value: 8.0
value:
$expect: 'abs(val - 8) <= 2'
unique_response:
value: 5.0 # TODO: Check. The correct number is 6
value:
$expect: 'abs(val - 6) <= 2'
unique_dates:
value: 6.0
value:
$expect: 'abs(val - 6) <= 3'
---
# Test extended stats aggregation
method: [GET]
Expand Down
Loading