rdblue commented on code in PR #11919: URL: https://github.com/apache/iceberg/pull/11919#discussion_r1905943594
########## core/src/main/java/org/apache/iceberg/avro/BaseAvroSchemaVisitor.java: ########## @@ -0,0 +1,117 @@ +/* + * 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.avro; + +import java.util.List; +import org.apache.avro.LogicalType; +import org.apache.avro.LogicalTypes; +import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +abstract class BaseAvroSchemaVisitor extends AvroSchemaVisitor<ValueWriter<?>> { + + protected abstract ValueWriter<?> createRecordWriter(List<ValueWriter<?>> fields); + + protected abstract ValueWriter<?> fixedWriter(int size); + + @Override + public ValueWriter<?> record(Schema record, List<String> names, List<ValueWriter<?>> fields) { + return createRecordWriter(fields); + } + + @Override + public ValueWriter<?> union(Schema union, List<ValueWriter<?>> options) { + Preconditions.checkArgument( + options.contains(ValueWriters.nulls()), + "Cannot create writer for non-option union: %s", + union); Review Comment: When this was a private inner class, this check was more reasonable because `ValueWriters.nulls()` was reliably returned for a `NULL` Avro type. But now that `primitive(Schema)` can be overridden (even if it isn't intended to be) I think it makes more sense not to make assumptions about what the `NULL` type is converted to. Instead, I think this should throw an `IllegalArgumentException` after checking for `NULL` directly: ```java Preconditions.checkArgument( options.size() == 2, "Cannot create writer for non-option union: %s", union); if (union.getTypes().get(0).getType() == Schema.Type.NULL) { return ValueWriters.option(0, options.get(1)); } else if (union.getTypes().get(1).getType() == Schema.Type.NULL) { return ValueWriters.option(1, options.get(0)); } else { throw new IllegalArgumentException(String.format("Cannot create writer for non-option union: %s", union)); } ``` -- 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
