Core: Ensure reactivated view version uses correct timestamp#12821
Merged
Conversation
nastra
reviewed
Apr 17, 2025
| changes.add(new MetadataUpdate.SetCurrentViewVersion(newVersionId)); | ||
| } | ||
|
|
||
| // Use the timestamp from the view version if it was added in current set of changes; |
Contributor
There was a problem hiding this comment.
I would slightly update/simplify this to
// Use the timestamp from the view version if it was added in current set of changes;
// otherwise, use the current system time. This handles cases where the view version
- // was created in a past commit and is being re-activated.
+ // was set as current in the past and is being re-activated.
boolean versionAddedInThisChange =
- changes.stream()
- .anyMatch(
- change ->
- change instanceof MetadataUpdate.AddViewVersion
- && ((MetadataUpdate.AddViewVersion) change).viewVersion().versionId()
- == newVersionId);
-
- long timestamp =
- versionAddedInThisChange ? version.timestampMillis() : System.currentTimeMillis();
+ changes(MetadataUpdate.AddViewVersion.class)
+ .anyMatch(added -> added.viewVersion().versionId() == newVersionId);
this.historyEntry =
ImmutableViewHistoryEntry.builder()
- .timestampMillis(timestamp)
+ .timestampMillis(
+ versionAddedInThisChange ? version.timestampMillis() : System.currentTimeMillis())
.versionId(version.versionId())
.build();
Contributor
Author
There was a problem hiding this comment.
@nastra Thanks for the review! I'll apply the comments and raise a revision.
But some concerns I have right now is that the change breaks existing unit tests like
In
.setCurrentVersionId(2), it's in different builder and have no local changes, causing the activation of view version to set to current timestamp even though version 2 never set as current before. And in the comment, we are trying to say only view version was set as current in the past will use current ts.
Contributor
There was a problem hiding this comment.
changing the unit test with the changes you have here in order to match the version-log that we compare against (we compare against a fixed timestamp defined in ValidViewMetadata.json) makes sense to me as this is a consequence of using the current time millis instead of the view version's time when setting the view version from 1 to 2 without actually adding view version 2 in the same builder.
nastra
reviewed
Apr 17, 2025
Co-authored-by: Eduard Tudenhoefner <etudenhoefner@gmail.com>
nastra
reviewed
Apr 24, 2025
nastra
approved these changes
Apr 25, 2025
nastra
left a comment
Contributor
There was a problem hiding this comment.
LGTM, thanks @lliangyu-lin
RussellSpitzer
pushed a commit
to RussellSpitzer/iceberg
that referenced
this pull request
May 16, 2025
RussellSpitzer
pushed a commit
that referenced
this pull request
May 16, 2025
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
4 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.
Description