From 58b99bf65e107b28307dffc0570f56da969edf32 Mon Sep 17 00:00:00 2001 From: yew1eb Date: Wed, 11 Feb 2026 18:56:38 +0800 Subject: [PATCH 1/3] [AURON #2003] Extract common package configs to workspace Cargo.toml # Conflicts: # Cargo.toml # native-engine/auron-jni-bridge/Cargo.toml # native-engine/auron-memmgr/Cargo.toml # native-engine/auron-planner/Cargo.toml # native-engine/auron/Cargo.toml # native-engine/datafusion-ext-commons/Cargo.toml # native-engine/datafusion-ext-exprs/Cargo.toml # native-engine/datafusion-ext-functions/Cargo.toml # native-engine/datafusion-ext-plans/Cargo.toml --- Cargo.toml | 21 +++++++++---------- native-engine/auron-jni-bridge/Cargo.toml | 8 +++---- native-engine/auron-memmgr/Cargo.toml | 8 +++---- native-engine/auron-planner/Cargo.toml | 8 +++---- native-engine/auron/Cargo.toml | 10 ++++----- .../datafusion-ext-commons/Cargo.toml | 8 +++---- native-engine/datafusion-ext-exprs/Cargo.toml | 8 +++---- .../datafusion-ext-functions/Cargo.toml | 10 ++++----- native-engine/datafusion-ext-plans/Cargo.toml | 13 ++++-------- 9 files changed, 44 insertions(+), 50 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7eda0c6d6..dca5816a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,8 @@ members = [ ] [workspace.package] +version = "0.1.0" +license = "Apache-2.0" edition = "2024" [workspace.lints.rust] @@ -160,38 +162,35 @@ base64 = "0.22.1" bigdecimal = "0.4.10" bitvec = "1.0.1" byteorder = "1.5.0" -bytes = "1.11.1" +bytes = "1.11.0" bytesize = "2.3.1" -chrono = "0.4.44" +chrono = "0.4.43" count-write = "0.1.0" foldhash = "0.2.0" futures = "0.3" -futures-util = "0.3.32" +futures-util = "0.3.31" hashbrown = "0.14.5" itertools = "0.14.0" jni = "0.20.0" log = "0.4.29" -lz4_flex = "0.13.0" +lz4_flex = "0.12.0" num = "0.4.2" object_store = "0.12.4" -once_cell = "1.21.4" +once_cell = "1.21.3" panic-message = "0.3.0" parking_lot = "0.12.5" paste = "1.0.15" procfs = "0.18.0" prost = "0.14.3" -prost-types = "0.14.3" -prost-reflect = "0.16.3" rand = "0.9.2" smallvec = "2.0.0-alpha.11" -sonic-rs = "0.5.7" +sonic-rs = "0.5.6" tempfile = "3" -tokio = "1.51.0" +tokio = "1.49.0" tonic-build = "0.13.1" transpose = "0.2.3" unchecked-index = "0.2.2" zstd = "0.13.3" -rdkafka = { version = "0.36.0", features = ["tokio"] } [patch.crates-io] # datafusion: branch=v49.0.0-blaze @@ -204,7 +203,7 @@ datafusion-execution = { git = "https://github.com/auron-project/datafusion.git" datafusion-optimizer = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} datafusion-physical-expr = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} datafusion-spark = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} -orc-rust = { git = "https://github.com/auron-project/datafusion-orc.git", rev = "9beb12c"} +orc-rust = { git = "https://github.com/auron-project/datafusion-orc.git", rev = "17f7012"} # arrow: branch=v55.2.0-blaze arrow = { git = "https://github.com/auron-project/arrow-rs.git", rev = "5de02520c"} diff --git a/native-engine/auron-jni-bridge/Cargo.toml b/native-engine/auron-jni-bridge/Cargo.toml index 2256e9626..e9e7226a6 100644 --- a/native-engine/auron-jni-bridge/Cargo.toml +++ b/native-engine/auron-jni-bridge/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "auron-jni-bridge" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true diff --git a/native-engine/auron-memmgr/Cargo.toml b/native-engine/auron-memmgr/Cargo.toml index 3b0ee2427..ed701ab88 100644 --- a/native-engine/auron-memmgr/Cargo.toml +++ b/native-engine/auron-memmgr/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "auron-memmgr" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true diff --git a/native-engine/auron-planner/Cargo.toml b/native-engine/auron-planner/Cargo.toml index 7bcc8a8d7..5a98c9fdb 100644 --- a/native-engine/auron-planner/Cargo.toml +++ b/native-engine/auron-planner/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "auron-planner" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true diff --git a/native-engine/auron/Cargo.toml b/native-engine/auron/Cargo.toml index 3717a5573..8d38d2954 100644 --- a/native-engine/auron/Cargo.toml +++ b/native-engine/auron/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "auron" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true @@ -68,7 +68,7 @@ optional = true features = ["disable_initial_exec_tls"] [dependencies.jemalloc_pprof] -version = "0.8.0" +version = "0.8.2" features = ["symbolize"] optional = true diff --git a/native-engine/datafusion-ext-commons/Cargo.toml b/native-engine/datafusion-ext-commons/Cargo.toml index 12863708d..7bd229db9 100644 --- a/native-engine/datafusion-ext-commons/Cargo.toml +++ b/native-engine/datafusion-ext-commons/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "datafusion-ext-commons" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true diff --git a/native-engine/datafusion-ext-exprs/Cargo.toml b/native-engine/datafusion-ext-exprs/Cargo.toml index 32c4c3ad5..7240b2ece 100644 --- a/native-engine/datafusion-ext-exprs/Cargo.toml +++ b/native-engine/datafusion-ext-exprs/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "datafusion-ext-exprs" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true diff --git a/native-engine/datafusion-ext-functions/Cargo.toml b/native-engine/datafusion-ext-functions/Cargo.toml index a5eb5ded5..ffaac79ec 100644 --- a/native-engine/datafusion-ext-functions/Cargo.toml +++ b/native-engine/datafusion-ext-functions/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "datafusion-ext-functions" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true @@ -36,5 +36,5 @@ num = { workspace = true } paste = { workspace = true } serde_json = { workspace = true } sonic-rs = { workspace = true } -chrono = "0.4.44" +chrono = "0.4.43" chrono-tz = "0.10.4" diff --git a/native-engine/datafusion-ext-plans/Cargo.toml b/native-engine/datafusion-ext-plans/Cargo.toml index d4d3464e2..d47e81f39 100644 --- a/native-engine/datafusion-ext-plans/Cargo.toml +++ b/native-engine/datafusion-ext-plans/Cargo.toml @@ -17,10 +17,10 @@ [package] name = "datafusion-ext-plans" -version = "0.1.0" -license = "Apache-2.0" -edition.workspace = true - +version = { workspace = true } +license = { workspace = true } +edition = { workspace = true } +resolver = "1" [lints] workspace = true @@ -63,11 +63,6 @@ paste = { workspace = true } smallvec = { workspace = true } tokio = { workspace = true } unchecked-index = { workspace = true } -prost = { workspace = true } -prost-types = { workspace = true } -prost-reflect = { workspace = true } -rdkafka = { workspace = true } -sonic-rs = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] procfs = { workspace = true } From 27f54048b80cb395cb21434f26719fc1aa983314 Mon Sep 17 00:00:00 2001 From: yew1eb Date: Thu, 19 Feb 2026 11:43:06 +0800 Subject: [PATCH 2/3] up --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 34b703254..df0704d8f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,7 +344,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auron" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "auron-jni-bridge", @@ -373,7 +373,7 @@ dependencies = [ [[package]] name = "auron-jni-bridge" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "datafusion", "jni", @@ -384,7 +384,7 @@ dependencies = [ [[package]] name = "auron-memmgr" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "async-trait", "auron-jni-bridge", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "auron-planner" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "base64", @@ -1174,7 +1174,7 @@ dependencies = [ [[package]] name = "datafusion-ext-commons" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "arrow-schema", @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "datafusion-ext-exprs" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "auron-jni-bridge", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "datafusion-ext-functions" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "auron-jni-bridge", @@ -1233,7 +1233,7 @@ dependencies = [ [[package]] name = "datafusion-ext-plans" -version = "0.1.0" +version = "7.0.0-incubating" dependencies = [ "arrow", "arrow-schema", diff --git a/Cargo.toml b/Cargo.toml index dca5816a1..85bd12ae3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ members = [ ] [workspace.package] -version = "0.1.0" +version = "7.0.0-incubating" license = "Apache-2.0" edition = "2024" From b3144e4efdf11e9d88810da1c7e5b5c2880be4ef Mon Sep 17 00:00:00 2001 From: yew1eb Date: Thu, 26 Feb 2026 01:04:46 +0800 Subject: [PATCH 3/3] up --- Cargo.lock | 16 +++++++------- Cargo.toml | 21 +++++++++++-------- native-engine/auron-jni-bridge/Cargo.toml | 2 +- native-engine/auron-memmgr/Cargo.toml | 2 +- native-engine/auron-planner/Cargo.toml | 2 +- native-engine/auron/Cargo.toml | 4 ++-- .../datafusion-ext-commons/Cargo.toml | 2 +- native-engine/datafusion-ext-exprs/Cargo.toml | 2 +- .../datafusion-ext-functions/Cargo.toml | 4 ++-- native-engine/datafusion-ext-plans/Cargo.toml | 7 ++++++- 10 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index df0704d8f..260854faf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,7 +344,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auron" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "auron-jni-bridge", @@ -373,7 +373,7 @@ dependencies = [ [[package]] name = "auron-jni-bridge" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "datafusion", "jni", @@ -384,7 +384,7 @@ dependencies = [ [[package]] name = "auron-memmgr" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "async-trait", "auron-jni-bridge", @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "auron-planner" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "base64", @@ -1174,7 +1174,7 @@ dependencies = [ [[package]] name = "datafusion-ext-commons" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "arrow-schema", @@ -1200,7 +1200,7 @@ dependencies = [ [[package]] name = "datafusion-ext-exprs" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "auron-jni-bridge", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "datafusion-ext-functions" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "auron-jni-bridge", @@ -1233,7 +1233,7 @@ dependencies = [ [[package]] name = "datafusion-ext-plans" -version = "7.0.0-incubating" +version = "8.0.0" dependencies = [ "arrow", "arrow-schema", diff --git a/Cargo.toml b/Cargo.toml index 85bd12ae3..b1fcffc7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ members = [ ] [workspace.package] -version = "7.0.0-incubating" +version = "8.0.0" license = "Apache-2.0" edition = "2024" @@ -162,35 +162,38 @@ base64 = "0.22.1" bigdecimal = "0.4.10" bitvec = "1.0.1" byteorder = "1.5.0" -bytes = "1.11.0" +bytes = "1.11.1" bytesize = "2.3.1" -chrono = "0.4.43" +chrono = "0.4.44" count-write = "0.1.0" foldhash = "0.2.0" futures = "0.3" -futures-util = "0.3.31" +futures-util = "0.3.32" hashbrown = "0.14.5" itertools = "0.14.0" jni = "0.20.0" log = "0.4.29" -lz4_flex = "0.12.0" +lz4_flex = "0.13.0" num = "0.4.2" object_store = "0.12.4" -once_cell = "1.21.3" +once_cell = "1.21.4" panic-message = "0.3.0" parking_lot = "0.12.5" paste = "1.0.15" procfs = "0.18.0" prost = "0.14.3" +prost-types = "0.14.3" +prost-reflect = "0.16.3" rand = "0.9.2" smallvec = "2.0.0-alpha.11" -sonic-rs = "0.5.6" +sonic-rs = "0.5.7" tempfile = "3" -tokio = "1.49.0" +tokio = "1.51.0" tonic-build = "0.13.1" transpose = "0.2.3" unchecked-index = "0.2.2" zstd = "0.13.3" +rdkafka = { version = "0.36.0", features = ["tokio"] } [patch.crates-io] # datafusion: branch=v49.0.0-blaze @@ -203,7 +206,7 @@ datafusion-execution = { git = "https://github.com/auron-project/datafusion.git" datafusion-optimizer = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} datafusion-physical-expr = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} datafusion-spark = { git = "https://github.com/auron-project/datafusion.git", rev = "9034aeffb"} -orc-rust = { git = "https://github.com/auron-project/datafusion-orc.git", rev = "17f7012"} +orc-rust = { git = "https://github.com/auron-project/datafusion-orc.git", rev = "9beb12c"} # arrow: branch=v55.2.0-blaze arrow = { git = "https://github.com/auron-project/arrow-rs.git", rev = "5de02520c"} diff --git a/native-engine/auron-jni-bridge/Cargo.toml b/native-engine/auron-jni-bridge/Cargo.toml index e9e7226a6..7523c3913 100644 --- a/native-engine/auron-jni-bridge/Cargo.toml +++ b/native-engine/auron-jni-bridge/Cargo.toml @@ -20,7 +20,7 @@ name = "auron-jni-bridge" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true diff --git a/native-engine/auron-memmgr/Cargo.toml b/native-engine/auron-memmgr/Cargo.toml index ed701ab88..893daa1db 100644 --- a/native-engine/auron-memmgr/Cargo.toml +++ b/native-engine/auron-memmgr/Cargo.toml @@ -20,7 +20,7 @@ name = "auron-memmgr" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true diff --git a/native-engine/auron-planner/Cargo.toml b/native-engine/auron-planner/Cargo.toml index 5a98c9fdb..ec865ad36 100644 --- a/native-engine/auron-planner/Cargo.toml +++ b/native-engine/auron-planner/Cargo.toml @@ -20,7 +20,7 @@ name = "auron-planner" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true diff --git a/native-engine/auron/Cargo.toml b/native-engine/auron/Cargo.toml index 8d38d2954..84928b430 100644 --- a/native-engine/auron/Cargo.toml +++ b/native-engine/auron/Cargo.toml @@ -20,7 +20,7 @@ name = "auron" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [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 7bd229db9..dc6d6ea8d 100644 --- a/native-engine/datafusion-ext-commons/Cargo.toml +++ b/native-engine/datafusion-ext-commons/Cargo.toml @@ -20,7 +20,7 @@ name = "datafusion-ext-commons" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true diff --git a/native-engine/datafusion-ext-exprs/Cargo.toml b/native-engine/datafusion-ext-exprs/Cargo.toml index 7240b2ece..a38b71e47 100644 --- a/native-engine/datafusion-ext-exprs/Cargo.toml +++ b/native-engine/datafusion-ext-exprs/Cargo.toml @@ -20,7 +20,7 @@ name = "datafusion-ext-exprs" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true diff --git a/native-engine/datafusion-ext-functions/Cargo.toml b/native-engine/datafusion-ext-functions/Cargo.toml index ffaac79ec..7aef26d56 100644 --- a/native-engine/datafusion-ext-functions/Cargo.toml +++ b/native-engine/datafusion-ext-functions/Cargo.toml @@ -20,7 +20,7 @@ name = "datafusion-ext-functions" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true @@ -36,5 +36,5 @@ num = { workspace = true } paste = { workspace = true } serde_json = { workspace = true } sonic-rs = { workspace = true } -chrono = "0.4.43" +chrono = "0.4.44" chrono-tz = "0.10.4" diff --git a/native-engine/datafusion-ext-plans/Cargo.toml b/native-engine/datafusion-ext-plans/Cargo.toml index d47e81f39..f21857034 100644 --- a/native-engine/datafusion-ext-plans/Cargo.toml +++ b/native-engine/datafusion-ext-plans/Cargo.toml @@ -20,7 +20,7 @@ name = "datafusion-ext-plans" version = { workspace = true } license = { workspace = true } edition = { workspace = true } -resolver = "1" + [lints] workspace = true @@ -63,6 +63,11 @@ paste = { workspace = true } smallvec = { workspace = true } tokio = { workspace = true } unchecked-index = { workspace = true } +prost = { workspace = true } +prost-types = { workspace = true } +prost-reflect = { workspace = true } +rdkafka = { workspace = true } +sonic-rs = { workspace = true } [target.'cfg(target_os = "linux")'.dependencies] procfs = { workspace = true }