Skip to content

Commit bce2959

Browse files
authored
Merge branch 'main' into avoid_empty_event
2 parents 79fb870 + 30232e0 commit bce2959

File tree

13 files changed

+542
-198
lines changed

13 files changed

+542
-198
lines changed

Cargo.toml

+14-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,22 @@
1717

1818
[workspace]
1919
members = ["ballista-cli", "ballista/client", "ballista/core", "ballista/executor", "ballista/scheduler", "benchmarks", "examples"]
20-
exclude = ["python"]
2120

2221
[workspace.dependencies]
23-
arrow = { version = "36.0.0" }
24-
arrow-flight = { version = "36.0.0", features = ["flight-sql-experimental"] }
25-
datafusion = "22.0.0"
26-
datafusion-proto = "22.0.0"
22+
arrow = { version = "37.0.0" }
23+
arrow-flight = { version = "37.0.0", features = ["flight-sql-experimental"] }
24+
configure_me = { version = "0.4.0" }
25+
configure_me_codegen = { version = "0.4.4" }
26+
datafusion = "23.0.0"
27+
datafusion-cli = "23.0.0"
28+
datafusion-proto = "23.0.0"
29+
object_store = "0.5.4"
30+
sqlparser = "0.33.0"
31+
tonic = { version = "0.9" }
32+
tonic-build = { version = "0.9", default-features = false, features = [
33+
"transport",
34+
"prost",
35+
] }
2736

2837
# cargo build --profile release-lto
2938
[profile.release-lto]

ballista-cli/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ readme = "README.md"
3232
ballista = { path = "../ballista/client", version = "0.11.0", features = ["standalone"] }
3333
clap = { version = "3", features = ["derive", "cargo"] }
3434
datafusion = { workspace = true }
35-
datafusion-cli = "22.0.0"
35+
datafusion-cli = { workspace = true }
3636
dirs = "4.0.0"
3737
env_logger = "0.10"
3838
mimalloc = { version = "0.1", default-features = false }

ballista/client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ datafusion-proto = { workspace = true }
3636
futures = "0.3"
3737
log = "0.4"
3838
parking_lot = "0.12"
39-
sqlparser = "0.32.0"
39+
sqlparser = { workspace = true }
4040
tempfile = "3"
4141
tokio = "1.0"
4242

ballista/client/src/context.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ mod tests {
623623
.map(|t| ListingTableUrl::parse(t).unwrap())
624624
.collect();
625625
let config = ListingTableConfig::new_with_multi_paths(table_paths)
626-
.with_schema(Arc::new(Schema::new(vec![])))
626+
.with_schema(Arc::new(Schema::empty()))
627627
.with_listing_options(error_options);
628628

629629
let error_table = ListingTable::try_new(config).unwrap();

ballista/core/Cargo.toml

+5-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ homepage = "https://github.com/apache/arrow-ballista"
2424
repository = "https://github.com/apache/arrow-ballista"
2525
readme = "README.md"
2626
authors = ["Apache Arrow <[email protected]>"]
27-
edition = "2018"
27+
edition = "2021"
2828
build = "build.rs"
2929

3030
# Exclude proto files so crates.io consumers don't need protoc
@@ -58,7 +58,7 @@ hashbrown = "0.13"
5858
itertools = "0.10"
5959
libloading = "0.7.3"
6060
log = "0.4"
61-
object_store = "0.5.2"
61+
object_store = { workspace = true }
6262
once_cell = "1.9.0"
6363

6464
parking_lot = "0.12"
@@ -67,11 +67,11 @@ prost = "0.11"
6767
prost-types = "0.11"
6868
rand = "0.8"
6969
serde = { version = "1", features = ["derive"] }
70-
sqlparser = "0.32.0"
70+
sqlparser = { workspace = true }
7171
sys-info = "0.9.0"
7272
tokio = "1.0"
7373
tokio-stream = { version = "0.1", features = ["net"] }
74-
tonic = "0.8"
74+
tonic = { workspace = true }
7575
url = "2.2"
7676
uuid = { version = "1.0", features = ["v4"] }
7777
walkdir = "2.3.2"
@@ -81,7 +81,4 @@ tempfile = "3"
8181

8282
[build-dependencies]
8383
rustc_version = "0.4.0"
84-
tonic-build = { version = "0.8", default-features = false, features = [
85-
"transport",
86-
"prost",
87-
] }
84+
tonic-build = { workspace = true }

0 commit comments

Comments
 (0)