Reorganise and remove dependencies (#1078)

apache · Oct 13, 2024 · 428169f · 428169f
1 parent 343a099
commit 428169f
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 67 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,6 +45,21 @@ tracing = "0.1.36"
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
 
+tokio = { version = "1" }
+uuid = { version = "1.10", features = ["v4", "v7"] }
+rand = { version = "0.8" }
+env_logger = { version = "0.11" }
+futures = { version = "0.3" }
+log = { version = "0.4" }
+parking_lot = { version = "0.12" }
+tempfile = { version = "3" }
+dashmap = { version = "5.4.0" }
+async-trait = { version = "0.1.4" }
+serde = { version = "1.0.136" }
+num_cpus = { version = "1.13.0" }
+tokio-stream = { version = "0.1" }
+parse_arg = { version = "0.1" }
+
 # cargo build --profile release-lto
 [profile.release-lto]
 codegen-units = 1

diff --git a/ballista-cli/Cargo.toml b/ballista-cli/Cargo.toml
@@ -34,11 +34,11 @@ clap = { workspace = true }
 datafusion = { workspace = true }
 datafusion-cli = { workspace = true }
 dirs = "5.0.1"
-env_logger = "0.10"
+env_logger = { workspace = true }
 mimalloc = { version = "0.1", default-features = false }
-num_cpus = "1.13.0"
+num_cpus = { workspace = true }
 rustyline = "11.0.0"
-tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
+tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot"] }
 
 [features]
 s3 = ["ballista/s3"]
diff --git a/ballista/client/Cargo.toml b/ballista/client/Cargo.toml
@@ -33,12 +33,12 @@ ballista-executor = { path = "../executor", version = "0.12.0", optional = true
 ballista-scheduler = { path = "../scheduler", version = "0.12.0", optional = true }
 datafusion = { workspace = true }
 datafusion-proto = { workspace = true }
-futures = "0.3"
-log = "0.4"
-parking_lot = "0.12"
+futures = { workspace = true }
+log = { workspace = true }
+parking_lot = { workspace = true }
 sqlparser = { workspace = true }
-tempfile = "3"
-tokio = "1.0"
+tempfile = { workspace = true }
+tokio = { workspace = true }
 
 [features]
 azure = ["ballista-core/azure"]

diff --git a/ballista/core/Cargo.toml b/ballista/core/Cargo.toml
@@ -42,41 +42,33 @@ gcs = ["object_store/gcp"]
 s3 = ["object_store/aws"]
 
 [dependencies]
-ahash = { version = "0.8", default-features = false }
 arrow-flight = { workspace = true }
-async-trait = "0.1.41"
-bytes = "1.0"
+async-trait = { workspace = true }
 chrono = { version = "0.4", default-features = false }
 clap = { workspace = true }
 datafusion = { workspace = true }
 datafusion-proto = { workspace = true }
 datafusion-proto-common = { workspace = true }
-futures = "0.3"
-hashbrown = "0.14"
+futures = { workspace = true }
 
-itertools = "0.12"
-log = "0.4"
+itertools = "0.13"
+log = { workspace = true }
 md-5 = { version = "^0.10.0" }
 object_store = { workspace = true }
-once_cell = "1.9.0"
-
-parking_lot = "0.12"
-parse_arg = "0.1.3"
+parse_arg = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
-rand = "0.8"
-serde = { version = "1", features = ["derive"] }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 sqlparser = { workspace = true }
-sys-info = "0.9.0"
-tokio = "1.0"
-tokio-stream = { version = "0.1", features = ["net"] }
+tokio = { workspace = true }
+tokio-stream = { workspace = true, features = ["net"] }
 tonic = { workspace = true }
 url = "2.2"
-uuid = { version = "1.0", features = ["v4"] }
-walkdir = "2.3.2"
+
 
 [dev-dependencies]
-tempfile = "3"
+tempfile = { workspace = true }
 
 [build-dependencies]
 rustc_version = "0.4.0"

diff --git a/ballista/executor/Cargo.toml b/ballista/executor/Cargo.toml
@@ -40,32 +40,31 @@ default = ["mimalloc"]
 anyhow = "1"
 arrow = { workspace = true }
 arrow-flight = { workspace = true }
-async-trait = "0.1.41"
+async-trait = { workspace = true }
 ballista-core = { path = "../core", version = "0.12.0", features = ["s3"] }
-chrono = { version = "0.4", default-features = false }
 configure_me = { workspace = true }
-dashmap = "5.4.0"
+dashmap = { workspace = true }
 datafusion = { workspace = true }
 datafusion-proto = { workspace = true }
-futures = "0.3"
-log = "0.4"
+futures = { workspace = true }
+log = { workspace = true }
 mimalloc = { version = "0.1", default-features = false, optional = true }
-num_cpus = "1.13.0"
-parking_lot = "0.12"
-tempfile = "3"
-tokio = { version = "1.0", features = [
+num_cpus ={ workspace = true }
+parking_lot = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true, features = [
     "macros",
     "rt",
     "rt-multi-thread",
     "parking_lot",
     "signal",
 ] }
-tokio-stream = { version = "0.1", features = ["net"] }
+tokio-stream = { workspace = true, features = ["net"] }
 tonic = { workspace = true }
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
-uuid = { version = "1.0", features = ["v4"] }
+uuid = { workspace = true }
 
 [dev-dependencies]
 

diff --git a/ballista/scheduler/Cargo.toml b/ballista/scheduler/Cargo.toml
@@ -38,44 +38,38 @@ default = ["flight-sql"]
 flight-sql = []
 prometheus-metrics = ["prometheus", "once_cell"]
 
-
 [dependencies]
 anyhow = "1"
 arrow-flight = { workspace = true }
-async-recursion = "1.0.0"
-async-trait = "0.1.41"
+async-trait = { workspace = true }
 axum = "0.6.20"
 ballista-core = { path = "../core", version = "0.12.0", features = ["s3"] }
-base64 = { version = "0.21" }
+base64 = { version = "0.22" }
 clap = { workspace = true }
 configure_me = { workspace = true }
-dashmap = "5.4.0"
+dashmap = { workspace = true }
 datafusion = { workspace = true }
 datafusion-proto = { workspace = true }
-flatbuffers = { version = "23.5.26" }
-futures = "0.3"
-graphviz-rust = "0.8.0"
+futures = { workspace = true }
+graphviz-rust = "0.9.0"
 http = "0.2.9"
-itertools = "0.12.0"
-log = "0.4"
+log = { workspace = true }
 object_store = { workspace = true }
 once_cell = { version = "1.16.0", optional = true }
-parking_lot = "0.12"
-parse_arg = "0.1.3"
+parking_lot = { workspace = true }
+parse_arg = { workspace = true }
 prometheus = { version = "0.13", features = ["process"], optional = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
-rand = "0.8"
-serde = { version = "1", features = ["derive"] }
-tokio = { version = "1.0", features = ["full"] }
-tokio-stream = { version = "0.1", features = ["net"] }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+tokio = { workspace = true, features = ["full"] }
+tokio-stream = { workspace = true, features = ["net"] }
 tonic = { workspace = true }
-# tonic 0.12.2 depends on tower 0.4.7
-tower = { version = "0.4.7", default-features = false, features = ["make", "util"] }
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true }
-uuid = { version = "1.0", features = ["v4"] }
+uuid = { workspace = true }
 
 [dev-dependencies]
 ballista-core = { path = "../core", version = "0.12.0" }

diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -37,12 +37,12 @@ arrow-schema = { workspace = true }
 ballista = { path = "../ballista/client", version = "0.12.0" }
 datafusion = { workspace = true }
 datafusion-proto = { workspace = true }
-env_logger = "0.10"
-futures = "0.3"
+env_logger = { workspace = true }
+futures = { workspace = true }
 mimalloc = { version = "0.1", optional = true, default-features = false }
-num_cpus = "1.13.0"
-rand = "0.8.4"
-serde = "1.0.136"
+num_cpus = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true }
 serde_json = "1.0.78"
 snmalloc-rs = { version = "0.3", optional = true }
 structopt = { version = "0.3", default-features = false }

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -36,14 +36,11 @@ required-features = ["ballista/standalone"]
 [dependencies]
 ballista = { path = "../ballista/client", version = "0.12.0" }
 datafusion = { workspace = true }
-futures = "0.3"
-num_cpus = "1.13.0"
-prost = { workspace = true }
-tokio = { version = "1.0", features = [
+tokio = { workspace = true, features = [
     "macros",
     "rt",
     "rt-multi-thread",
     "sync",
     "parking_lot"
 ] }
-tonic = { workspace = true }
+