[branch-52] fix: use spill writer's schema instead of the first batch schema for spill files (#21293)#21403
Open
alamb wants to merge 1 commit intoapache:branch-52from
Open
[branch-52] fix: use spill writer's schema instead of the first batch schema for spill files (#21293)#21403alamb wants to merge 1 commit intoapache:branch-52from
alamb wants to merge 1 commit intoapache:branch-52from
Conversation
…spill files (apache#21293) <!-- 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. --> - Closes apache#21292. <!-- 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. --> `InProgressSpillFile` will use the first batch schema when it has no writer, which could have different nullability from the subsequent batches (e.g. due to union-ing a literal projection and a table column projection). This can then lead to a panic in `sort_batch`. `InProgressSpillFile` already has access to the canonical schema that the spill file should have (`self.spill_writer.schema()`). <!-- 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. --> Single line fix: instead of using the first batch schema for the spill file schema, use the spill_writer's schema instead. The rest of the changes are two new tests. <!-- 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)? --> Yes, two new tests are added. <!-- If there are user-facing changes then we may require documentation to be updated before approving the PR. --> <!-- If there are any breaking changes to public APIs, please add the `api change` label. -->
10 tasks
github-actions
bot
added
core
alamb
commented
Apr 6, 2026
| // Individual batches may have different schemas (e.g., different nullability) | ||
| // when they come from different branches of a UnionExec. The SpillManager's | ||
| // schema represents the canonical schema that all batches should conform to. | ||
| let schema = self.spill_writer.schema(); |
Contributor
Author
There was a problem hiding this comment.
this is the code change. The rest are test changes
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
2 participants
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.
This PR: