From ad17a73b05fb5806769ff77277da81050b2051c8 Mon Sep 17 00:00:00 2001 From: Adrien Guillo Date: Tue, 4 Nov 2025 14:20:43 -0500 Subject: [PATCH 1/3] Upgrade Rust to 1.91 --- .../quickwit-proto/src/codegen/quickwit/quickwit.search.rs | 3 +++ quickwit/rust-toolchain.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.search.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.search.rs index cd051fb9c33..1161416a2c1 100644 --- a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.search.rs +++ b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.search.rs @@ -143,6 +143,9 @@ pub struct SearchRequest { /// Time filter, expressed in seconds since epoch. /// That filter is to be interpreted as the semi-open interval: /// [start_timestamp, end_timestamp). + /// If the query AST contains a range query over the timestamp field, + /// then the the bounds of the range query are used directly and + /// these two fields are ignored. #[prost(int64, optional, tag = "4")] pub start_timestamp: ::core::option::Option, #[prost(int64, optional, tag = "5")] diff --git a/quickwit/rust-toolchain.toml b/quickwit/rust-toolchain.toml index a7a5e1afcc8..e54a09951e9 100644 --- a/quickwit/rust-toolchain.toml +++ b/quickwit/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.90" +channel = "1.91" components = ["cargo", "clippy", "rustfmt", "rust-docs"] From 84f222cc87eab1cae0f8268d759284a1426c8b84 Mon Sep 17 00:00:00 2001 From: Adrien Guillo Date: Tue, 4 Nov 2025 14:26:27 -0500 Subject: [PATCH 2/3] Fix clippy warnings --- quickwit/quickwit-cli/src/index.rs | 2 +- quickwit/quickwit-cli/src/main.rs | 3 +-- quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/quickwit/quickwit-cli/src/index.rs b/quickwit/quickwit-cli/src/index.rs index 6bdbfa86688..7eb6daeaddd 100644 --- a/quickwit/quickwit-cli/src/index.rs +++ b/quickwit/quickwit-cli/src/index.rs @@ -1266,7 +1266,7 @@ mod test { let mut split_4 = template_split; split_4.split_metadata = split_metadata_4; - let splits = vec![split_1, split_2, split_3, split_4]; + let splits = [split_1, split_2, split_3, split_4]; let splits_num_docs = splits .iter() diff --git a/quickwit/quickwit-cli/src/main.rs b/quickwit/quickwit-cli/src/main.rs index 3c6d6bc5daf..01b37a34266 100644 --- a/quickwit/quickwit-cli/src/main.rs +++ b/quickwit/quickwit-cli/src/main.rs @@ -133,7 +133,6 @@ fn about_text() -> String { #[cfg(test)] mod tests { - use std::path::PathBuf; use std::str::FromStr; use std::time::Duration; @@ -683,7 +682,7 @@ mod tests { split_id, target_dir, .. - })) if &index_id == "wikipedia" && &split_id == "ABC" && target_dir == PathBuf::from("datadir") + })) if &index_id == "wikipedia" && &split_id == "ABC" && target_dir == *"datadir" )); Ok(()) } diff --git a/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs b/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs index 98651f809c4..24992209b9c 100644 --- a/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs +++ b/quickwit/quickwit-control-plane/src/indexing_scheduler/mod.rs @@ -981,7 +981,7 @@ mod tests { index_uid: IndexUid::for_test("index-2", 0), source_id: "source2".to_string(), }; - let sources = vec![ + let sources = [ SourceToSchedule { source_uid: source_1.clone(), source_type: SourceToScheduleType::NonSharded { From 9fe44f2c8d7bb6cb3686fb8b7229cd5fbcc51cfd Mon Sep 17 00:00:00 2001 From: Adrien Guillo Date: Wed, 5 Nov 2025 17:40:24 -0500 Subject: [PATCH 3/3] Increase CI workflow jobs timeout --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1896bf97b6a..bb28d31d81d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: tests: name: Unit tests runs-on: "ubuntu-latest" - timeout-minutes: 40 + timeout-minutes: 60 permissions: contents: read actions: write @@ -105,7 +105,7 @@ jobs: lints: name: Lints runs-on: "ubuntu-latest" - timeout-minutes: 20 + timeout-minutes: 60 permissions: contents: read actions: write