-
Notifications
You must be signed in to change notification settings - Fork 3k
Core, Data: Implementation of AvroFormatModel #15254
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
pvary
wants to merge
2
commits into
apache:main
Choose a base branch
from
pvary:avro_model
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+540
−9
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
277 changes: 277 additions & 0 deletions
277
core/src/main/java/org/apache/iceberg/avro/AvroFormatModel.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,277 @@ | ||
| /* | ||
| * 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.io.IOException; | ||
| import java.nio.ByteBuffer; | ||
| import java.util.Map; | ||
| import org.apache.avro.Schema; | ||
| 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.deletes.PositionDelete; | ||
| import org.apache.iceberg.encryption.EncryptedOutputFile; | ||
| import org.apache.iceberg.expressions.Expression; | ||
| import org.apache.iceberg.formats.BaseFormatModel; | ||
| import org.apache.iceberg.formats.ModelWriteBuilder; | ||
| import org.apache.iceberg.formats.ReadBuilder; | ||
| import org.apache.iceberg.io.CloseableIterable; | ||
| import org.apache.iceberg.io.DeleteSchemaUtil; | ||
| import org.apache.iceberg.io.FileAppender; | ||
| import org.apache.iceberg.io.InputFile; | ||
| import org.apache.iceberg.relocated.com.google.common.base.Preconditions; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; | ||
|
|
||
| public class AvroFormatModel<D, S> | ||
| extends BaseFormatModel<D, S, DatumWriter<D>, DatumReader<D>, Schema> { | ||
|
|
||
| public static <D> AvroFormatModel<PositionDelete<D>, Object> forPositionDeletes() { | ||
| return new AvroFormatModel<>(PositionDelete.deleteClass(), null, null, null); | ||
| } | ||
|
|
||
| public static <D, S> AvroFormatModel<D, S> create( | ||
| Class<D> type, | ||
| Class<S> schemaType, | ||
| WriterFunction<DatumWriter<D>, S, Schema> writerFunction, | ||
| ReaderFunction<DatumReader<D>, S, Schema> readerFunction) { | ||
| return new AvroFormatModel<>(type, schemaType, writerFunction, readerFunction); | ||
| } | ||
|
|
||
| private AvroFormatModel( | ||
| Class<D> type, | ||
| Class<S> schemaType, | ||
| WriterFunction<DatumWriter<D>, S, Schema> writerFunction, | ||
| ReaderFunction<DatumReader<D>, S, Schema> readerFunction) { | ||
| super(type, schemaType, writerFunction, readerFunction); | ||
| } | ||
|
|
||
| @Override | ||
| public FileFormat format() { | ||
| return FileFormat.AVRO; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<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 WriteBuilderWrapper<D, S> implements ModelWriteBuilder<D, S> { | ||
| private final Avro.WriteBuilder internal; | ||
| private final WriterFunction<DatumWriter<D>, S, Schema> writerFunction; | ||
| private org.apache.iceberg.Schema schema; | ||
| private S engineSchema; | ||
| private FileContent content; | ||
|
|
||
| private WriteBuilderWrapper( | ||
| EncryptedOutputFile outputFile, WriterFunction<DatumWriter<D>, S, Schema> writerFunction) { | ||
| this.internal = Avro.write(outputFile.encryptingOutputFile()); | ||
| this.writerFunction = writerFunction; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> schema(org.apache.iceberg.Schema newSchema) { | ||
| this.schema = newSchema; | ||
| internal.schema(newSchema); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> engineSchema(S newSchema) { | ||
| this.engineSchema = newSchema; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> set(String property, String value) { | ||
| internal.set(property, value); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> setAll(Map<String, String> properties) { | ||
| internal.setAll(properties); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> meta(String property, String value) { | ||
| internal.meta(property, value); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> meta(Map<String, String> properties) { | ||
| internal.meta(properties); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> content(FileContent newContent) { | ||
| this.content = newContent; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> metricsConfig(MetricsConfig metricsConfig) { | ||
| internal.metricsConfig(metricsConfig); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> overwrite() { | ||
| internal.overwrite(); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> withFileEncryptionKey(ByteBuffer encryptionKey) { | ||
| throw new UnsupportedOperationException("Avro does not support file encryption keys"); | ||
| } | ||
|
|
||
| @Override | ||
| public ModelWriteBuilder<D, S> withAADPrefix(ByteBuffer aadPrefix) { | ||
| throw new UnsupportedOperationException("Avro does not support AAD prefix"); | ||
| } | ||
|
|
||
| @Override | ||
| public FileAppender<D> build() throws IOException { | ||
| switch (content) { | ||
| case DATA: | ||
| internal.createContextFunc(Avro.WriteBuilder.Context::dataContext); | ||
| internal.createWriterFunc( | ||
| avroSchema -> writerFunction.write(schema, avroSchema, engineSchema)); | ||
| break; | ||
| case EQUALITY_DELETES: | ||
| internal.createContextFunc(Avro.WriteBuilder.Context::deleteContext); | ||
| internal.createWriterFunc( | ||
| avroSchema -> writerFunction.write(schema, avroSchema, engineSchema)); | ||
| break; | ||
| case POSITION_DELETES: | ||
| Preconditions.checkState( | ||
| schema == null, | ||
| "Invalid schema: %s. Position deletes with schema are not supported by the API.", | ||
| schema); | ||
| Preconditions.checkState( | ||
| engineSchema == null, | ||
| "Invalid engineSchema: %s. Position deletes with schema are not supported by the API.", | ||
| engineSchema); | ||
|
|
||
| internal.createContextFunc(Avro.WriteBuilder.Context::deleteContext); | ||
| internal.createWriterFunc(unused -> new Avro.PositionDatumWriter()); | ||
| internal.schema(DeleteSchemaUtil.pathPosSchema()); | ||
| break; | ||
| default: | ||
| throw new IllegalArgumentException("Unknown file content: " + content); | ||
| } | ||
|
|
||
| return internal.build(); | ||
| } | ||
| } | ||
|
|
||
| private static class ReadBuilderWrapper<D, S> implements ReadBuilder<D, S> { | ||
| private final Avro.ReadBuilder internal; | ||
| private final ReaderFunction<DatumReader<D>, S, Schema> readerFunction; | ||
| private S engineSchema; | ||
| private Map<Integer, ?> idToConstant = ImmutableMap.of(); | ||
|
|
||
| private ReadBuilderWrapper( | ||
| InputFile inputFile, ReaderFunction<DatumReader<D>, S, Schema> 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(org.apache.iceberg.Schema schema) { | ||
| internal.project(schema); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ReadBuilder<D, S> engineProjection(S schema) { | ||
| this.engineSchema = schema; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ReadBuilder<D, S> caseSensitive(boolean caseSensitive) { | ||
| // Filtering is not supported in Avro reader, so case sensitivity does not matter | ||
| // This is not an error since filtering is best-effort. | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public ReadBuilder<D, S> filter(Expression filter) { | ||
| // Filtering is not supported in Avro reader | ||
| // This is not an error since filtering is best-effort. | ||
| 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() { | ||
| // The file schema is passed directly to the DatumReader by the Avro read path, so null is | ||
| // passed here | ||
| return internal | ||
| .createResolvingReader( | ||
| icebergSchema -> readerFunction.read(icebergSchema, null, engineSchema, idToConstant)) | ||
| .build(); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
data/src/main/java/org/apache/iceberg/data/GenericFormatModels.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * 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.data; | ||
|
|
||
| import org.apache.iceberg.avro.AvroFormatModel; | ||
| import org.apache.iceberg.data.avro.DataWriter; | ||
| import org.apache.iceberg.data.avro.PlannedDataReader; | ||
| import org.apache.iceberg.formats.FormatModelRegistry; | ||
|
|
||
| public class GenericFormatModels { | ||
| public static void register() { | ||
| FormatModelRegistry.register( | ||
| AvroFormatModel.create( | ||
| Record.class, | ||
| Void.class, | ||
| (icebergSchema, fileSchema, engineSchema) -> DataWriter.create(fileSchema), | ||
| (icebergSchema, fileSchema, engineSchema, idToConstant) -> | ||
| PlannedDataReader.create(icebergSchema, idToConstant))); | ||
|
|
||
| FormatModelRegistry.register(AvroFormatModel.forPositionDeletes()); | ||
| } | ||
|
|
||
| private GenericFormatModels() {} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.