Skip to content

Commit a0f7091

Browse files
committed
Merge remote-tracking branch 'apache/master' into doki_dev
2 parents b392bc2 + b161216 commit a0f7091

52 files changed

Lines changed: 5023 additions & 3882 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ members = [
2424
"datafusion-physical-expr",
2525
"datafusion-cli",
2626
"datafusion-examples",
27+
"datafusion-proto",
2728
"benchmarks",
2829
"ballista/rust/client",
2930
"ballista/rust/core",

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Projects that adapt to or serve as plugins to DataFusion:
5555
- [datafusion-java](https://github.com/datafusion-contrib/datafusion-java)
5656
- [datafusion-objectstore-s3](https://github.com/datafusion-contrib/datafusion-objectstore-s3)
5757
- [datafusion-hdfs-native](https://github.com/datafusion-contrib/datafusion-hdfs-native)
58+
- [datafusion-bigtable](https://github.com/datafusion-contrib/datafusion-bigtable)
5859

5960
Here are some of the projects known to use DataFusion:
6061

‎ballista/rust/core/Cargo.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ simd = ["datafusion/simd"]
3131

3232
[dependencies]
3333
ahash = { version = "0.7", default-features = false }
34-
async-trait = "0.1.36"
34+
async-trait = "0.1.41"
3535
futures = "0.3"
3636
hashbrown = "0.12"
3737
log = "0.4"
3838
prost = "0.9"
39+
prost-types = "0.9"
3940
serde = {version = "1", features = ["derive"]}
4041
sqlparser = "0.14"
4142
tokio = "1.0"
@@ -45,8 +46,9 @@ chrono = { version = "0.4", default-features = false }
4546
clap = { version = "3", features = ["derive", "cargo"] }
4647
parse_arg = "0.1.3"
4748

48-
arrow-flight = { version = "9.1" }
49+
arrow-flight = { version = "10.0" }
4950
datafusion = { path = "../../../datafusion", version = "7.0.0" }
51+
datafusion-proto = { path = "../../../datafusion-proto", version = "7.0.0" }
5052

5153
parking_lot = "0.12"
5254

‎ballista/rust/core/build.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ fn main() -> Result<(), String> {
2020
println!("cargo:rerun-if-env-changed=FORCE_REBUILD");
2121

2222
println!("cargo:rerun-if-changed=proto/ballista.proto");
23+
println!("cargo:rerun-if-changed=proto/datafusion.proto");
2324
tonic_build::configure()
25+
.extern_path(".datafusion", "::datafusion_proto::protobuf")
2426
.compile(&["proto/ballista.proto"], &["proto"])
2527
.map_err(|e| format!("protobuf compilation failed: {}", e))
2628
}

0 commit comments

Comments
 (0)