Support name mapping resolution for parquet #830
There are no files selected for viewing
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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.iceberg.parquet; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.iceberg.mapping.MappedField; | ||
| import org.apache.iceberg.mapping.NameMapping; | ||
| import org.apache.parquet.Preconditions; | ||
| import org.apache.parquet.schema.GroupType; | ||
| import org.apache.parquet.schema.MessageType; | ||
| import org.apache.parquet.schema.PrimitiveType; | ||
| import org.apache.parquet.schema.Type; | ||
| import org.apache.parquet.schema.Types; | ||
|
|
||
| class ApplyNameMapping extends ParquetTypeVisitor<Type> { | ||
| private final NameMapping nameMapping; | ||
|
|
||
| ApplyNameMapping(NameMapping nameMapping) { | ||
| this.nameMapping = nameMapping; | ||
| } | ||
|
|
||
| @Override | ||
| public Type message(MessageType message, List<Type> fields) { | ||
| Types.MessageTypeBuilder builder = org.apache.parquet.schema.Types.buildMessage(); | ||
| fields.stream().filter(Objects::nonNull).forEach(builder::addField); | ||
|
|
||
| return builder.named(message.getName()); | ||
| } | ||
|
|
||
| @Override | ||
| public Type struct(GroupType struct, List<Type> types) { | ||
| MappedField field = nameMapping.find(currentPath()); | ||
| List<Type> actualTypes = types.stream().filter(Objects::nonNull).collect(Collectors.toList()); | ||
| Type structType = struct.withNewFields(actualTypes); | ||
|
|
||
| return field == null ? structType : structType.withId(field.id()); | ||
| } | ||
|
|
||
| @Override | ||
| public Type list(GroupType list, Type elementType) { | ||
| Preconditions.checkArgument(elementType != null, | ||
| "List type must have element field"); | ||
|
|
||
| MappedField field = nameMapping.find(currentPath()); | ||
| Type listType = org.apache.parquet.schema.Types.list(list.getRepetition()) | ||
| .element(elementType) | ||
| .named(list.getName()); | ||
|
|
||
| return field == null ? listType : listType.withId(field.id()); | ||
| } | ||
|
|
||
| @Override | ||
| public Type map(GroupType map, Type keyType, Type valueType) { | ||
| Preconditions.checkArgument(keyType != null && valueType != null, | ||
| "Map type must have both key field and value field"); | ||
|
|
||
| MappedField field = nameMapping.find(currentPath()); | ||
| Type mapType = org.apache.parquet.schema.Types.map(map.getRepetition()) | ||
| .key(keyType) | ||
| .value(valueType) | ||
| .named(map.getName()); | ||
|
|
||
| return field == null ? mapType : mapType.withId(field.id()); | ||
| } | ||
|
|
||
| @Override | ||
| public Type primitive(PrimitiveType primitive) { | ||
| MappedField field = nameMapping.find(currentPath()); | ||
| return field == null ? primitive : primitive.withId(field.id()); | ||
| } | ||
|
|
||
| @Override | ||
| public void beforeRepeatedElement(Type element) { | ||
| // do not add the repeated element's name | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Can you add comments to these methods to explain why they are here?
Collaborator
Author
There was a problem hiding this comment. OK, let me add the comments back. |
||
|
|
||
| @Override | ||
| public void afterRepeatedElement(Type element) { | ||
| // do not remove the repeated element's name | ||
| } | ||
|
|
||
| @Override | ||
| public void beforeRepeatedKeyValue(Type keyValue) { | ||
| // do not add the repeated element's name | ||
| } | ||
|
|
||
| @Override | ||
| public void afterRepeatedKeyValue(Type keyValue) { | ||
| // do not remove the repeated element's name | ||
| } | ||
| } | ||
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 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 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 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rdsr, just want to confirm that you're okay with this change? If it is going to cause you problems because you've already deployed it, we can go with the original.