Skip to content

Commit e3ea7d1

Browse files
alambWeijun-H
andauthored
chore: Upgrade to arrow/parquet 54.1.0 and fix clippy/ci (#14415) (#14453)
* chore: Fixed CI * chore * chore: Fixed clippy * chore Co-authored-by: Alex Huang <[email protected]>
1 parent 1a29bd3 commit e3ea7d1

File tree

6 files changed

+56
-763
lines changed

6 files changed

+56
-763
lines changed

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ version = "45.0.0"
7777
ahash = { version = "0.8", default-features = false, features = [
7878
"runtime-rng",
7979
] }
80-
arrow = { version = "54.0.0", features = [
80+
arrow = { version = "54.1.0", features = [
8181
"prettyprint",
8282
] }
83-
arrow-array = { version = "54.0.0", default-features = false, features = [
83+
arrow-array = { version = "54.1.0", default-features = false, features = [
8484
"chrono-tz",
8585
] }
86-
arrow-buffer = { version = "54.0.0", default-features = false }
87-
arrow-flight = { version = "54.0.0", features = [
86+
arrow-buffer = { version = "54.1.0", default-features = false }
87+
arrow-flight = { version = "54.1.0", features = [
8888
"flight-sql-experimental",
8989
] }
90-
arrow-ipc = { version = "54.0.0", default-features = false, features = [
90+
arrow-ipc = { version = "54.1.0", default-features = false, features = [
9191
"lz4",
9292
] }
93-
arrow-ord = { version = "54.0.0", default-features = false }
94-
arrow-schema = { version = "54.0.0", default-features = false }
93+
arrow-ord = { version = "54.1.0", default-features = false }
94+
arrow-schema = { version = "54.1.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 = "54.0.0", default-features = false, features = [
136+
parquet = { version = "54.1.0", default-features = false, features = [
137137
"arrow",
138138
"async",
139139
"object_store",

datafusion-cli/Cargo.lock

Lines changed: 37 additions & 30 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.81.0"
2929
readme = "README.md"
3030

3131
[dependencies]
32-
arrow = { version = "54.0.0" }
32+
arrow = { version = "54.1.0" }
3333
async-trait = "0.1.0"
3434
aws-config = "1.5.0"
3535
aws-credential-types = "1.2.0"
@@ -57,7 +57,7 @@ home = "=0.5.11"
5757
mimalloc = { version = "0.1", default-features = false }
5858
object_store = { version = "0.11.0", features = ["aws", "gcp", "http"] }
5959
parking_lot = { version = "0.12" }
60-
parquet = { version = "54.0.0", default-features = false }
60+
parquet = { version = "54.1.0", default-features = false }
6161
regex = "1.8"
6262
rustyline = "15.0"
6363
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }

datafusion/core/src/datasource/physical_plan/arrow_file.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,8 @@ impl FileOpener for ArrowOpener {
309309
for (dict_block, dict_result) in
310310
footer.dictionaries().iter().flatten().zip(dict_results)
311311
{
312-
decoder.read_dictionary(
313-
dict_block,
314-
&Buffer::from_bytes(dict_result.into()),
315-
)?;
312+
decoder
313+
.read_dictionary(dict_block, &Buffer::from(dict_result))?;
316314
}
317315

318316
// filter recordbatches according to range
@@ -348,10 +346,7 @@ impl FileOpener for ArrowOpener {
348346
.zip(recordbatch_results)
349347
.filter_map(move |(block, data)| {
350348
decoder
351-
.read_record_batch(
352-
&block,
353-
&Buffer::from_bytes(data.into()),
354-
)
349+
.read_record_batch(&block, &Buffer::from(data))
355350
.transpose()
356351
}),
357352
)

0 commit comments

Comments
 (0)