Skip to content

Commit b8be7b7

Browse files
authored
chore: Upgrade to datafusion 47.0.0-rc1 and arrow-rs 55.0.0 (#1563)
1 parent 5ed43aa commit b8be7b7

File tree

38 files changed

+689
-401
lines changed

38 files changed

+689
-401
lines changed

native/Cargo.lock

Lines changed: 427 additions & 279 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

native/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ edition = "2021"
3434
rust-version = "1.85"
3535

3636
[workspace.dependencies]
37-
arrow = { version = "54.2.0", features = ["prettyprint", "ffi", "chrono-tz"] }
37+
arrow = { version = "55.0.0", features = ["prettyprint", "ffi", "chrono-tz"] }
3838
async-trait = { version = "0.1" }
3939
bytes = { version = "1.10.0" }
40-
parquet = { version = "54.2.0", default-features = false, features = ["experimental"] }
41-
datafusion = { version = "46.0.0", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] }
40+
parquet = { version = "55.0.0", default-features = false, features = ["experimental"] }
41+
datafusion = { git = "https://github.com/apache/datafusion", rev = "47.0.0-rc1", default-features = false, features = ["unicode_expressions", "crypto_expressions", "nested_expressions", "parquet"] }
4242
datafusion-comet-spark-expr = { path = "spark-expr", version = "0.8.0" }
4343
datafusion-comet-proto = { path = "proto", version = "0.8.0" }
4444
chrono = { version = "0.4", default-features = false, features = ["clock"] }
@@ -48,7 +48,7 @@ num = "0.4"
4848
rand = "0.8"
4949
regex = "1.9.6"
5050
thiserror = "1"
51-
object_store = { version = "0.11.0", features = ["gcp", "azure", "aws", "http"] }
51+
object_store = { version = "0.12.0", features = ["gcp", "azure", "aws", "http"] }
5252
url = "2.2"
5353

5454
[profile.release]

native/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jni = { version = "0.21", features = ["invocation"] }
7777
lazy_static = "1.4"
7878
assertables = "7"
7979
hex = "0.4.3"
80-
datafusion-functions-nested = "46.0.0"
80+
datafusion-functions-nested = { git = "https://github.com/apache/datafusion", rev = "47.0.0-rc1" }
8181

8282
[features]
8383
default = []

native/core/src/execution/expressions/bloom_filter_might_contain.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use arrow::record_batch::RecordBatch;
2222
use datafusion::common::{internal_err, Result, ScalarValue};
2323
use datafusion::physical_expr::PhysicalExpr;
2424
use datafusion::physical_plan::ColumnarValue;
25+
use std::fmt::Formatter;
2526
use std::hash::Hash;
2627
use std::{any::Any, fmt::Display, sync::Arc};
2728

@@ -140,4 +141,8 @@ impl PhysicalExpr for BloomFilterMightContain {
140141
Arc::clone(&children[1]),
141142
)?))
142143
}
144+
145+
fn fmt_sql(&self, _: &mut Formatter<'_>) -> std::fmt::Result {
146+
unimplemented!()
147+
}
143148
}

native/core/src/execution/expressions/subquery.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ impl PhysicalExpr for Subquery {
6767
self
6868
}
6969

70+
fn fmt_sql(&self, _: &mut Formatter<'_>) -> std::fmt::Result {
71+
unimplemented!()
72+
}
73+
7074
fn data_type(&self, _: &Schema) -> datafusion::common::Result<DataType> {
7175
Ok(self.data_type.clone())
7276
}

native/core/src/execution/operators/copy.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ impl DisplayAs for CopyExec {
9999
DisplayFormatType::Default | DisplayFormatType::Verbose => {
100100
write!(f, "CopyExec [{:?}]", self.mode)
101101
}
102+
DisplayFormatType::TreeRender => unimplemented!(),
102103
}
103104
}
104105
}

native/core/src/execution/operators/expand.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ impl DisplayAs for ExpandExec {
8585

8686
Ok(())
8787
}
88+
DisplayFormatType::TreeRender => unimplemented!(),
8889
}
8990
}
9091
}

native/core/src/execution/operators/filter.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ impl DisplayAs for FilterExec {
312312
self.predicate, display_projections
313313
)
314314
}
315+
DisplayFormatType::TreeRender => unimplemented!(),
315316
}
316317
}
317318
}

native/core/src/execution/operators/scan.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ impl DisplayAs for ScanExec {
384384
.collect();
385385
write!(f, "schema=[{}]", fields.join(", "))?;
386386
}
387+
DisplayFormatType::TreeRender => unimplemented!(),
387388
}
388389
Ok(())
389390
}

native/core/src/execution/shuffle/shuffle_writer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl DisplayAs for ShuffleWriterExec {
120120
self.partitioning, self.enable_fast_encoding, self.codec
121121
)
122122
}
123+
DisplayFormatType::TreeRender => unimplemented!(),
123124
}
124125
}
125126
}

0 commit comments

Comments
 (0)