Spark: Fix wap branch metadata delete on the wrong branch#15592
Open
yingjianwu98 wants to merge 3 commits intoapache:mainfrom
Open
Spark: Fix wap branch metadata delete on the wrong branch#15592yingjianwu98 wants to merge 3 commits intoapache:mainfrom
yingjianwu98 wants to merge 3 commits intoapache:mainfrom
Conversation
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.
SparkTable.deleteWhere()andcanDeleteWhere()do not resolve the WAP (Write-Audit-Publish) branch from the session configuration. When a user setsspark.wap.branchand performs a metadata-level delete, both the scan and the commit incorrectly target the main branch instead of the WAP branch.For
deleteWhere(), I think it's a recent regression from this PR. The new change doesn't resolve to the right branch in the new extension rule for Spark 4.1. I don't see an easy way to resolve this issues in the resolveBranch Rule as I believe OptimizeMetadataOnlyDeleteFromTable optimizer rule will discard ResolveBranch rule and then triggerdeleteWhere()which currently doesn't respect the wap branch if specified.For
canDeleteWhere(), this is an existing issue across all spark version and I have been working on a fix here#15512
This causes two issues:
canDeleteWhere()scans the wrong branch's files, so it cannot correctly determine whether the delete can be resolved at the metadata leveldeleteWhere()commits the delete to main instead of the WAP branch, silently dropping the deleteFix: