From 1a2e9bd59228be92c70bc554a3cd8a8b8cc51e98 Mon Sep 17 00:00:00 2001
From: slfan1989 <slfan1989@apache.org>
Date: Tue, 10 Feb 2026 09:44:01 +0800
Subject: [PATCH] [AURON #1996] Standardize Cargo workspace edition and
 resolver configuration.

Signed-off-by: slfan1989 <slfan1989@apache.org>
---
 Cargo.toml                                        | 4 ++++
 native-engine/auron-jni-bridge/Cargo.toml         | 4 ++--
 native-engine/auron-memmgr/Cargo.toml             | 3 ++-
 native-engine/auron-planner/Cargo.toml            | 3 ++-
 native-engine/auron/Cargo.toml                    | 6 +++---
 native-engine/datafusion-ext-commons/Cargo.toml   | 4 ++--
 native-engine/datafusion-ext-exprs/Cargo.toml     | 4 ++--
 native-engine/datafusion-ext-functions/Cargo.toml | 4 ++--
 native-engine/datafusion-ext-plans/Cargo.toml     | 4 ++--
 9 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 126597140..aba08aad2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@
 #
 
 [workspace]
+resolver = "2"
 members = [
     "native-engine/datafusion-ext-commons",
     "native-engine/datafusion-ext-exprs",
@@ -27,6 +28,9 @@ members = [
     "native-engine/auron-memmgr",
 ]
 
+[workspace.package]
+edition = "2024"
+
 [workspace.lints.rust]
 # Pending processing (temporarily allow)
 unused_variables = "allow"
diff --git a/native-engine/auron-jni-bridge/Cargo.toml b/native-engine/auron-jni-bridge/Cargo.toml
index eccd41ecd..2256e9626 100644
--- a/native-engine/auron-jni-bridge/Cargo.toml
+++ b/native-engine/auron-jni-bridge/Cargo.toml
@@ -19,8 +19,8 @@
 name = "auron-jni-bridge"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/auron-memmgr/Cargo.toml b/native-engine/auron-memmgr/Cargo.toml
index fe0b84eb7..3b0ee2427 100644
--- a/native-engine/auron-memmgr/Cargo.toml
+++ b/native-engine/auron-memmgr/Cargo.toml
@@ -19,7 +19,8 @@
 name = "auron-memmgr"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/auron-planner/Cargo.toml b/native-engine/auron-planner/Cargo.toml
index e39553d45..7bcc8a8d7 100644
--- a/native-engine/auron-planner/Cargo.toml
+++ b/native-engine/auron-planner/Cargo.toml
@@ -19,7 +19,8 @@
 name = "auron-planner"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/auron/Cargo.toml b/native-engine/auron/Cargo.toml
index f0eab0e5a..3717a5573 100644
--- a/native-engine/auron/Cargo.toml
+++ b/native-engine/auron/Cargo.toml
@@ -19,8 +19,8 @@
 name = "auron"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true
 
@@ -68,7 +68,7 @@ optional = true
 features = ["disable_initial_exec_tls"]
 
 [dependencies.jemalloc_pprof]
-version = "0.8.2"
+version = "0.8.0"
 features = ["symbolize"]
 optional = true
 
diff --git a/native-engine/datafusion-ext-commons/Cargo.toml b/native-engine/datafusion-ext-commons/Cargo.toml
index c5d7ed2d0..12863708d 100644
--- a/native-engine/datafusion-ext-commons/Cargo.toml
+++ b/native-engine/datafusion-ext-commons/Cargo.toml
@@ -19,8 +19,8 @@
 name = "datafusion-ext-commons"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/datafusion-ext-exprs/Cargo.toml b/native-engine/datafusion-ext-exprs/Cargo.toml
index e59a71825..32c4c3ad5 100644
--- a/native-engine/datafusion-ext-exprs/Cargo.toml
+++ b/native-engine/datafusion-ext-exprs/Cargo.toml
@@ -19,8 +19,8 @@
 name = "datafusion-ext-exprs"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/datafusion-ext-functions/Cargo.toml b/native-engine/datafusion-ext-functions/Cargo.toml
index 39bf352d7..be82a9758 100644
--- a/native-engine/datafusion-ext-functions/Cargo.toml
+++ b/native-engine/datafusion-ext-functions/Cargo.toml
@@ -19,8 +19,8 @@
 name = "datafusion-ext-functions"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true
 
diff --git a/native-engine/datafusion-ext-plans/Cargo.toml b/native-engine/datafusion-ext-plans/Cargo.toml
index bdc556162..f631548f1 100644
--- a/native-engine/datafusion-ext-plans/Cargo.toml
+++ b/native-engine/datafusion-ext-plans/Cargo.toml
@@ -19,8 +19,8 @@
 name = "datafusion-ext-plans"
 version = "0.1.0"
 license = "Apache-2.0"
-edition = "2024"
-resolver = "1"
+edition.workspace = true
+
 [lints]
 workspace = true