rdblue commented on code in PR #12298: URL: https://github.com/apache/iceberg/pull/12298#discussion_r2692383045
########## core/src/main/java/org/apache/iceberg/avro/AvroFormatModel.java: ########## @@ -0,0 +1,260 @@ +/* + * 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.nio.ByteBuffer; +import java.util.Map; +import java.util.function.BiFunction; +import org.apache.avro.io.DatumReader; +import org.apache.avro.io.DatumWriter; +import org.apache.iceberg.FileContent; +import org.apache.iceberg.FileFormat; +import org.apache.iceberg.MetricsConfig; +import org.apache.iceberg.Schema; +import org.apache.iceberg.encryption.EncryptedOutputFile; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.formats.FormatModel; +import org.apache.iceberg.formats.ReadBuilder; +import org.apache.iceberg.formats.WriteBuilder; +import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.io.DeleteSchemaUtil; +import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; + +public class AvroFormatModel<D, S> implements FormatModel<D, S> { + private final Class<D> type; + private final Class<S> schemaType; + private final BiFunction<Schema, Map<Integer, ?>, DatumReader<D>> readerFunction; + private final BiFunction<org.apache.avro.Schema, S, DatumWriter<D>> writerFunction; + + public AvroFormatModel(Class<D> type) { + this(type, null, null, null); + } + + public AvroFormatModel( + Class<D> type, + Class<S> schemaType, + BiFunction<Schema, Map<Integer, ?>, DatumReader<D>> readerFunction, + BiFunction<org.apache.avro.Schema, S, DatumWriter<D>> writerFunction) { + this.type = type; + this.schemaType = schemaType; + this.readerFunction = readerFunction; + this.writerFunction = writerFunction; + } + + @Override + public FileFormat format() { + return FileFormat.AVRO; + } + + @Override + public Class<D> type() { + return type; + } + + @Override + public Class<S> schemaType() { + return schemaType; + } + + @Override + public WriteBuilder<D, S> writeBuilder(EncryptedOutputFile outputFile) { + return new WriteBuilderWrapper<>(outputFile, writerFunction); + } + + @Override + public ReadBuilder<D, S> readBuilder(InputFile inputFile) { + return new ReadBuilderWrapper<>(inputFile, readerFunction); + } + + private static class ReadBuilderWrapper<D, S> implements ReadBuilder<D, S> { + private final Avro.ReadBuilder internal; + private final BiFunction<Schema, Map<Integer, ?>, DatumReader<D>> readerFunction; + private Schema icebergSchema; + private Map<Integer, ?> idToConstant = ImmutableMap.of(); + + private ReadBuilderWrapper( + InputFile inputFile, BiFunction<Schema, Map<Integer, ?>, DatumReader<D>> readerFunction) { + this.internal = Avro.read(inputFile); + this.readerFunction = readerFunction; + } + + @Override + public ReadBuilder<D, S> split(long newStart, long newLength) { + internal.split(newStart, newLength); + return this; + } + + @Override + public ReadBuilder<D, S> project(Schema schema) { + this.icebergSchema = schema; + internal.project(schema); + return this; + } + + @Override + public ReadBuilder<D, S> caseSensitive(boolean caseSensitive) { + // Filtering is not supported in Avro reader, so case sensitivity does not matter + return this; + } + + @Override + public ReadBuilder<D, S> filter(Expression filter) { + // Filtering is not supported in Avro reader + return this; + } + + @Override + public ReadBuilder<D, S> set(String key, String value) { + // Configuration is not used for Avro reader creation + return this; + } + + @Override + public ReadBuilder<D, S> reuseContainers() { + internal.reuseContainers(); + return this; + } + + @Override + public ReadBuilder<D, S> recordsPerBatch(int numRowsPerBatch) { + throw new UnsupportedOperationException("Batch reading is not supported in Avro reader"); + } + + @Override + public ReadBuilder<D, S> idToConstant(Map<Integer, ?> newIdToConstant) { + this.idToConstant = newIdToConstant; + return this; + } + + @Override + public ReadBuilder<D, S> withNameMapping(org.apache.iceberg.mapping.NameMapping nameMapping) { + internal.withNameMapping(nameMapping); + return this; + } + + @Override + public CloseableIterable<D> build() { + return internal + .createResolvingReader(unused -> readerFunction.apply(icebergSchema, idToConstant)) Review Comment: `unused` is the Iceberg schema that is passed to the `internal.project` method, which means it is the same as `icebergSchema`. I don't think that this builder needs to separately track the same schema because it is passed in. The field can be removed in favor of this: ```java return internal .createResolvingReader(icebergSchema -> readerFunction.apply(icebergSchema, idToConstant)) .build() ``` -- 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]
