From 7453e4dd65553386d24d16a47f9a4acd6ca6cc8f Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Wed, 15 Apr 2026 15:46:19 -0400 Subject: [PATCH 1/4] chore: fix cargo audit on main --- Cargo.lock | 14 +++++++------- datafusion/expr/src/logical_plan/plan.rs | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd603efd859a1..47ae59c926186 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4321,7 +4321,7 @@ dependencies = [ "parking_lot", "percent-encoding", "quick-xml", - "rand 0.10.0", + "rand 0.10.1", "reqwest", "ring", "rustls-pki-types", @@ -4984,9 +4984,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ "chacha20", "getrandom 0.4.2", @@ -5360,9 +5360,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.10" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ "aws-lc-rs", "ring", @@ -6006,7 +6006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -6225,7 +6225,7 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "rand 0.10.0", + "rand 0.10.1", "socket2", "tokio", "tokio-util", diff --git a/datafusion/expr/src/logical_plan/plan.rs b/datafusion/expr/src/logical_plan/plan.rs index 4f73169ad2827..871a0f14aeb94 100644 --- a/datafusion/expr/src/logical_plan/plan.rs +++ b/datafusion/expr/src/logical_plan/plan.rs @@ -3770,11 +3770,11 @@ impl PartialOrd for Aggregate { /// Returns 0 when no grouping set is duplicated. fn max_grouping_set_duplicate_ordinal(group_expr: &[Expr]) -> usize { if let Some(Expr::GroupingSet(GroupingSet::GroupingSets(sets))) = group_expr.first() { - let mut counts: HashMap<&[Expr], usize> = HashMap::new(); - for set in sets { - *counts.entry(set).or_insert(0) += 1; - } - counts.into_values().max().unwrap_or(0).saturating_sub(1) + sets.iter() + .map(|set| sets.iter().filter(|other| *other == set).count()) + .max() + .unwrap_or(0) + .saturating_sub(1) } else { 0 } From 96e7101abf998d32e030c5fbe0bf9e1b1ae3feda Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Wed, 15 Apr 2026 15:48:38 -0400 Subject: [PATCH 2/4] revert unnecessary changes --- datafusion/expr/src/logical_plan/plan.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/datafusion/expr/src/logical_plan/plan.rs b/datafusion/expr/src/logical_plan/plan.rs index 871a0f14aeb94..4f73169ad2827 100644 --- a/datafusion/expr/src/logical_plan/plan.rs +++ b/datafusion/expr/src/logical_plan/plan.rs @@ -3770,11 +3770,11 @@ impl PartialOrd for Aggregate { /// Returns 0 when no grouping set is duplicated. fn max_grouping_set_duplicate_ordinal(group_expr: &[Expr]) -> usize { if let Some(Expr::GroupingSet(GroupingSet::GroupingSets(sets))) = group_expr.first() { - sets.iter() - .map(|set| sets.iter().filter(|other| *other == set).count()) - .max() - .unwrap_or(0) - .saturating_sub(1) + let mut counts: HashMap<&[Expr], usize> = HashMap::new(); + for set in sets { + *counts.entry(set).or_insert(0) += 1; + } + counts.into_values().max().unwrap_or(0).saturating_sub(1) } else { 0 } From f80768a60f706505fb5a36f52c2dd7f6329d1c9d Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Wed, 15 Apr 2026 15:49:36 -0400 Subject: [PATCH 3/4] Remove ignore --- .github/workflows/audit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 074ba88ed1765..d64fba6c22113 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -48,4 +48,4 @@ jobs: - name: Run audit check # Note: you can ignore specific RUSTSEC issues using the `--ignore` flag ,for example: # run: cargo audit --ignore RUSTSEC-2026-0001 - run: cargo audit --ignore RUSTSEC-2024-0014 + run: cargo audit From e859a89f49d7684ab18abdf8e6935b9871b017ee Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Wed, 15 Apr 2026 15:54:32 -0400 Subject: [PATCH 4/4] remove unused dep --- Cargo.lock | 1 - datafusion/core/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47ae59c926186..1c83a60d9788c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1783,7 +1783,6 @@ dependencies = [ "object_store", "parking_lot", "parquet", - "pretty_assertions", "rand 0.9.2", "rand_distr", "recursive", diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index c1230f7d5daa6..a2a07d4598b0a 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -172,7 +172,6 @@ bytes = { workspace = true } env_logger = { workspace = true } glob = { workspace = true } insta = { workspace = true } -pretty_assertions = "1.0" rand = { workspace = true, features = ["small_rng"] } rand_distr = "0.5" recursive = { workspace = true }