Skip to content
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.

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

build(deps): upgrade datafusion from 0.41 to 0.42 #149

Merged
merged 4 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
matrix:
# TODO: add windows
os: [ ubuntu-22.04, macos-14 ]
python-version: [ '3.8', '3.12' ]
python-version: [ '3.9', '3.12' ]
exclude:
- os: macos-14
python-version: '3.8'
python-version: '3.9'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
34 changes: 17 additions & 17 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,25 @@ repository = "https://github.com/apache/hudi-rs"

[workspace.dependencies]
# arrow
arrow = { version = "= 52.2.0", features = ["pyarrow"] }
arrow-arith = { version = "= 52.2.0" }
arrow-array = { version = "= 52.2.0" }
arrow-buffer = { version = "= 52.2.0" }
arrow-cast = { version = "= 52.2.0" }
arrow-ipc = { version = "= 52.2.0" }
arrow-json = { version = "= 52.2.0" }
arrow-ord = { version = "= 52.2.0" }
arrow-row = { version = "= 52.2.0" }
arrow-schema = { version = "= 52.2.0", features = ["serde"] }
arrow-select = { version = "= 52.2.0" }
object_store = { version = "= 0.10.2", features = ["aws", "azure", "gcp"] }
parquet = { version = "= 52.2.0", features = ["async", "object_store"] }
arrow = { version = "= 53.0.0", features = ["pyarrow"] }
arrow-arith = { version = "= 53.0.0" }
arrow-array = { version = "= 53.0.0" }
arrow-buffer = { version = "= 53.0.0" }
arrow-cast = { version = "= 53.0.0" }
arrow-ipc = { version = "= 53.0.0" }
arrow-json = { version = "= 53.0.0" }
arrow-ord = { version = "= 53.0.0" }
arrow-row = { version = "= 53.0.0" }
arrow-schema = { version = "= 53.0.0", features = ["serde"] }
arrow-select = { version = "= 53.0.0" }
object_store = { version = "= 0.11.0", features = ["aws", "azure", "gcp"] }
parquet = { version = "= 53.0.0", features = ["async", "object_store"] }

# datafusion
datafusion = { version = "= 41.0.0" }
datafusion-expr = { version = "= 41.0.0" }
datafusion-common = { version = "= 41.0.0" }
datafusion-physical-expr = { version = "= 41.0.0" }
datafusion = { version = "= 42.0.0" }
datafusion-expr = { version = "= 42.0.0" }
datafusion-common = { version = "= 42.0.0" }
datafusion-physical-expr = { version = "= 42.0.0" }

# serde
serde = { version = "1.0.203", features = ["derive"] }
Expand Down
10 changes: 5 additions & 5 deletions crates/datafusion/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ mod tests {
) -> SessionContext {
let config = SessionConfig::new().set(
"datafusion.sql_parser.enable_ident_normalization",
ScalarValue::from(false),
&ScalarValue::from(false),
);
let ctx = SessionContext::new_with_config(config);
let base_url = test_table.url();
Expand All @@ -201,16 +201,16 @@ mod tests {
let explaining_rb = explaining_rb.first().unwrap();
let plan = get_str_column(explaining_rb, "plan").join("");
let plan_lines: Vec<&str> = plan.lines().map(str::trim).collect();
assert!(plan_lines[2].starts_with("SortExec: TopK(fetch=10)"));
assert!(plan_lines[3].starts_with(&format!(
assert!(plan_lines[1].starts_with("SortExec: TopK(fetch=10)"));
assert!(plan_lines[2].starts_with(&format!(
"ProjectionExec: expr=[id@0 as id, name@1 as name, isActive@2 as isActive, \
get_field(structField@3, field2) as {}.structField[field2]]",
table_name
)));
assert!(plan_lines[5].starts_with(
assert!(plan_lines[4].starts_with(
"FilterExec: CAST(id@0 AS Int64) % 2 = 0 AND get_field(structField@3, field2) > 30"
));
assert!(plan_lines[6].contains(&format!("input_partitions={}", planned_input_partitioned)));
assert!(plan_lines[5].contains(&format!("input_partitions={}", planned_input_partitioned)));
}

async fn verify_data(ctx: &SessionContext, sql: &str, table_name: &str) {
Expand Down
4 changes: 2 additions & 2 deletions python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ futures = { workspace = true }
tokio = { workspace = true }

[dependencies.pyo3]
version = "0.21.2"
features = ["extension-module", "abi3", "abi3-py38", "gil-refs", "anyhow"]
version = "0.22.2"
features = ["extension-module", "abi3", "abi3-py39", "anyhow"]
7 changes: 3 additions & 4 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@ build-backend = "maturin"
name = "hudi"
description = "Native Python binding for Apache Hudi, based on hudi-rs."
urls = { repository = "https://github.com/apache/hudi-rs/tree/main/python/" }
requires-python = ">=3.8"
requires-python = ">=3.9"
keywords = ["apachehudi", "hudi", "datalake", "arrow"]
license = "Apache License 2.0"
classifiers = [
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12"
]
dependencies = [
"pyarrow>=8",
"pyarrow>=11.0.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to update in-code version check also, in test_table_read.py

"pyarrow-hotfix",
]

Expand All @@ -52,7 +51,7 @@ dynamic = ["version"]
module-name = "hudi._internal"

[tool.ruff]
target-version = 'py38'
target-version = 'py39'
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
lint.select = [
"E4",
Expand Down
Loading