Skip to content

Commit 2306be9

Browse files
authored
[UniForm] Ignore CDC when converting a Delta commit to Iceberg (#5669)
<!-- 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 This PR ignores CDC actions for dataChange in a delta commit when converting it to Iceberg <!-- - 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. --> ## How was this patch tested? UT <!-- 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. --> ## 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'. -->
1 parent fbc47a9 commit 2306be9

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,10 @@ class IcebergConverter(spark: SparkSession)
618618
case file: FileAction =>
619619
addBuffer ++= Option(file.wrap.add)
620620
removeBuffer ++= Option(file.wrap.remove)
621-
dataChangeBits |= (1 << (if (file.dataChange) 1 else 0))
621+
if (file.wrap.add != null || file.wrap.remove != null) {
622+
// We only care about data changes in add and remove actions
623+
dataChangeBits |= (1 << (if (file.dataChange) 1 else 0))
624+
}
622625
hasDv |= file.deletionVector != null
623626
case c: CommitInfo =>
624627
commitInfo = Some(c)

0 commit comments

Comments
 (0)