stevenzwu commented on code in PR #13445: URL: https://github.com/apache/iceberg/pull/13445#discussion_r2278193940
########## core/src/main/java/org/apache/iceberg/types/PruneUnknownTypes.java: ########## @@ -0,0 +1,151 @@ +/* + * 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.types; + +import java.util.List; +import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; + +/** This is used to remove UnknownTypes that should not be persistent in files */ +public class PruneUnknownTypes extends TypeUtil.SchemaVisitor<Type> { + private static final PruneUnknownTypes INSTANCE = new PruneUnknownTypes(); + + /** + * Visits a schema and removes the UnknownTypes. + * + * <p>Used when creating a write schema, and skip over the UnknownTypes, since they are not + * materialized in the data files + */ + private PruneUnknownTypes() {} + + /** + * Prunes any UnknownType from a Schema + * + * @param schema a Schema + */ + public static Schema prune(Schema schema) { + Types.StructType struct = (Types.StructType) TypeUtil.visit(schema, INSTANCE); + return new Schema(struct.fields(), schema.identifierFieldIds()); + } + + /** + * Prunes any UnknownType from a StructType + * + * @param structType a StructType + */ + public static Types.StructType prune(Types.StructType structType) { + Object obj = TypeUtil.visit(structType, INSTANCE); + + if (obj instanceof Types.StructType) { + return (Types.StructType) obj; + } else { + return ((Schema) obj).asStruct(); + } + } + + @Override + public Type schema(Schema schema, Type structResult) { + if (schema == null) { + return null; + } + + if (structResult.typeId().equals(Type.TypeID.UNKNOWN)) { + return Types.StructType.of(); + } else { + return structResult; + } + } + + private boolean needsRewrite(Types.NestedField field, Type type) { + return field.type().typeId().equals(Type.TypeID.UNKNOWN) + || type.typeId().equals(Type.TypeID.UNKNOWN) + || !field.type().equals(type); + } + + @Override + public Type struct(Types.StructType struct, List<Type> fieldResults) { + List<Types.NestedField> fields = struct.fields(); + List<Types.NestedField> newFields = Lists.newArrayList(); + + int pos = 0; + boolean rewritten = false; + for (Types.NestedField field : fields) { + Type fieldResult = fieldResults.get(pos); + + if (needsRewrite(field, fieldResult)) { + if (!field.type().typeId().equals(Type.TypeID.UNKNOWN) Review Comment: nit: `==` is generally preferred for enum comparison and is the convention in our code base for type id. ########## core/src/main/java/org/apache/iceberg/types/PruneUnknownTypes.java: ########## @@ -0,0 +1,151 @@ +/* + * 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.types; + +import java.util.List; +import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; + +/** This is used to remove UnknownTypes that should not be persistent in files */ +public class PruneUnknownTypes extends TypeUtil.SchemaVisitor<Type> { + private static final PruneUnknownTypes INSTANCE = new PruneUnknownTypes(); + + /** + * Visits a schema and removes the UnknownTypes. + * + * <p>Used when creating a write schema, and skip over the UnknownTypes, since they are not + * materialized in the data files + */ + private PruneUnknownTypes() {} + + /** + * Prunes any UnknownType from a Schema + * + * @param schema a Schema + */ + public static Schema prune(Schema schema) { + Types.StructType struct = (Types.StructType) TypeUtil.visit(schema, INSTANCE); + return new Schema(struct.fields(), schema.identifierFieldIds()); + } + + /** + * Prunes any UnknownType from a StructType + * + * @param structType a StructType + */ + public static Types.StructType prune(Types.StructType structType) { + Object obj = TypeUtil.visit(structType, INSTANCE); + + if (obj instanceof Types.StructType) { + return (Types.StructType) obj; + } else { + return ((Schema) obj).asStruct(); + } + } + + @Override + public Type schema(Schema schema, Type structResult) { + if (schema == null) { + return null; + } + + if (structResult.typeId().equals(Type.TypeID.UNKNOWN)) { + return Types.StructType.of(); + } else { + return structResult; + } + } + + private boolean needsRewrite(Types.NestedField field, Type type) { + return field.type().typeId().equals(Type.TypeID.UNKNOWN) + || type.typeId().equals(Type.TypeID.UNKNOWN) + || !field.type().equals(type); + } + + @Override + public Type struct(Types.StructType struct, List<Type> fieldResults) { + List<Types.NestedField> fields = struct.fields(); + List<Types.NestedField> newFields = Lists.newArrayList(); + + int pos = 0; + boolean rewritten = false; + for (Types.NestedField field : fields) { Review Comment: nit: maybe we can just change the for loop to use position index, like the PruneColumns class. ``` for (int pos = 0; pos < fieldResults.size(); ++pos) { Types.NestedField field = fields.get(i); Type projectedType = fieldResults.get(i); ``` ########## orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java: ########## @@ -229,15 +231,26 @@ private static TypeDescription convert(Integer fieldId, Type type, boolean isReq Types.ListType list = (Types.ListType) type; TypeDescription elementType = convert(list.elementId(), list.elementType(), list.isElementRequired()); + + if (list.elementType().typeId().equals(Type.TypeID.UNKNOWN)) { + throw new IllegalArgumentException("Cannot create ListType with unknown element type"); + } + orcType = TypeDescription.createList(elementType); break; } case MAP: { Types.MapType map = (Types.MapType) type; TypeDescription keyType = convert(map.keyId(), map.keyType(), true); + + if (map.valueType().typeId().equals(Type.TypeID.UNKNOWN)) { Review Comment: nit: use `Preconditions.checkArgument` and use `==` also don't we also need to fail if keyType is unknown type too? ########## data/src/main/java/org/apache/iceberg/data/BaseFileWriterFactory.java: ########## @@ -62,7 +62,12 @@ protected BaseFileWriterFactory( Schema positionDeleteRowSchema) { this.table = table; this.dataFileFormat = dataFileFormat; - this.dataSchema = dataSchema; + if (dataSchema != null) { Review Comment: it seems to me that dataSchema can't be null. Maybe we can add a Preconditions.checkArgument first. it will be passed to Parquet write builder. https://github.com/apache/iceberg/blob/main/data/src/main/java/org/apache/iceberg/data/BaseFileWriterFactory.java#L120 Parquet.WriteBuilder eventually check that schema is not null. https://github.com/apache/iceberg/blob/main/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java#L354 -- 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. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org 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
