diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/RemoveIds.java b/parquet/src/main/java/org/apache/iceberg/parquet/RemoveIds.java new file mode 100644 index 000000000000..6096f0f5b1dc --- /dev/null +++ b/parquet/src/main/java/org/apache/iceberg/parquet/RemoveIds.java @@ -0,0 +1,76 @@ +/* + * 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 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; + +public class RemoveIds extends ParquetTypeVisitor { + + @Override + public Type message(MessageType message, List fields) { + Types.MessageTypeBuilder builder = Types.buildMessage(); + for (Type field : struct(message.asGroupType(), fields).asGroupType().getFields()) { + builder.addField(field); + } + return builder.named(message.getName()); + } + + @Override + public Type struct(GroupType struct, List fields) { + Types.GroupBuilder builder = Types.buildGroup(struct.getRepetition()); + for (Type field : fields) { + builder.addField(field); + } + return builder.named(struct.getName()); + } + + @Override + public Type list(GroupType array, Type item) { + return Types.list(array.getRepetition()) + .element(item) + .named(array.getName()); + } + + @Override + public Type map(GroupType map, Type key, Type value) { + return Types.map(map.getRepetition()) + .key(key) + .value(value) + .named(map.getName()); + } + + @Override + public Type primitive(PrimitiveType primitive) { + return Types.primitive(primitive.getPrimitiveTypeName(), primitive.getRepetition()) + .length(primitive.getTypeLength()) + .as(primitive.getLogicalTypeAnnotation()) + .named(primitive.getName()); + } + + public static MessageType removeIds(MessageType type) { + return (MessageType) ParquetTypeVisitor.visit(type, new RemoveIds()); + } + +} diff --git a/parquet/src/test/java/org/apache/iceberg/parquet/TestParquetSchemaUtil.java b/parquet/src/test/java/org/apache/iceberg/parquet/TestParquetSchemaUtil.java index f61ca5ebff5c..80353f1b265a 100644 --- a/parquet/src/test/java/org/apache/iceberg/parquet/TestParquetSchemaUtil.java +++ b/parquet/src/test/java/org/apache/iceberg/parquet/TestParquetSchemaUtil.java @@ -86,10 +86,10 @@ public void testAssignIdsByNameMapping() { Schema schema = new Schema(TypeUtil.assignFreshIds(structType, new AtomicInteger(0)::incrementAndGet) .asStructType().fields()); NameMapping nameMapping = MappingUtil.create(schema); - MessageType messageType = ParquetSchemaUtil.convert(schema, "complex_schema"); - MessageType typeWithIdsFromNameMapping = ParquetSchemaUtil.applyNameMapping(messageType, nameMapping); - Schema newSchema = ParquetSchemaUtil.convert(typeWithIdsFromNameMapping); + MessageType messageTypeWithIds = ParquetSchemaUtil.convert(schema, "parquet_type"); + MessageType messageTypeWithIdsFromNameMapping = ParquetSchemaUtil + .applyNameMapping(RemoveIds.removeIds(messageTypeWithIds), nameMapping); - Assert.assertEquals(schema.asStruct(), newSchema.asStruct()); + Assert.assertEquals(messageTypeWithIds, messageTypeWithIdsFromNameMapping); } }