Skip to content

[branch-45]: Backport chore: Upgrade to arrow/parquet 54.1.0 and fix clippy/ci (#14415) #14453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged

[branch-45]: Backport chore: Upgrade to arrow/parquet 54.1.0 and fix clippy/ci (#14415) #14453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ version = "45.0.0"
ahash = { version = "0.8", default-features = false, features = [
"runtime-rng",
] }
arrow = { version = "54.0.0", features = [
arrow = { version = "54.1.0", features = [
"prettyprint",
] }
arrow-array = { version = "54.0.0", default-features = false, features = [
arrow-array = { version = "54.1.0", default-features = false, features = [
"chrono-tz",
] }
arrow-buffer = { version = "54.0.0", default-features = false }
arrow-flight = { version = "54.0.0", features = [
arrow-buffer = { version = "54.1.0", default-features = false }
arrow-flight = { version = "54.1.0", features = [
"flight-sql-experimental",
] }
arrow-ipc = { version = "54.0.0", default-features = false, features = [
arrow-ipc = { version = "54.1.0", default-features = false, features = [
"lz4",
] }
arrow-ord = { version = "54.0.0", default-features = false }
arrow-schema = { version = "54.0.0", default-features = false }
arrow-ord = { version = "54.1.0", default-features = false }
arrow-schema = { version = "54.1.0", default-features = false }
async-trait = "0.1.73"
bigdecimal = "0.4.7"
bytes = "1.4"
Expand Down Expand Up @@ -133,7 +133,7 @@ itertools = "0.14"
log = "^0.4"
object_store = { version = "0.11.0", default-features = false }
parking_lot = "0.12"
parquet = { version = "54.0.0", default-features = false, features = [
parquet = { version = "54.1.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
67 changes: 37 additions & 30 deletions datafusion-cli/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions datafusion-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rust-version = "1.81.0"
readme = "README.md"

[dependencies]
arrow = { version = "54.0.0" }
arrow = { version = "54.1.0" }
async-trait = "0.1.0"
aws-config = "1.5.0"
aws-credential-types = "1.2.0"
Expand Down Expand Up @@ -57,7 +57,7 @@ home = "=0.5.11"
mimalloc = { version = "0.1", default-features = false }
object_store = { version = "0.11.0", features = ["aws", "gcp", "http"] }
parking_lot = { version = "0.12" }
parquet = { version = "54.0.0", default-features = false }
parquet = { version = "54.1.0", default-features = false }
regex = "1.8"
rustyline = "15.0"
tokio = { version = "1.24", features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }
Expand Down
11 changes: 3 additions & 8 deletions datafusion/core/src/datasource/physical_plan/arrow_file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,8 @@ impl FileOpener for ArrowOpener {
for (dict_block, dict_result) in
footer.dictionaries().iter().flatten().zip(dict_results)
{
decoder.read_dictionary(
dict_block,
&Buffer::from_bytes(dict_result.into()),
)?;
decoder
.read_dictionary(dict_block, &Buffer::from(dict_result))?;
}

// filter recordbatches according to range
Expand Down Expand Up @@ -348,10 +346,7 @@ impl FileOpener for ArrowOpener {
.zip(recordbatch_results)
.filter_map(move |(block, data)| {
decoder
.read_record_batch(
&block,
&Buffer::from_bytes(data.into()),
)
.read_record_batch(&block, &Buffer::from(data))
.transpose()
}),
)
Expand Down
Loading