Skip to content

Core, Orc, Data: Implementation of ORCFormatModel #15255

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.

Sign up for GitHub

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

Merged
pvary merged 1 commit into from
Feb 15, 2026
Merged

Core, Orc, Data: Implementation of ORCFormatModel #15255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions data/src/main/java/org/apache/iceberg/data/GenericFormatModels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@
import org.apache.iceberg.avro.AvroFormatModel;
import org.apache.iceberg.data.avro.DataWriter;
import org.apache.iceberg.data.avro.PlannedDataReader;
import org.apache.iceberg.data.orc.GenericOrcReader;
import org.apache.iceberg.data.orc.GenericOrcWriter;
import org.apache.iceberg.data.parquet.GenericParquetReaders;
import org.apache.iceberg.data.parquet.GenericParquetWriter;
import org.apache.iceberg.formats.FormatModelRegistry;
import org.apache.iceberg.orc.ORCFormatModel;
import org.apache.iceberg.parquet.ParquetFormatModel;

public class GenericFormatModels {
Expand All @@ -48,6 +51,17 @@ public static void register() {
GenericParquetReaders.buildReader(icebergSchema, fileSchema, idToConstant)));

FormatModelRegistry.register(ParquetFormatModel.forPositionDeletes());

FormatModelRegistry.register(
ORCFormatModel.create(
Record.class,
Void.class,
(icebergSchema, fileSchema, engineSchema) ->
GenericOrcWriter.buildWriter(icebergSchema, fileSchema),
(icebergSchema, fileSchema, engineSchema, idToConstant) ->
GenericOrcReader.buildReader(icebergSchema, fileSchema, idToConstant)));

FormatModelRegistry.register(ORCFormatModel.forPositionDeletes());
}

private GenericFormatModels() {}
Expand Down
2 changes: 1 addition & 1 deletion data/src/test/java/org/apache/iceberg/data/TestGenericFormatModels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class TestGenericFormatModels {
RandomGenericData.generate(TestBase.SCHEMA, 10, 1L);

private static final FileFormat[] FILE_FORMATS =
new FileFormat[] {FileFormat.AVRO, FileFormat.PARQUET};
new FileFormat[] {FileFormat.AVRO, FileFormat.PARQUET, FileFormat.ORC};

@TempDir protected Path temp;

Expand Down
21 changes: 16 additions & 5 deletions orc/src/main/java/org/apache/iceberg/orc/ORC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.MetadataColumns;
import org.apache.iceberg.MetricsConfig;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Schema;
Expand Down Expand Up @@ -79,7 +81,10 @@
import org.apache.iceberg.io.OutputFile;
import org.apache.iceberg.mapping.NameMapping;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.relocated.com.google.common.collect.Sets;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.util.ArrayUtil;
import org.apache.iceberg.util.PropertyUtil;
import org.apache.orc.CompressionKind;
Expand Down Expand Up @@ -179,9 +184,8 @@ public WriteBuilder metricsConfig(MetricsConfig newMetricsConfig) {
return this;
}

// Supposed to always be a private method used strictly by data and delete write builders
private WriteBuilder createContextFunc(
Function<Map<String, String>, Context> newCreateContextFunc) {
// supposed to always be a private method used strictly by data and delete write builders
WriteBuilder createContextFunc(Function<Map<String, String>, Context> newCreateContextFunc) {
this.createContextFunc = newCreateContextFunc;
return this;
}
Expand Down Expand Up @@ -219,7 +223,7 @@ public <D> FileAppender<D> build() {
metricsConfig);
}

private static class Context {
static class Context {
private final long stripeSize;
private final long blockSize;
private final int vectorizedRowBatchSize;
Expand Down Expand Up @@ -699,6 +703,7 @@ public static class ReadBuilder {
private Function<TypeDescription, OrcRowReader<?>> readerFunc;
private Function<TypeDescription, OrcBatchReader<?>> batchedReaderFunc;
private int recordsPerBatch = VectorizedRowBatch.DEFAULT_SIZE;
private Set<Integer> constantFieldIds = ImmutableSet.of();

private ReadBuilder(InputFile file) {
Preconditions.checkNotNull(file, "Input file cannot be null");
Expand Down Expand Up @@ -775,12 +780,18 @@ public ReadBuilder withNameMapping(NameMapping newNameMapping) {
return this;
}

ReadBuilder constantFieldIds(Set<Integer> newConstantFieldIds) {
this.constantFieldIds = newConstantFieldIds;
return this;
}

public <D> CloseableIterable<D> build() {
Preconditions.checkNotNull(schema, "Schema is required");
return new OrcIterable<>(
file,
conf,
schema,
TypeUtil.selectNot(
schema, Sets.union(constantFieldIds, MetadataColumns.metadataFieldIds())),
nameMapping,
start,
length,
Expand Down
Loading