Skip to content

Commit 11008dc

Browse files
barbarjmdashti
andauthored
Upgrade to pre-release DataFusion 55 (#44)
As part of [this](paradedb/paradedb#5553) switch to pre-release DataFusion 55. This PR updates the DF rev used, fixes the compile errors, updates a bunch of test outputs, and removes the unnecessary statistics wrapper. --------- Co-authored-by: Mohammad Dashti <mdashti@gmail.com>
1 parent d800d41 commit 11008dc

45 files changed

Lines changed: 5962 additions & 6074 deletions

Some content is hidden

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

Cargo.lock

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

Cargo.toml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
members = ["benchmarks", "cli", "console"]
33

44
[workspace.dependencies]
5-
datafusion = { version = "54.0.0", default-features = false }
6-
datafusion-proto = { version = "54.0.0" }
5+
datafusion = { git = "https://github.com/apache/datafusion", rev = "8d680db14a9134837bbd3d53497dd58c985c51a7", default-features = false }
6+
datafusion-proto = { git = "https://github.com/apache/datafusion", rev = "8d680db14a9134837bbd3d53497dd58c985c51a7", default-features = false, features = [
7+
"parquet",
8+
] }
79

810
[package]
911
name = "datafusion-distributed"
@@ -15,12 +17,12 @@ documentation = "https://datafusion-contrib.github.io/datafusion-distributed/"
1517
repository = "https://github.com/datafusion-contrib/datafusion-distributed"
1618

1719
[dependencies]
18-
chrono = { version = "0.4.44" }
20+
chrono = { version = "0.4.45" }
1921
datafusion = { workspace = true, features = [
20-
"parquet",
21-
"sql",
22-
"unicode_expressions",
23-
"datetime_expressions",
22+
"parquet",
23+
"sql",
24+
"unicode_expressions",
25+
"datetime_expressions",
2426
] }
2527
datafusion-proto = { workspace = true }
2628
async-trait = "0.1.89"
@@ -50,16 +52,16 @@ bincode = "1"
5052
tonic-prost = { version = "0.14.2", optional = true }
5153

5254
# grpc-specific features
53-
arrow-flight = { version = "58", optional = true }
54-
arrow-select = { version = "58", optional = true }
55-
arrow-ipc = { version = "58", features = ["zstd"], optional = true }
55+
arrow-flight = { version = "59", optional = true }
56+
arrow-select = { version = "59", optional = true }
57+
arrow-ipc = { version = "59", features = ["zstd"], optional = true }
5658
tonic = { version = "0.14.1", features = ["transport"], optional = true }
5759
tower = { version = "0.5.2", optional = true }
5860

5961
# integration_tests deps
6062
insta = { version = "1.46.0", features = ["filters"], optional = true }
61-
parquet = { version = "58", optional = true }
62-
arrow = { version = "58", optional = true, features = ["test_utils"] }
63+
parquet = { version = "59", optional = true }
64+
arrow = { version = "59", optional = true, features = ["test_utils"] }
6365
hyper-util = { version = "0.1.16", optional = true }
6466

6567
[features]
@@ -71,7 +73,7 @@ grpc = [
7173
"arrow-ipc",
7274
"tonic",
7375
"tonic-prost",
74-
"tower"
76+
"tower",
7577
]
7678

7779
integration = ["insta", "parquet", "arrow", "hyper-util", "grpc"]
@@ -83,8 +85,8 @@ sysinfo = ["dep:sysinfo"]
8385
[dev-dependencies]
8486
structopt = "0.3"
8587
insta = { version = "1.46.0", features = ["filters"] }
86-
parquet = "58"
87-
arrow = { version = "58", features = ["test_utils"] }
88+
parquet = "59"
89+
arrow = { version = "59", features = ["test_utils"] }
8890
tokio-stream = { version = "0.1.17", features = ["sync"] }
8991
hyper-util = "0.1.16"
9092
pretty_assertions = "1.4"

benchmarks/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ datafusion-distributed = { path = "..", features = [
1111
"system-metrics",
1212
] }
1313
tokio = { version = "1.48", features = ["full"] }
14-
parquet = { version = "58" }
14+
parquet = { version = "59" }
1515
structopt = { version = "0.3.26" }
1616
log = "0.4.27"
1717
serde = "1.0.219"
@@ -20,10 +20,10 @@ env_logger = "0.11.8"
2020
async-trait = "0.1.89"
2121
futures = "0.3.31"
2222
url = "2.5.7"
23-
arrow = { version = "58", features = ["test_utils"] }
23+
arrow = { version = "59", features = ["test_utils"] }
2424
tonic = { version = "0.14.1", features = ["transport"] }
25-
tpchgen = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "438e9c2dbc25b2fff82c0efc08b3f13b5707874f" }
26-
tpchgen-arrow = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "438e9c2dbc25b2fff82c0efc08b3f13b5707874f" }
25+
tpchgen = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "0f6747e592dbdf9dadd5cd3c5a43e867267bb62f" }
26+
tpchgen-arrow = { git = "https://github.com/clflushopt/tpchgen-rs", rev = "0f6747e592dbdf9dadd5cd3c5a43e867267bb62f" }
2727
reqwest = "0.12"
2828
zip = "6.0"
2929
axum = "0.7"

benchmarks/src/datasets/tpch.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use super::common;
2+
use arrow::error::ArrowError;
23
use arrow::record_batch::RecordBatch;
34
use datafusion::error::DataFusionError;
45
use parquet::{arrow::arrow_writer::ArrowWriter, file::properties::WriterProperties};
@@ -27,19 +28,20 @@ fn generate_table<A>(
2728
data_dir: &Path,
2829
) -> Result<(), Box<dyn std::error::Error>>
2930
where
30-
A: Iterator<Item = RecordBatch>,
31+
A: Iterator<Item = Result<RecordBatch, ArrowError>>,
3132
{
3233
let output_path = data_dir.join(format!("{table_name}.parquet"));
3334

3435
if let Some(first_batch) = data_source.next() {
36+
let first_batch = first_batch?;
3537
let file = fs::File::create(&output_path)?;
3638
let props = WriterProperties::builder().build();
3739
let mut writer = ArrowWriter::try_new(file, first_batch.schema(), Some(props))?;
3840

3941
writer.write(&first_batch)?;
4042

4143
for batch in data_source {
42-
writer.write(&batch)?;
44+
writer.write(&batch?)?;
4345
}
4446

4547
writer.close()?;

0 commit comments

Comments
 (0)