chenjunjiedada commented on a change in pull request #830: URL: https://github.com/apache/incubator-iceberg/pull/830#discussion_r422042038
########## File path: parquet/src/main/java/org/apache/iceberg/parquet/AssignIdsByNameMapping.java ########## @@ -0,0 +1,102 @@ +/* + * 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 AssignIdsByNameMapping extends ParquetTypeVisitor<Type> { + private final NameMapping nameMapping; + + AssignIdsByNameMapping(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()); + if (field == null) { + return null; + } + List<Type> actualTypes = types.stream().filter(Objects::nonNull).collect(Collectors.toList()); + + return struct.withNewFields(actualTypes).withId(field.id()); + } + + @Override + public Type list(GroupType list, Type elementType) { + MappedField field = nameMapping.find(currentPath()); + if (field == null) { + return null; Review comment: It was intended to return null since the name mapping is created from the table's schema. I changed to return list with sub-types now since the assumption is removed. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
