Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
278 changes: 102 additions & 176 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ arrow = { version = "58.3", features = ["ipc_compression"] }
arrow-flight = { version = "58.3", features = ["flight-sql-experimental"] }
clap = { version = "4.5", features = ["derive", "cargo"] }

# Keep these as minor-version requirements rather than exact patch pins. The
# python workspace shares these crates through path dependencies, and
# datafusion-python lags behind datafusion patch releases, so pinning a patch
# here can break the wheel build. Cargo.lock records the exact patch version.
datafusion = "54"
datafusion-cli = "54"
datafusion-proto = "54"
Expand Down
4 changes: 2 additions & 2 deletions ballista-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "ballista-cli"
description = "Command Line Client for Ballista distributed query engine."
version = "54.0.0"
version = "54.1.0"
authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
edition = { workspace = true }
rust-version = { workspace = true }
Expand All @@ -33,7 +33,7 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
# CLI-only deps (DataFusion/Ballista) — gated by `cli` feature
ballista = { path = "../ballista/client", version = "54.0.0", features = ["standalone"], optional = true }
ballista = { path = "../ballista/client", version = "54.1.0", features = ["standalone"], optional = true }
datafusion = { workspace = true, optional = true }
datafusion-cli = { workspace = true, optional = true }
rustyline = { version = "18.0.0", optional = true }
Expand Down
12 changes: 6 additions & 6 deletions ballista/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
name = "ballista"
description = "Ballista Distributed Compute"
license = "Apache-2.0"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
readme = "README.md"
Expand All @@ -29,18 +29,18 @@ rust-version = { workspace = true }

[dependencies]
async-trait = { workspace = true }
ballista-core = { path = "../core", version = "54.0.0" }
ballista-executor = { path = "../executor", version = "54.0.0", optional = true, default-features = false, features = ["arrow-ipc-optimizations"] }
ballista-scheduler = { path = "../scheduler", version = "54.0.0", optional = true, default-features = false }
ballista-core = { path = "../core", version = "54.1.0" }
ballista-executor = { path = "../executor", version = "54.1.0", optional = true, default-features = false, features = ["arrow-ipc-optimizations"] }
ballista-scheduler = { path = "../scheduler", version = "54.1.0", optional = true, default-features = false }
datafusion = { workspace = true }
log = { workspace = true }

tokio = { workspace = true }
url = { workspace = true }

[dev-dependencies]
ballista-executor = { path = "../executor", version = "54.0.0" }
ballista-scheduler = { path = "../scheduler", version = "54.0.0" }
ballista-executor = { path = "../executor", version = "54.1.0" }
ballista-scheduler = { path = "../scheduler", version = "54.1.0" }
ctor = { workspace = true }
datafusion-proto = { workspace = true }
env_logger = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion ballista/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
name = "ballista-core"
description = "Ballista Distributed Compute"
license = "Apache-2.0"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
readme = "README.md"
Expand Down
1 change: 1 addition & 0 deletions ballista/core/proto/datafusion.proto
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ message JoinNode {
repeated LogicalExprNode right_join_key = 6;
datafusion_common.NullEquality null_equality = 7;
LogicalExprNode filter = 8;
bool null_aware = 9;
}

message DistinctNode {
Expand Down
4 changes: 2 additions & 2 deletions ballista/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
name = "ballista-executor"
description = "Ballista Distributed Compute - Executor"
license = "Apache-2.0"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
readme = "README.md"
Expand All @@ -42,7 +42,7 @@ spark-compat = ["ballista-core/spark-compat"]
arrow = { workspace = true }
arrow-flight = { workspace = true }
async-trait = { workspace = true }
ballista-core = { path = "../core", version = "54.0.0" }
ballista-core = { path = "../core", version = "54.1.0" }
bytesize = "2"
clap = { workspace = true, optional = true }
dashmap = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions ballista/scheduler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
name = "ballista-scheduler"
description = "Ballista Distributed Compute - Scheduler"
license = "Apache-2.0"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
readme = "README.md"
Expand Down Expand Up @@ -50,7 +50,7 @@ arrow-flight = { workspace = true }
async-trait = { workspace = true }
axum = "0.8.9"
tower-http = { version = "0.7", features = ["cors"] }
ballista-core = { path = "../core", version = "54.0.0" }
ballista-core = { path = "../core", version = "54.1.0" }
clap = { workspace = true, optional = true }
dashmap = { workspace = true }
datafusion = { workspace = true }
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "ballista-benchmarks"
description = "Ballista Benchmarks"
version = "54.0.0"
version = "54.1.0"
edition = "2024"
authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
homepage = "https://datafusion.apache.org/ballista/"
Expand All @@ -31,8 +31,8 @@ ci = []
default = ["mimalloc"]

[dependencies]
ballista = { path = "../ballista/client", version = "54.0.0" }
ballista-core = { path = "../ballista/core", version = "54.0.0", features = [
ballista = { path = "../ballista/client", version = "54.1.0" }
ballista-core = { path = "../ballista/core", version = "54.1.0", features = [
"build-binary",
] }
clap = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "ballista-examples"
description = "Ballista usage examples"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
Expand Down Expand Up @@ -57,10 +57,10 @@ rustls = { version = "0.23", features = ["ring"], optional = true }

[dev-dependencies]
arrow-flight = { workspace = true }
ballista = { path = "../ballista/client", version = "54.0.0" }
ballista-core = { path = "../ballista/core", version = "54.0.0", default-features = false, features = ["build-binary"] }
ballista-executor = { path = "../ballista/executor", version = "54.0.0", default-features = false }
ballista-scheduler = { path = "../ballista/scheduler", version = "54.0.0", default-features = false }
ballista = { path = "../ballista/client", version = "54.1.0" }
ballista-core = { path = "../ballista/core", version = "54.1.0", default-features = false, features = ["build-binary"] }
ballista-executor = { path = "../ballista/executor", version = "54.1.0", default-features = false }
ballista-scheduler = { path = "../ballista/scheduler", version = "54.1.0", default-features = false }
ctor = { workspace = true }
datafusion = { workspace = true }
datafusion-proto = { workspace = true }
Expand Down
10 changes: 5 additions & 5 deletions python/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[package]
name = "pyballista"
version = "54.0.0"
version = "54.1.0"
homepage = "https://datafusion.apache.org/ballista/"
repository = "https://github.com/apache/datafusion-ballista"
authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
Expand All @@ -31,10 +31,10 @@ publish = false

[dependencies]
async-trait = "0.1.89"
ballista = { path = "../ballista/client", version = "54.0.0" }
ballista-core = { path = "../ballista/core", version = "54.0.0" }
ballista-executor = { path = "../ballista/executor", version = "54.0.0", default-features = false }
ballista-scheduler = { path = "../ballista/scheduler", version = "54.0.0", default-features = false }
ballista = { path = "../ballista/client", version = "54.1.0" }
ballista-core = { path = "../ballista/core", version = "54.1.0" }
ballista-executor = { path = "../ballista/executor", version = "54.1.0", default-features = false }
ballista-scheduler = { path = "../ballista/scheduler", version = "54.1.0", default-features = false }
datafusion = { version = "54", features = ["avro"] }
datafusion-proto = { version = "54" }
datafusion-python = { version = "54", default-features = false }
Expand Down
Loading