Spark 4.1: Align handling of branches in reads and writes#15288
Merged
aokolnychyi merged 4 commits intoapache:mainfrom Feb 17, 2026
Merged
Spark 4.1: Align handling of branches in reads and writes#15288aokolnychyi merged 4 commits intoapache:mainfrom
aokolnychyi merged 4 commits intoapache:mainfrom
Conversation
aokolnychyi
commented
Feb 10, 2026
| } | ||
|
|
||
| public String branch() { | ||
| String optionBranch = confParser.stringConf().option(SparkReadOptions.BRANCH).parseOptional(); |
Contributor
Author
There was a problem hiding this comment.
Moved into a utility call. I will remove this method in subsequent PRs and use the utility directly.
aokolnychyi
commented
Feb 10, 2026
| } | ||
|
|
||
| public String branch() { | ||
| if (wapEnabled()) { |
Contributor
Author
There was a problem hiding this comment.
Moved into a utility call. I will remove this method in subsequent PRs.
We will have to resolve branches earlier.
Contributor
Author
|
This PR includes a behavior change from #15240 to simplify the main PR and review. cc @amogh-jahagirdar @nastra @szehon-ho @huaxingao @singhpk234 |
Contributor
Author
|
@amogh-jahagirdar @nastra @szehon-ho @huaxingao @singhpk234, could you check this one? It is the last one before I can rebase the main PR with versioned Spark tables support. |
amogh-jahagirdar
approved these changes
Feb 17, 2026
Contributor
amogh-jahagirdar
left a comment
amogh-jahagirdar
left a comment
There was a problem hiding this comment.
Thanks @aokolnychyi , this looks right to me!
Contributor
Author
|
Thanks, @amogh-jahagirdar! |
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 aligns handling of branches in reads and writes.
After this PR, we will allow writes that explicitly provide the branch to succeed even if WAP is configured. Just like we allow this for reads. If the user configures a branch via identifier or in option, it must override everything else. The only remaining difference is that writes are allowed to create new branches.