Add support for changing row type in Iceberg #15808
Merged
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
Additionally, use SELECT instead of VALUES to handle row type correctly.
ebyhr
force-pushed
the
ebi/iceberg-set-data-type-complex
branch
from
7319d57 to
8d5a7fd
Compare
ebyhr
force-pushed
the
ebi/iceberg-set-data-type-complex
branch
from
8d5a7fd to
5ea6aa0
Compare
alexjo2144
approved these changes
Jan 24, 2023
Comment on lines
1592
to
1600
| if (newType.isPrimitiveType()) { | ||
| return schema.updateColumn(name, newType.asPrimitiveType()); | ||
| } | ||
| if (sourceType instanceof StructType sourceRowType && newType instanceof StructType newRowType) { |
There was a problem hiding this comment.
It doesn't matter, functionality-wise, but can we make these checks symmetrical so that they both check the source and new type?
Suggested change
| if (newType.isPrimitiveType()) { | |
| return schema.updateColumn(name, newType.asPrimitiveType()); | |
| } | |
| if (sourceType instanceof StructType sourceRowType && newType instanceof StructType newRowType) { | |
| if (sourceType.isPrimitiveTyple() && newType.isPrimitiveType()) { | |
| return schema.updateColumn(name, newType.asPrimitiveType()); | |
| } | |
| if (sourceType instanceof StructType sourceRowType && newType instanceof StructType newRowType) { |
| if (sourceType instanceof StructType sourceRowType && newType instanceof StructType newRowType) { | ||
| // Add, update or delete fields | ||
| for (NestedField field : concat(sourceRowType.fields(), newRowType.fields())) { | ||
| if (sourceRowType.equals(newRowType)) { |
There was a problem hiding this comment.
Could move this outside of the loop, right?
| .commit(); | ||
| } | ||
| catch (RuntimeException e) { | ||
| throw new TrinoException(ICEBERG_COMMIT_ERROR, "Failed to set column type: " + firstNonNull(e.getMessage(), e), e); | ||
| } | ||
| } | ||
|
|
||
| private static UpdateSchema buildUpdateSchema(String name, Type sourceType, Type newType, UpdateSchema schema) |
There was a problem hiding this comment.
Nit: I see that returning the UpdateSchema makes calling commit easier above, but personally find this easier to read.
Suggested change
| private static UpdateSchema buildUpdateSchema(String name, Type sourceType, Type newType, UpdateSchema schema) | |
| private static void buildUpdateSchema(String name, Type sourceType, Type newType, UpdateSchema schemaUpdate) |
| } | ||
| if (sourceType instanceof StructType sourceRowType && newType instanceof StructType newRowType) { | ||
| // Add, update or delete fields | ||
| for (NestedField field : concat(sourceRowType.fields(), newRowType.fields())) { |
There was a problem hiding this comment.
This will have duplicates for fields in both old and new type. Also doesn't matter functionality wise but would be nice not to have to iterate over them twice.
ebyhr
force-pushed
the
ebi/iceberg-set-data-type-complex
branch
from
5ea6aa0 to
3096374
Compare
|
|
findepi
approved these changes
Jan 25, 2023
ebyhr
added
the
no-release-notes
findepi
reviewed
Feb 2, 2023
Comment on lines
+83
to
+84
| // TODO https://github.com/trinodb/trino/issues/15822 The connector returns incorrect NULL when a field in row type doesn't exist in Parquet files | ||
| return Optional.of(setup.withNewValueLiteral("NULL")); |
There was a problem hiding this comment.
Single-field row types aren't very common.
Let's make sure we have a test for renaming some, but not all fields in a row (eg have a row with two fields).
(We can keep this one too)
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
Add support for changing fields in
rowtype in Iceberg. The supported operations:Release notes
(x) Release notes are required, with the following suggested text if this PR isn't merged in 406: