rdblue commented on code in PR #13445: URL: https://github.com/apache/iceberg/pull/13445#discussion_r2271644975
########## core/src/main/java/org/apache/iceberg/types/PruneUnknownTypes.java: ########## @@ -0,0 +1,137 @@ +/* + * 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 java.util.stream.IntStream; +import org.apache.hadoop.util.Lists; +import org.apache.iceberg.Schema; + +/** 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(); + + /** + * Prunes any UnknownType from a Schema + * + * @param schema a Schema + */ + public static Schema convert(Schema schema) { + Types.StructType struct = (Types.StructType) TypeUtil.visit(schema, INSTANCE); + return new Schema(struct.fields(), schema.identifierFieldIds()); + } + + /** + * 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() {} + + public static Types.StructType convert(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 (structResult.typeId().equals(Type.TypeID.UNKNOWN)) { + return Types.StructType.of(); + } else { + return structResult; + } + } + + @Override + public Type struct(Types.StructType struct, List<Type> fieldResults) { + List<Types.NestedField> fields = struct.fields(); + boolean needsRewrite = + IntStream.range(0, fieldResults.size()) + .anyMatch( + i -> + (fields.get(i).type().typeId().equals(Type.TypeID.UNKNOWN) + || fieldResults.get(i).typeId().equals(Type.TypeID.UNKNOWN)) + || !fields.get(i).type().equals(fieldResults.get(i))); + + if (needsRewrite) { + List<Types.NestedField> newFields = Lists.newArrayList(); + int pos = 0; + for (Types.NestedField field : fields) { + Type fieldResult = fieldResults.get(pos++); Review Comment: Although ++ is valid Java, we avoid using the return value in Iceberg because it takes too much brain power to make sure this is correct compared to using two separate statements. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
