Spark: Backport branch support for rewrite_data_files to Spark 4.0, 3.5, and 3.4 #15067
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
….5, and 3.4 This backports the branch support feature from Spark 4.1 (PR apache#14964) to Spark 4.0, 3.5, and 3.4. The changes add a new `branch` parameter to the `rewrite_data_files` procedure that allows users to specify which branch to compact data files for. Key changes: - Add `toBranch()` method to RewriteDataFilesSparkAction - Add `branch` parameter to RewriteDataFilesProcedure - Use branch snapshot ID instead of current snapshot for compaction - Pass branch parameter to RewriteDataFilesCommitManager
….0, 3.5, and 3.4 Backport test cases from apache#14964: - testRewriteDataFilesOnBranch - testRewriteDataFilesToNullBranchFails - testRewriteDataFilesOnBranchWithFilter - testBranchCompactionDoesNotAffectMain
Contributor
Author
|
@pvary Can you help review this? |
Contributor
|
Are these clean backports, or did you have to do any manual changes? |
huaxingao
reviewed
Jan 19, 2026
| String explicitBranch = input.asString(BRANCH_PARAM, null); | ||
|
|
||
| // Load SparkTable to extract branch from identifier | ||
| SparkTable sparkTable = loadSparkTable(tableIdent); |
Contributor
There was a problem hiding this comment.
Should we be consistent with 4.1 https://github.com/apache/iceberg/blob/main/spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/procedures/RewriteDataFilesProcedure.java#L123, only call loadSparkTable when explicitBranch == null?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Summary
rewrite_data_filesprocedure from Spark 4.1 to Spark 4.0, 3.5, and 3.4Changes
branchparameter toRewriteDataFilesProcedurefor all three Spark versionstoBranch()method toRewriteDataFilesSparkActionfor all three Spark versionsTest plan