feat(cubestore): Upgrade rust to nightly-2025-08-01 (#9858)

ovr · web-flow · commit 54b1553e04e6 · 2025-08-07T14:17:30.000+02:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -618,7 +618,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-01-29
+          toolchain: nightly-2025-08-01
           target: ${{ matrix.target }}
           # override: true # this is by default on
           rustflags: ""
@@ -705,7 +705,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-01-29
+          toolchain: nightly-2025-08-01
           target: ${{ matrix.target }}
           # override: true # this is by default on
           rustflags: ""
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -237,7 +237,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-01-29
+          toolchain: nightly-2025-08-01
           # override: true # this is by default on
           rustflags: ""
           components: rustfmt
diff --git a/.github/workflows/rust-cubestore-master.yml b/.github/workflows/rust-cubestore-master.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly-2024-01-29]
+        rust: [nightly-2025-08-01]
     env:
       RUST: ${{ matrix.rust }}
     steps:
@@ -290,7 +290,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-01-29
+          toolchain: nightly-2025-08-01
           target: ${{ matrix.target }}
           # override: true # this is by default on
           rustflags: ""
diff --git a/.github/workflows/rust-cubestore.yml b/.github/workflows/rust-cubestore.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly-2024-01-29]
+        rust: [nightly-2025-08-01]
     container:
       image: cubejs/rust-builder:bookworm-llvm-18
     env:
@@ -229,7 +229,7 @@ jobs:
       - name: Setup Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2024-01-29
+          toolchain: nightly-2025-08-01
           target: ${{ matrix.target }}
           # override: true # this is by default on
           rustflags: ""
diff --git a/rust/cubeshared/src/codegen/http_message_generated.rs b/rust/cubeshared/src/codegen/http_message_generated.rs
@@ -1246,7 +1246,7 @@ impl core::fmt::Debug for HttpColumnValue<'_> {
 /// catch every error, or be maximally performant. For the
 /// previous, unchecked, behavior use
 /// `root_as_http_message_unchecked`.
-pub fn root_as_http_message(buf: &[u8]) -> Result<HttpMessage, flatbuffers::InvalidFlatbuffer> {
+pub fn root_as_http_message(buf: &[u8]) -> Result<HttpMessage<'_>, flatbuffers::InvalidFlatbuffer> {
     flatbuffers::root::<HttpMessage>(buf)
 }
 #[inline]
@@ -1258,7 +1258,7 @@ pub fn root_as_http_message(buf: &[u8]) -> Result<HttpMessage, flatbuffers::Inva
 /// `size_prefixed_root_as_http_message_unchecked`.
 pub fn size_prefixed_root_as_http_message(
     buf: &[u8],
-) -> Result<HttpMessage, flatbuffers::InvalidFlatbuffer> {
+) -> Result<HttpMessage<'_>, flatbuffers::InvalidFlatbuffer> {
     flatbuffers::size_prefixed_root::<HttpMessage>(buf)
 }
 #[inline]
@@ -1291,14 +1291,14 @@ pub fn size_prefixed_root_as_http_message_with_opts<'b, 'o>(
 /// Assumes, without verification, that a buffer of bytes contains a HttpMessage and returns it.
 /// # Safety
 /// Callers must trust the given bytes do indeed contain a valid `HttpMessage`.
-pub unsafe fn root_as_http_message_unchecked(buf: &[u8]) -> HttpMessage {
+pub unsafe fn root_as_http_message_unchecked(buf: &[u8]) -> HttpMessage<'_> {
     flatbuffers::root_unchecked::<HttpMessage>(buf)
 }
 #[inline]
 /// Assumes, without verification, that a buffer of bytes contains a size prefixed HttpMessage and returns it.
 /// # Safety
 /// Callers must trust the given bytes do indeed contain a valid size prefixed `HttpMessage`.
-pub unsafe fn size_prefixed_root_as_http_message_unchecked(buf: &[u8]) -> HttpMessage {
+pub unsafe fn size_prefixed_root_as_http_message_unchecked(buf: &[u8]) -> HttpMessage<'_> {
     flatbuffers::size_prefixed_root_unchecked::<HttpMessage>(buf)
 }
 #[inline]
diff --git a/rust/cubestore/CLAUDE.md b/rust/cubestore/CLAUDE.md
@@ -133,8 +133,27 @@ The codebase uses a custom dependency injection system defined in `config/inject
 
 ## Important Notes
 
-- This is a Rust nightly project (see `rust-toolchain.toml`)
+- **Rust Nightly**: Uses nightly-2025-08-01 (see `rust-toolchain.toml`)
 - Uses custom forks of Arrow/DataFusion and sqlparser-rs for Cube-specific features
 - Distributed mode involves router and worker nodes communicating via RPC
 - Heavy use of async/await patterns with Tokio runtime
-- Parquet files are the primary storage format for data
+- Parquet files are the primary storage format for data
+
+## Docker Configuration
+
+The project includes Docker configurations for building and deploying CubeStore:
+
+- **`builder.Dockerfile`**: Defines the base build image with Rust nightly-2025-08-01, LLVM 18, and build dependencies
+- **`Dockerfile`**: Production Dockerfile that uses `cubejs/rust-builder:bookworm-llvm-18` base image and copies rust-toolchain.toml
+- **GitHub Actions**: Multiple CI/CD workflows use the same Rust version
+
+## Updating Rust Version
+
+When updating the Rust version, ensure ALL these files are kept in sync:
+
+1. **`rust-toolchain.toml`** - Primary source of truth for local development
+2. **`builder.Dockerfile`** - Update the rustup default command with the new nightly version
+3. **`Dockerfile`** - Copies rust-toolchain.toml (no manual update needed if builder image is updated)
+4. **GitHub Workflows** - Update all occurrences of the Rust nightly version in `.github/workflows/` directory
+
+**Note**: The `cubejs/rust-builder:bookworm-llvm-18` Docker image tag may also need updating if the builder.Dockerfile changes significantly.
diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock
diff --git a/rust/cubestore/Dockerfile b/rust/cubestore/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /build/cubestore
 
 COPY cubeshared /build/cubeshared
 
+COPY cubestore/rust-toolchain.toml .
 COPY cubestore/Cargo.toml .
 COPY cubestore/Cargo.lock .
 COPY cubestore/cuberockstore cuberockstore
diff --git a/rust/cubestore/builder.Dockerfile b/rust/cubestore/builder.Dockerfile
@@ -5,8 +5,8 @@ FROM rust:$OS_NAME
 ARG LLVM_VERSION=18
 
 RUN rustup update && \
-    rustup default nightly-2024-01-29 && \
-    rustup component add --toolchain nightly-2024-01-29 rustfmt clippy;
+    rustup default nightly-2025-08-01 && \
+    rustup component add --toolchain nightly-2025-08-01 rustfmt clippy;
 
 RUN apt update \
     && apt upgrade -y \
diff --git a/rust/cubestore/cubehll/src/instance.rs b/rust/cubestore/cubehll/src/instance.rs
@@ -1217,7 +1217,7 @@ struct BitCursor<'a> {
 }
 
 impl BitCursor<'_> {
-    pub fn new(input: &[u8]) -> BitCursor {
+    pub fn new(input: &[u8]) -> BitCursor<'_> {
         BitCursor {
             input,
             pos: 0,
diff --git a/rust/cubestore/cubestore-sql-tests/src/lib.rs b/rust/cubestore/cubestore-sql-tests/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(async_closure)]
 #![feature(test)]
 
 pub use crate::benches::cubestore_benches;
diff --git a/rust/cubestore/cubestore/src/cachestore/cache_rocksstore.rs b/rust/cubestore/cubestore/src/cachestore/cache_rocksstore.rs
@@ -273,8 +273,10 @@ impl RocksCacheStore {
                     .upload_loop
                     .process(
                         cachestore.clone(),
-                        async move |_| Ok(Delay::new(Duration::from_secs(upload_interval)).await),
-                        async move |m, _| m.store.run_upload().await,
+                        move |_| async move {
+                            Ok(Delay::new(Duration::from_secs(upload_interval)).await)
+                        },
+                        move |m, _| async move { m.store.run_upload().await },
                     )
                     .await;
 
@@ -292,8 +294,10 @@ impl RocksCacheStore {
                     .metrics_loop
                     .process(
                         cachestore.clone(),
-                        async move |_| Ok(Delay::new(Duration::from_secs(metrics_interval)).await),
-                        async move |m, _| {
+                        move |_| async move {
+                            Ok(Delay::new(Duration::from_secs(metrics_interval)).await)
+                        },
+                        move |m, _| async move {
                             if let Err(err) = m.submit_metrics().await {
                                 log::error!("Error while submitting cachestore metrics: {}", err)
                             };
diff --git a/rust/cubestore/cubestore/src/cachestore/lazy.rs b/rust/cubestore/cubestore/src/cachestore/lazy.rs
@@ -24,7 +24,7 @@ pub enum LazyRocksCacheStoreState {
         metastore_fs: Arc<dyn MetaStoreFs>,
         config: Arc<dyn ConfigObj>,
         listeners: Vec<tokio::sync::broadcast::Sender<MetaStoreEvent>>,
-        init_flag: Sender<bool>,
+        _init_flag: Sender<bool>,
     },
     Closed {},
     Initialized {
@@ -72,7 +72,7 @@ impl LazyRocksCacheStore {
                 metastore_fs,
                 config,
                 listeners,
-                init_flag,
+                _init_flag: init_flag,
             }),
         }))
     }
@@ -101,7 +101,7 @@ impl LazyRocksCacheStore {
                 config,
                 listeners,
                 // receiver will be closed on drop
-                init_flag: _,
+                _init_flag: _,
             } => {
                 let store =
                     RocksCacheStore::load_from_remote(&path, metastore_fs.clone(), config.clone())
diff --git a/rust/cubestore/cubestore/src/cachestore/queue_item_payload.rs b/rust/cubestore/cubestore/src/cachestore/queue_item_payload.rs
@@ -42,6 +42,7 @@ impl QueueItemPayload {
 }
 
 #[derive(Clone, Copy, Debug)]
+#[allow(dead_code)]
 pub(crate) enum QueueItemPayloadRocksIndex {}
 
 pub struct QueueItemPayloadRocksTable<'a> {
@@ -80,6 +81,7 @@ rocks_table_new!(
 );
 
 #[derive(Hash, Clone, Debug)]
+#[allow(dead_code)]
 pub enum QueueItemPayloadIndexKey {}
 
 base_rocks_secondary_index!(QueueItemPayload, QueueItemPayloadRocksIndex);
diff --git a/rust/cubestore/cubestore/src/http/mod.rs b/rust/cubestore/cubestore/src/http/mod.rs
@@ -403,8 +403,8 @@ impl HttpServer {
         let drop_processing_messages_after = self.drop_processing_messages_after.clone();
         let drop_orphaned_messages_loop = self.drop_orphaned_messages_loop.process(
             messages_state,
-            async move |_| Ok(Delay::new(check_orphaned_messages_interval.clone()).await),
-            async move |messages_state, _| {
+            move |_| async move { Ok(Delay::new(check_orphaned_messages_interval.clone()).await) },
+            move |messages_state, _| async move {
                 let mut messages_state = messages_state.lock().await;
                 let mut keys_to_remove = Vec::new();
                 let mut orphaned_complete_results = 0;
diff --git a/rust/cubestore/cubestore/src/import/mod.rs b/rust/cubestore/cubestore/src/import/mod.rs
@@ -323,7 +323,7 @@ impl<'a> CsvLineParser<'a> {
         }
     }
 
-    fn next_value(&mut self) -> Result<MaybeOwnedStr, CubeError> {
+    fn next_value(&mut self) -> Result<MaybeOwnedStr<'_>, CubeError> {
         Ok(
             if let Some(b'"') = self.remaining.as_bytes().iter().nth(0) {
                 let mut closing_index = None;
diff --git a/rust/cubestore/cubestore/src/lib.rs b/rust/cubestore/cubestore/src/lib.rs
@@ -1,10 +1,7 @@
 #![feature(test)]
-#![feature(async_closure)]
 #![feature(box_patterns)]
 #![feature(vec_into_raw_parts)]
 #![feature(hash_set_entry)]
-#![feature(is_sorted)]
-#![feature(result_flattening)]
 // #![feature(trace_macros)]
 
 // trace_macros!(true);
diff --git a/rust/cubestore/cubestore/src/metastore/mod.rs b/rust/cubestore/cubestore/src/metastore/mod.rs
@@ -1428,8 +1428,8 @@ impl RocksMetaStore {
         self.upload_loop
             .process(
                 self.clone(),
-                async move |_| Ok(Delay::new(Duration::from_secs(upload_interval)).await),
-                async move |m, _| m.store.run_upload().await,
+                move |_| async move { Ok(Delay::new(Duration::from_secs(upload_interval)).await) },
+                move |m, _| async move { m.store.run_upload().await },
             )
             .await;
     }
@@ -4956,7 +4956,7 @@ mod tests {
 
     #[test]
     fn test_structures_size() {
-        assert_eq!(std::mem::size_of::<MetaStoreEvent>(), 680);
+        assert_eq!(std::mem::size_of::<MetaStoreEvent>(), 672);
     }
 
     #[tokio::test]
diff --git a/rust/cubestore/cubestore/src/metastore/rocks_table.rs b/rust/cubestore/cubestore/src/metastore/rocks_table.rs
@@ -61,15 +61,15 @@ macro_rules! rocks_table_new {
                 self.db.db
             }
 
-            fn snapshot(&self) -> &cuberockstore::rocksdb::Snapshot {
+            fn snapshot(&self) -> &cuberockstore::rocksdb::Snapshot<'_> {
                 self.db.snapshot
             }
 
             fn mem_seq(&self) -> &crate::metastore::MemorySequence {
                 &self.db.mem_seq
             }
 
-            fn table_ref(&self) -> &crate::metastore::DbTableRef {
+            fn table_ref(&self) -> &crate::metastore::DbTableRef<'_> {
                 &self.db
             }
 
@@ -448,8 +448,8 @@ pub trait RocksTable: BaseRocksTable + Debug + Send + Sync {
     fn delete_event(&self, row: IdRow<Self::T>) -> MetaStoreEvent;
     fn update_event(&self, old_row: IdRow<Self::T>, new_row: IdRow<Self::T>) -> MetaStoreEvent;
     fn db(&self) -> &DB;
-    fn table_ref(&self) -> &DbTableRef;
-    fn snapshot(&self) -> &Snapshot;
+    fn table_ref(&self) -> &DbTableRef<'_>;
+    fn snapshot(&self) -> &Snapshot<'_>;
     fn mem_seq(&self) -> &MemorySequence;
     fn index_id(index_num: IndexId) -> IndexId;
     fn table_id() -> TableId;
diff --git a/rust/cubestore/cubestore/src/queryplanner/topk/plan.rs b/rust/cubestore/cubestore/src/queryplanner/topk/plan.rs
@@ -207,7 +207,7 @@ fn extract_having(p: &Arc<LogicalPlan>) -> (Option<Expr>, &Arc<LogicalPlan>) {
     }
 }
 
-fn extract_projection_and_having(p: &LogicalPlan) -> Option<ColumnProjection> {
+fn extract_projection_and_having(p: &LogicalPlan) -> Option<ColumnProjection<'_>> {
     match p {
         LogicalPlan::Projection {
             expr,
diff --git a/rust/cubestore/cubestore/src/remotefs/mod.rs b/rust/cubestore/cubestore/src/remotefs/mod.rs
@@ -91,7 +91,7 @@ pub trait ExtendedRemoteFs: DIService + RemoteFs {
     async fn list_by_page(
         &self,
         remote_prefix: String,
-    ) -> Result<BoxStream<Result<Vec<String>, CubeError>>, CubeError> {
+    ) -> Result<BoxStream<'static, Result<Vec<String>, CubeError>>, CubeError> {
         // Note, this implementation doesn't actually paginate.
         let list: Vec<String> = self.list(remote_prefix).await?;
 
diff --git a/rust/cubestore/cubestore/src/remotefs/queue.rs b/rust/cubestore/cubestore/src/remotefs/queue.rs
@@ -346,7 +346,7 @@ impl ExtendedRemoteFs for QueueRemoteFs {
     async fn list_by_page(
         &self,
         remote_prefix: String,
-    ) -> Result<BoxStream<Result<Vec<String>, CubeError>>, CubeError> {
+    ) -> Result<BoxStream<'static, Result<Vec<String>, CubeError>>, CubeError> {
         self.remote_fs.list_by_page(remote_prefix).await
     }
 }
diff --git a/rust/cubestore/cubestore/src/remotefs/s3.rs b/rust/cubestore/cubestore/src/remotefs/s3.rs
@@ -346,7 +346,7 @@ impl ExtendedRemoteFs for S3RemoteFs {
     async fn list_by_page(
         &self,
         remote_prefix: String,
-    ) -> Result<BoxStream<Result<Vec<String>, CubeError>>, CubeError> {
+    ) -> Result<BoxStream<'static, Result<Vec<String>, CubeError>>, CubeError> {
         let path = self.s3_path(&remote_prefix);
         let bucket = self.bucket.load();
         let leading_subpath = self.leading_subpath_regex();
diff --git a/rust/cubestore/cubestore/src/util/time_span.rs b/rust/cubestore/cubestore/src/util/time_span.rs
diff --git a/rust/cubestore/cubezetasketch/src/difference_encoding.rs b/rust/cubestore/cubezetasketch/src/difference_encoding.rs
diff --git a/rust/cubestore/cubezetasketch/src/sparse.rs b/rust/cubestore/cubezetasketch/src/sparse.rs
diff --git a/rust/cubestore/rust-toolchain.toml b/rust/cubestore/rust-toolchain.toml

Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,7 @@ struct BitCursor<'a> {`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`	`1219`	`impl BitCursor<'_> {`
`1220`		`- pub fn new(input: &[u8]) -> BitCursor {`
	`1220`	`+ pub fn new(input: &[u8]) -> BitCursor<'_> {`
`1221`	`1221`	`BitCursor {`
`1222`	`1222`	`input,`
`1223`	`1223`	`pos: 0,`