[branch-54] fix: preserve null_aware on logical JoinNode proto round-trip (backport #22104)#22785
Merged
Merged
Conversation
…#22104) ## Summary Closes apache#22065. `null_aware` was missing from `JoinNode` in the logical proto (it was added to the physical `HashJoinExecNode` in apache#19635). The encoder dropped it via `..` destructuring and the decoder had no field to restore it from, so any `to_proto` -> `from_proto` round trip silently downgraded a null-aware LeftAnti (NOT IN semantics) to a plain LeftAnti and returned wrong rows. ## Changes - Add `bool null_aware = 9;` to `JoinNode`. - Decoder switches to `Join::try_new`, plumbing `null_aware` and `null_equality` (same bug, same path) from the wire. - Encoder destructure binds `schema: _` instead of `..`, so any future `Join` field is a compile error here instead of a silent drop. - Decoder rejects mismatched `left_join_key`/`right_join_key` lengths via `proto_error`. - Regression tests `roundtrip_join_null_aware` and `roundtrip_join_null_equality`, each exercising one non-default field. ## Test plan - `cargo test -p datafusion-proto --test proto_integration cases::roundtrip_logical_plan` passes. - Clippy clean. (cherry picked from commit 4055e44)
13 tasks
Contributor
|
The CI failure seems to have been due to some sort of infrastructure problem -- retriggered it |
alamb
approved these changes
Jun 8, 2026
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.
Which issue does this PR close?
branch-54(for 54.1.0, tracked in Release DataFusion54.1.0(minor/patch) Release #22547).This PR:
branch-54line so thenull_awareprotoround-trip fix ships in 54.1.0, as requested in
logical JoinNode proto missing null_aware field (follow-up to #19635) #22065 (comment)
Clean cherry-pick;
datafusion-protobuilds and both round-tripregression tests pass on
branch-54.