ORC: skip non-iceberg columns when converting schema to Iceberg #1140
Conversation
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
This change also skips columns that do not have an Iceberg ID attribute.
rdsr
reviewed
Jun 27, 2020
orc/src/main/java/org/apache/iceberg/orc/OrcSchemaWithTypeVisitor.java
Outdated
Show resolved
Hide resolved
edgarRd
force-pushed
the
orc-skip-non-iceberg-columns
branch
from
59e1b50 to
693a7fa
Compare
rdblue
reviewed
Jun 30, 2020
rdblue
reviewed
Jun 30, 2020
rdblue
reviewed
Jun 30, 2020
rdblue
reviewed
Jun 30, 2020
rdblue
reviewed
Jun 30, 2020
rdblue
reviewed
Jun 30, 2020
edgarRd
force-pushed
the
orc-skip-non-iceberg-columns
branch
from
0afccb2 to
9a4f68a
Compare
Contributor
Author
rdblue
reviewed
Jul 2, 2020
| schema.addField("mapCol", mapCol); | ||
|
|
||
| Schema icebergSchema = ORCSchemaUtil.convert(schema); | ||
| assertEquals(2, icebergSchema.asStruct().fields().size()); |
Contributor
There was a problem hiding this comment.
I think this should create an Iceberg schema and assert the two are equal (structs implement equals, so you have to check assertEquals(expected.asStruct(), converted.asStruct()).
Contributor
Author
There was a problem hiding this comment.
Done. I've changed the test to compare structs.
Contributor
|
@edgarRd, this looks good to me. The only problem is with the tests, which assert sizes instead of schema structure. I think it's probably best to be more specific about which fields are converted. You may also consider moving the conversion visitor out of the util class and into its own file. |
Contributor
|
+1 I'll merge this when tests pass. Thanks @edgarRd! |
edgarRd
force-pushed
the
orc-skip-non-iceberg-columns
branch
from
7c5d3d4 to
ce01fe5
Compare
Contributor
Author
cmathiesen
pushed a commit
to ExpediaGroup/iceberg
that referenced
this pull request
Aug 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
As mentioned in #989 (comment) and referenced in #1055 ORC previously assigned an ID based on an
AtomicCounterto assign Iceberg IDs if they were not found in ORC type attributes.This PR changes the implementation to use the ORC type visitor and skips types that do not have an Iceberg ID in the type attribute as follows:
If the schema as a whole does not have any Iceberg IDs, it fails with Exception.
Additional changes are:
OrcSchemaVisitorto traverseTypeDescriptiontree.PTAL @rdsr @rdblue - Thanks!