You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datafusion.apache.org by gi...@apache.org on 2026/10/06 03:54:52 UTC
(datafusion-comet) branch gh-readonly-queue/main/pr-6690-b80bf4e08198d992450c50ec85cd804c72095246 created (now f101468ca9)
This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] pushed a change to branch gh-readonly-queue/main/pr-6690-b80bf4e08198d992450c50ec85cd804c72095246
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
at f101468ca9 chore: raise the native rust-version to 1.95, which iceberg-rust requires (#6690)
This branch includes the following new commits:
new f101468ca9 chore: raise the native rust-version to 1.95, which iceberg-rust requires (#6690)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org
(datafusion-comet) 01/01: chore: raise the native rust-version to 1.95, which iceberg-rust requires (#6690)
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/main/pr-6690-b80bf4e08198d992450c50ec85cd804c72095246
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
commit f101468ca9374d2b7840774a49fdd09f66099e96
Author: Manu Zhang <Ow...@gmail.com>
AuthorDate: Tue Oct 6 03:54:30 2026 +0000
chore: raise the native rust-version to 1.95, which iceberg-rust requires (#6690)
The workspace declared rust-version 1.94.0, but the locked iceberg 0.10.1
requires rustc 1.95 (and the aws-* crates 1.94.1), so a build on 1.94.0
fails. CI always installs the latest stable and the member crates do not
inherit the workspace rust-version, so nothing caught the drift.
With 1.95 as the floor, replace the fetch_update calls that Rust 1.99
deprecates with update and try_update, both stable since 1.95, and drop
the #[allow(deprecated)] that only the old floor required.
Co-authored-by: Claude Opus 5.5 <no...@anthropic.com>
---
native/Cargo.toml | 5 +++--
native/core/src/execution/memory_pools/spark_memory.rs | 6 +-----
native/core/src/execution/memory_pools/unified_pool.rs | 16 +++-------------
.../src/nondetermenistic_funcs/internal/mersenne.rs | 2 +-
4 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/native/Cargo.toml b/native/Cargo.toml
index c038018bb3..a2e01fd75f 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -33,8 +33,9 @@ readme = "README.md"
license = "Apache-2.0"
edition = "2021"
-# Comet uses the same minimum Rust version as DataFusion
-rust-version = "1.94.0"
+# The highest minimum Rust version among Comet's dependencies: iceberg-rust requires 1.95,
+# above DataFusion's 1.94
+rust-version = "1.95.0"
[workspace.dependencies]
arrow = { version = "59.2.0", features = ["prettyprint", "ffi", "chrono-tz"] }
diff --git a/native/core/src/execution/memory_pools/spark_memory.rs b/native/core/src/execution/memory_pools/spark_memory.rs
index 2fc837c2b6..39a8030a57 100644
--- a/native/core/src/execution/memory_pools/spark_memory.rs
+++ b/native/core/src/execution/memory_pools/spark_memory.rs
@@ -174,14 +174,10 @@ impl SparkMemory {
}
/// Takes up to `size` bytes off the overcommit in one atomic step and returns how many.
- // Rust 1.99 deprecates `fetch_update` in favor of `try_update`, which needs Rust 1.95, newer
- // than the workspace `rust-version`.
- #[allow(deprecated)]
fn repay(&self, size: usize) -> usize {
let debt = self
.overcommit
- .fetch_update(Relaxed, Relaxed, |debt| Some(debt.saturating_sub(size)))
- .unwrap();
+ .update(Relaxed, Relaxed, |debt| debt.saturating_sub(size));
debt.min(size)
}
}
diff --git a/native/core/src/execution/memory_pools/unified_pool.rs b/native/core/src/execution/memory_pools/unified_pool.rs
index edc51e0dd9..fdb76bd486 100644
--- a/native/core/src/execution/memory_pools/unified_pool.rs
+++ b/native/core/src/execution/memory_pools/unified_pool.rs
@@ -87,22 +87,15 @@ impl MemoryPool for CometUnifiedMemoryPool {
}
/// Records memory that already exists, so it must not fail; see [`SparkMemory`].
- // Rust 1.99 deprecates `fetch_update` in favor of `try_update`, which needs Rust 1.95, newer
- // than the workspace `rust-version`.
- #[allow(deprecated)]
fn grow(&self, _: &MemoryReservation, additional: usize) {
if additional == 0 {
return;
}
self.spark.acquire(additional);
self.used
- .fetch_update(Relaxed, Relaxed, |old| Some(old.saturating_add(additional)))
- .unwrap();
+ .update(Relaxed, Relaxed, |old| old.saturating_add(additional));
}
- // Rust 1.99 deprecates `fetch_update` in favor of `try_update`, which needs Rust 1.95, newer
- // than the workspace `rust-version`.
- #[allow(deprecated)]
fn shrink(&self, _: &MemoryReservation, size: usize) {
if let Err(e) = self.spark.release(size) {
panic!(
@@ -112,7 +105,7 @@ impl MemoryPool for CometUnifiedMemoryPool {
}
if let Err(prev) = self
.used
- .fetch_update(Relaxed, Relaxed, |old| old.checked_sub(size))
+ .try_update(Relaxed, Relaxed, |old| old.checked_sub(size))
{
panic!(
"Task {} overflow when releasing {size} of {prev} bytes",
@@ -121,9 +114,6 @@ impl MemoryPool for CometUnifiedMemoryPool {
}
}
- // Rust 1.99 deprecates `fetch_update` in favor of `try_update`, which needs Rust 1.95, newer
- // than the workspace `rust-version`.
- #[allow(deprecated)]
fn try_grow(&self, _: &MemoryReservation, additional: usize) -> Result<(), DataFusionError> {
if additional > 0 {
// A partial grant is handed back and refused, which triggers spilling in the caller.
@@ -139,7 +129,7 @@ impl MemoryPool for CometUnifiedMemoryPool {
}
if let Err(prev) = self
.used
- .fetch_update(Relaxed, Relaxed, |old| old.checked_add(additional))
+ .try_update(Relaxed, Relaxed, |old| old.checked_add(additional))
{
return Err(resources_datafusion_err!(
"Task {} failed to acquire {} bytes due to overflow. Reserved: {}",
diff --git a/native/spark-expr/src/nondetermenistic_funcs/internal/mersenne.rs b/native/spark-expr/src/nondetermenistic_funcs/internal/mersenne.rs
index 4027c32978..ec704320ef 100644
--- a/native/spark-expr/src/nondetermenistic_funcs/internal/mersenne.rs
+++ b/native/spark-expr/src/nondetermenistic_funcs/internal/mersenne.rs
@@ -148,7 +148,7 @@ impl SparkMersenneTwister {
/// Port of `BitsStreamGenerator.nextInt(int n)`. The caller always passes a
/// strictly positive `n`, matching Spark's `random.nextInt(i + 1)`.
- // `isolate_lowest_one` requires Rust 1.97, newer than Comet's Rust 1.88 MSRV.
+ // `isolate_lowest_one` requires Rust 1.97, newer than the workspace `rust-version`.
#[allow(unknown_lints, clippy::manual_isolate_lowest_one)]
pub(crate) fn next_int(&mut self, n: i32) -> i32 {
if (n & n.wrapping_neg()) == n {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org