Add Default Row Commit Version to AddFile and RemoveFile #1781
Conversation
This file contains 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
ryan-johnson-databricks
approved these changes
May 24, 2023
| @@ -278,8 +278,11 @@ abstract class CloneTableBase( | |||
| val copiedFile = fileToCopy.copy(dataChange = true) | |||
| opName match { | |||
| case CloneTableCommand.OP_NAME => | |||
| // CLONE does not preserve Row IDs and Commit Versions | |||
There was a problem hiding this comment.
It is explained in the design document. The fundamental problem is that there is no way to remove a file and add it back with a different baseRowId in the same commit. This causes issues with incremental clones.
Comment on lines
105
to
106
| val filters: Seq[Expression] = Seq(col("id = 150").expr) | ||
| val scan: DeltaScan = deltaLog.update().filesForScan(filters) |
There was a problem hiding this comment.
Is there some reason these val (and only these) need explicit types?
There was a problem hiding this comment.
There's no reason. I think I temporarily added them when I was fighting with IntellIJ not being able to infer the right type. I will remove it.
| @@ -1710,6 +1715,8 @@ trait OptimisticTransactionImpl extends TransactionalWrite | |||
| conflictChecker.checkConflicts() | |||
| } | |||
|
|
|||
| protected def getFirstAttemptVersion: Long = readVersion + 1L | |||
There was a problem hiding this comment.
This is the first attempted commit version?
(not sure if name change or just doc comment is better)
There was a problem hiding this comment.
The name was chosen to match getNextAttemptVersion. I will add a doc comment to make it clearer what it is.
5 tasks
8 tasks
This was referenced Apr 8, 2024
Closed
Closed
scottsand-db
pushed a commit
that referenced
this pull request
Apr 9, 2024
<!-- 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 Delta Protocol for Row IDs was introduced in this PR: #1610 Support for writing fresh row IDs / row commit versions was introduced in the following PRs: - #1723 - #1781 - #1896 **This is sufficient to enable row tracking on a table and write to a table that has row tracking enabled** but not to actually read row IDs / row commit versions back, which is also being added in Delta at the moment ([read BaseRowId](283ac02). [read defaultRowCommitVersion](#2795), [read RowId](#2856)...) Using row tracking is currently only allowed in testing, this change allows enabling row tracking outside of testing so that the upcoming Delta 3.2 release includes support for writing to tables with row tracking enabled, making Delta writers future-proof. <!-- - 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? Tests have already been added in previous changes, this only flips the switch to let users enabled Row Tracking outside of tests. <!-- 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? Users are now able to enable Row Tracking when creating a delta table: ``` CREATE TABLE tbl(a int) USING DELTA TBLPROPERTIES ('delta.enableRowTracking' = 'true') ``` <!-- 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'. -->
andreaschat-db
pushed a commit
to andreaschat-db/delta
that referenced
this pull request
Apr 16, 2024
<!-- 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 Delta Protocol for Row IDs was introduced in this PR: delta-io#1610 Support for writing fresh row IDs / row commit versions was introduced in the following PRs: - delta-io#1723 - delta-io#1781 - delta-io#1896 **This is sufficient to enable row tracking on a table and write to a table that has row tracking enabled** but not to actually read row IDs / row commit versions back, which is also being added in Delta at the moment ([read BaseRowId](delta-io@283ac02). [read defaultRowCommitVersion](delta-io#2795), [read RowId](delta-io#2856)...) Using row tracking is currently only allowed in testing, this change allows enabling row tracking outside of testing so that the upcoming Delta 3.2 release includes support for writing to tables with row tracking enabled, making Delta writers future-proof. <!-- - 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? Tests have already been added in previous changes, this only flips the switch to let users enabled Row Tracking outside of tests. <!-- 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? Users are now able to enable Row Tracking when creating a delta table: ``` CREATE TABLE tbl(a int) USING DELTA TBLPROPERTIES ('delta.enableRowTracking' = 'true') ``` <!-- 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'. -->
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.
Description
This PR implements part of the changes proposed in #1747. It adds the
defaultRowCommitVersionfield toAddFileandRemoveFile, and it makes sure that it's populated during commits and read during log replay. It does not handle any transaction conflicts yet.How was this patch tested?
Added a new test suite
DefaultRowCommitVersionSuite.Does this PR introduce any user-facing changes?
No