xudong963 opened a new pull request, #21436:
URL: https://github.com/apache/datafusion/pull/21436
## Which issue does this PR close?
- Closes #.
## Rationale for this change
`Fix sort merge interleave overflow` (#20922) added a temporary
`catch_unwind`
shim around Arrow's `interleave` call because the upstream implementation
still
panicked on offset overflow at the time.
Arrow 58.1.0 includes apache/arrow-rs#9549, which returns
`ArrowError::OffsetOverflowError` directly instead of panicking. DataFusion
main now depends on that release, so the panic recovery path is no longer
needed and only broadens the set of failures we might accidentally treat as
recoverable.
## What changes are included in this PR?
- Remove the temporary panic-catching wrapper from
`BatchBuilder::try_interleave_columns`.
- Keep the existing retry logic, but trigger it only from the returned
`OffsetOverflowError`.
- Replace the panic-specific unit tests with a direct error-shape assertion.
## Are these changes tested?
Yes.
- `cargo test -p datafusion-physical-plan sorts::builder -- --nocapture`
- `cargo test -p datafusion-physical-plan sorts:: -- --nocapture`
- `./dev/rust_lint.sh`
## Are there any user-facing changes?
No.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
