Fix Iceberg merge, update, delete, for tables with equality deletes #24062
+71
−123
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
dain
force-pushed
the
update-after-equality-delete
branch
2 times, most recently
from
b87430a
to
a080a7a
Compare
Update row id was replaced with merge row id
Rewrite the creation of merge row id to avoid duplicate key exception. This also simplifies and consolidates the merge row id code.
dain
force-pushed
the
update-after-equality-delete
branch
from
a080a7a
to
dddde02
Compare
findinpath
reviewed
Nov 8, 2024
| @@ -42,8 +42,7 @@ public class IcebergColumnHandle | |||
| private static final int INSTANCE_SIZE = instanceSize(IcebergColumnHandle.class); | |||
|
|
|||
| // Iceberg reserved row ids begin at INTEGER.MAX_VALUE and count down. Starting with MIN_VALUE here to avoid conflicts. | |||
| public static final int TRINO_UPDATE_ROW_ID = Integer.MIN_VALUE; | |||
| public static final int TRINO_MERGE_ROW_ID = Integer.MIN_VALUE + 1; | |||
| public static final int TRINO_MERGE_ROW_ID = Integer.MIN_VALUE; | |||
| public static final String TRINO_ROW_ID_NAME = "$row_id"; | |||
|
|
|||
| public static final int TRINO_MERGE_PARTITION_SPEC_ID = Integer.MIN_VALUE + 2; | |||
There was a problem hiding this comment.
We can likely adjust the values (decrease by 1) of the other ID fields now that we don't have anymore Integer.MIN_VALUE + 1
findinpath
reviewed
Nov 8, 2024
| @@ -72,20 +72,13 @@ public IcebergPageSource( | |||
|
|
|||
| if (expectedColumn.isMergeRowIdColumn()) { | |||
| this.rowIdColumnIndex = i; | |||
|
|
|||
| Map<Integer, Integer> fieldIdToColumnIndex = mapFieldIdsToIndex(requiredColumns); | |||
There was a problem hiding this comment.
mapFieldIdsToIndex function is not used anymore.
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
Fixes #15952
Superseeds #16216
Release notes
(x) Release notes are required, with the following suggested text: