Skip to content

Commit 623e388

Browse files
authored
[uniform]pass startSnapshotID when create rewriter (delta-io#4506)
<!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, please read our contributor guidelines: https://github.com/delta-io/delta/blob/master/CONTRIBUTING.md 2. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP] Your PR title ...'. 3. Be sure to keep the PR description updated to reflect all changes. 4. Please write your PR title to summarize what this PR proposes. 5. If possible, provide a concise example to reproduce the issue for a faster review. 6. If applicable, include the corresponding issue number in the PR title and link it in the body. --> #### Which Delta project/connector is this regarding? <!-- Please add the component selected below to the beginning of the pull request title For example: [Spark] Title of my pull request --> - [x] Spark - [ ] Standalone - [ ] Flink - [ ] Kernel - [ ] Other (fill in here) ## Description <!-- - Describe what this PR changes. - Describe why we need the change. If this PR resolves an issue be sure to include "Resolves #XXX" to correctly link and close the issue upon merge. --> pass the `startingSnapshotId` via `validateFromSnapshot` when creating the rewriteHelper ## How was this patch tested? <!-- If tests were added, say they were added here. Please make sure to test the changes thoroughly including negative and positive cases if possible. If the changes were tested in any way other than unit tests, please clarify how you tested step by step (ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future). If the changes were not tested, please explain why. --> existing tests ## Does this PR introduce _any_ user-facing changes? <!-- If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible. If possible, please also clarify if this is a user-facing change compared to the released Delta Lake versions or within the unreleased branches such as master. If no, write 'No'. --> No
1 parent ed8065c commit 623e388

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

iceberg/src/main/scala/org/apache/spark/sql/delta/icebergShaded/IcebergConversionTransaction.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,9 @@ class IcebergConversionTransaction(
174174
*
175175
* e.g. OPTIMIZE
176176
*/
177-
class RewriteHelper(rewriter: RewriteFiles) extends TransactionHelper(rewriter) {
177+
class RewriteHelper(
178+
rewriter: RewriteFiles,
179+
startingSnapshotId: Option[Long]) extends TransactionHelper(rewriter) {
178180

179181
override def opType: String = "rewrite"
180182

@@ -196,6 +198,7 @@ class IcebergConversionTransaction(
196198
if (removeBuffer.nonEmpty) {
197199
rewriter.rewriteFiles(removeBuffer.asJava, addBuffer.asJava, 0)
198200
}
201+
startingSnapshotId.foreach(id => rewriter.validateFromSnapshot(id))
199202
super.commit()
200203
}
201204
}
@@ -277,7 +280,7 @@ class IcebergConversionTransaction(
277280
}
278281

279282
def getRewriteHelper: RewriteHelper = {
280-
val ret = new RewriteHelper(txn.newRewrite())
283+
val ret = new RewriteHelper(txn.newRewrite(), startFromSnapshotId)
281284
fileUpdates += ret
282285
ret
283286
}

0 commit comments

Comments
 (0)