Skip to content

Commit a407500

Browse files
Upgrade arrow-rs, parquet to 54.0.0 and pyo3 to 0.23.3 (#14153)
* Upgrade arrow-rs, parquet and pyo3 * Fix fmt CI
1 parent 3082ac6 commit a407500

File tree

13 files changed

+113
-94
lines changed

13 files changed

+113
-94
lines changed

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ version = "44.0.0"
7777
ahash = { version = "0.8", default-features = false, features = [
7878
"runtime-rng",
7979
] }
80-
arrow = { version = "53.3.0", features = [
80+
arrow = { version = "54.0.0", features = [
8181
"prettyprint",
8282
] }
83-
arrow-array = { version = "53.3.0", default-features = false, features = [
83+
arrow-array = { version = "54.0.0", default-features = false, features = [
8484
"chrono-tz",
8585
] }
86-
arrow-buffer = { version = "53.3.0", default-features = false }
87-
arrow-flight = { version = "53.3.0", features = [
86+
arrow-buffer = { version = "54.0.0", default-features = false }
87+
arrow-flight = { version = "54.0.0", features = [
8888
"flight-sql-experimental",
8989
] }
90-
arrow-ipc = { version = "53.3.0", default-features = false, features = [
90+
arrow-ipc = { version = "54.0.0", default-features = false, features = [
9191
"lz4",
9292
] }
93-
arrow-ord = { version = "53.3.0", default-features = false }
94-
arrow-schema = { version = "53.3.0", default-features = false }
93+
arrow-ord = { version = "54.0.0", default-features = false }
94+
arrow-schema = { version = "54.0.0", default-features = false }
9595
async-trait = "0.1.73"
9696
bigdecimal = "0.4.7"
9797
bytes = "1.4"
@@ -133,7 +133,7 @@ itertools = "0.14"
133133
log = "^0.4"
134134
object_store = { version = "0.11.0", default-features = false }
135135
parking_lot = "0.12"
136-
parquet = { version = "53.3.0", default-features = false, features = [
136+
parquet = { version = "54.0.0", default-features = false, features = [
137137
"arrow",
138138
"async",
139139
"object_store",

datafusion-cli/Cargo.lock

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

datafusion-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rust-version = "1.80.1"
2929
readme = "README.md"
3030

3131
[dependencies]
32-
arrow = { version = "53.0.0" }
32+
arrow = { version = "54.0.0" }
3333
async-trait = "0.1.73"
3434
## 1.5.13 requires a hiher MSRV 1.81 so lock until DataFusion MSRV catches up
3535
aws-config = "=1.5.10"
@@ -62,7 +62,7 @@ home = "=0.5.9"
6262
mimalloc = { version = "0.1", default-features = false }
6363
object_store = { version = "0.11.0", features = ["aws", "gcp", "http"] }
6464
parking_lot = { version = "0.12" }
65-
parquet = { version = "53.0.0", default-features = false }
65+
parquet = { version = "54.0.0", default-features = false }
6666
regex = "1.8"
6767
rustyline = "14.0"
6868
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }

datafusion/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ log = { workspace = true }
6464
object_store = { workspace = true, optional = true }
6565
parquet = { workspace = true, optional = true, default-features = true }
6666
paste = "1.0.15"
67-
pyo3 = { version = "0.22.0", optional = true }
67+
pyo3 = { version = "0.23.3", optional = true }
6868
recursive = { workspace = true, optional = true }
6969
sqlparser = { workspace = true }
7070
tokio = { workspace = true }

datafusion/common/src/file_options/parquet_writer.rs

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use crate::{
2626
};
2727

2828
use arrow_schema::Schema;
29+
#[allow(deprecated)]
2930
use parquet::{
3031
arrow::ARROW_SCHEMA_META_KEY,
3132
basic::{BrotliLevel, GzipLevel, ZstdLevel},
@@ -157,8 +158,10 @@ impl TryFrom<&TableParquetOptions> for WriterPropertiesBuilder {
157158
}
158159

159160
if let Some(max_statistics_size) = options.max_statistics_size {
160-
builder =
161-
builder.set_column_max_statistics_size(path, max_statistics_size);
161+
builder = {
162+
#[allow(deprecated)]
163+
builder.set_column_max_statistics_size(path, max_statistics_size)
164+
}
162165
}
163166
}
164167

@@ -244,15 +247,19 @@ impl ParquetOptions {
244247
.and_then(|s| parse_statistics_string(s).ok())
245248
.unwrap_or(DEFAULT_STATISTICS_ENABLED),
246249
)
247-
.set_max_statistics_size(
248-
max_statistics_size.unwrap_or(DEFAULT_MAX_STATISTICS_SIZE),
249-
)
250250
.set_max_row_group_size(*max_row_group_size)
251251
.set_created_by(created_by.clone())
252252
.set_column_index_truncate_length(*column_index_truncate_length)
253253
.set_data_page_row_count_limit(*data_page_row_count_limit)
254254
.set_bloom_filter_enabled(*bloom_filter_on_write);
255255

256+
builder = {
257+
#[allow(deprecated)]
258+
builder.set_max_statistics_size(
259+
max_statistics_size.unwrap_or(DEFAULT_MAX_STATISTICS_SIZE),
260+
)
261+
};
262+
256263
if let Some(bloom_filter_fpp) = bloom_filter_fpp {
257264
builder = builder.set_bloom_filter_fpp(*bloom_filter_fpp);
258265
};
@@ -528,6 +535,7 @@ mod tests {
528535
),
529536
bloom_filter_fpp: bloom_filter_default_props.map(|p| p.fpp),
530537
bloom_filter_ndv: bloom_filter_default_props.map(|p| p.ndv),
538+
#[allow(deprecated)]
531539
max_statistics_size: Some(props.max_statistics_size(&col)),
532540
}
533541
}

0 commit comments

Comments
 (0)