Patched DF 52.5.0 (revision a)#97
Draft
erratic-pattern wants to merge 8 commits intobase-df-upgrade-ver5250from
Draft
Patched DF 52.5.0 (revision a)#97erratic-pattern wants to merge 8 commits intobase-df-upgrade-ver5250from
erratic-pattern wants to merge 8 commits intobase-df-upgrade-ver5250from
Conversation
Includes fix for FixedSizeBinary LEFT JOIN bug - apache/arrow-rs#8981 Cherry-picked test and API updates from - apache#19355
…ons (apache#19078)" This reverts commit ada0923.
…e#19904) ## Which issue does this PR close? <!-- We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes apache#123` indicates that this PR will close issue apache#123. --> - Part of apache#19798 ## Rationale for this change <!-- Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed. Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes. --> This is an edge case, would prefer to fix upstream in arrow-rs instead of having handling code here, so just disable test for now. - arrow-rs issue: apache/arrow-rs#9227 ## What changes are included in this PR? <!-- There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR. --> Disable edge-case array_union SLT ## Are these changes tested? <!-- We typically require tests for all PRs in order to: 1. Prevent the code from being accidentally broken by subsequent changes 2. Serve as another way to document the expected behavior of the code If tests are not included in your PR, please explain why (for example, are they covered by existing tests)? --> Test related change ## Are there any user-facing changes? <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> No. <!-- If there are any breaking changes to public APIs, please add the `api change` label. -->
Hot-fix for security_audit CI on upgrade-df-ver5250-a. Addresses 5 RUSTSEC advisories that landed between 2026-04-14 and 2026-04-27, after upstream DataFusion 52.5.0 was tagged: - RUSTSEC-2026-0098 — rustls-webpki: name constraints for URI names - RUSTSEC-2026-0099 — rustls-webpki: name constraints accepted for wildcard certs - RUSTSEC-2026-0104 — rustls-webpki: reachable panic in CRL parsing - RUSTSEC-2026-0112 — astral-tokio-tar: PAX header desync - RUSTSEC-2026-0113 — astral-tokio-tar: unpack_in chmod via symlink Bumps Cargo.lock only (no Cargo.toml dep range changes): - astral-tokio-tar 0.6.0 -> 0.6.1 - rustls-webpki 0.103.10 -> 0.103.13 When upstream backports these (or the next 52.x release ships them), this commit will auto-drop on rebase.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of
Rebases IOx-specific patches from the 52.3.0 fork (revision a) onto DataFusion 52.5.0.
This is the first DataFusion fork PR opened to track an upgrade originating in
influxdb_pro(rather thaninfluxdb_iox), per the migration of primary development to pro (influxdb_pro#2000).Cherry-picks dropped (superseded by 52.5.0)
1d925b512 [branch-52] fix: disable dynamic filter pushdown for non min/max aggregates (#20279) (#20877)— equivalent commit2947378e9is now onbranch-52, included in 52.5.0.dfe80b9c9 chore(deps): bump lz4_flex from 0.12.0 to 0.12.1 (#20973)— absorbed by upstream76e21d32b [branch-52] chore: update deps for cargo audit (#21415)in 52.5.0.c3f49cdc5 chore(deps): bump quinn-proto from 0.11.13 to 0.11.14 (#20859)— also absorbed by76e21d32b.c01e67e46 fix(physical-expr): stack overflow protection(fork PR fix(physical-expr): stack overflow protection #96, Martin Hilton) — fully superseded. Upstream 52.5.0 ships the exact#[cfg_attr(feature = "recursive_protection", recursive::recursive)]annotation oncreate_physical_expr, plus therecursive_protectionfeature inphysical-expr/Cargo.toml. This is the natural reconvergence point for the OSS/ENT fork-rev split that PR fix(physical-expr): stack overflow protection #96 introduced —influxdb_pro'soss/Cargo.tomlandent/Cargo.tomlnow consume a single rev with no extra patch carried.IOx-specific patches carried forward
8ed5b03d7 chore: skip order calculation / exponential planning12a338c36 (New) Test + workaround for SanityCheck plan— tracked for removal in iox#13281. Upstream5881edec5 [branch-52] fix: SanityCheckPlan error with window functions and NVL filter (#20231) (#20931)lands in 52.5.0; verify whether the IOx workaround can be dropped.1692317a8 chore: add debug logging and skip error on physical schema checkf523b0810 fix: wrap join operators with cooperative() for cancellation support39f127535 chore: bump arrow/parquet to 57.3.0— picks upapache/arrow-rs#9239parquet sparse-offset fix.bb43b6890 Revert "Respect execution timezone in to_timestamp and related functions (#19078)"— reverts upstreamada0923a3(still reachable from 52.5.0); InfluxQL semantics.Additional cherry-picks
c5f12011f Disable failing array_union edge-case with nested null array (#19904)— cherry-picked from upstreammain. Workaround forapache/arrow-rs#9227triggered by arrow 57.3.0 + 52.x. Drop when arrow-rs ships the fix.Verification
cargo build --workspace -p datafusion— clean.cargo test --workspace --no-fail-fast— exit 0 (full workspace suite).cargo test -p datafusion-common --lib— 342 passed; 0 failed.