Skip to content

ORC: Remove unused conf field from OrcFileAppender #16345

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

Open
wombatu-kun wants to merge 1 commit into
base: main
Choose a base branch
from
+34 −66
Open

ORC: Remove unused conf field from OrcFileAppender #16345

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
4 changes: 0 additions & 4 deletions orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ class OrcFileAppender<D> implements FileAppender<D> {
private final OrcRowWriter<D> valueWriter;
private boolean isClosed = false;

@SuppressWarnings("unused") // Currently used in tests TODO remove this redundant field
private final Configuration conf;

private final MetricsConfig metricsConfig;

OrcFileAppender(
Expand All @@ -67,7 +64,6 @@ class OrcFileAppender<D> implements FileAppender<D> {
Map<String, byte[]> metadata,
int batchSize,
MetricsConfig metricsConfig) {
this.conf = conf;
this.file = file;
this.batchSize = batchSize;
this.metricsConfig = metricsConfig;
Expand Down
96 changes: 34 additions & 62 deletions orc/src/test/java/org/apache/iceberg/orc/TestTableProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
import static org.assertj.core.api.Assertions.assertThat;

import java.io.File;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.iceberg.FileFormat;
import org.apache.iceberg.Files;
import org.apache.iceberg.PartitionSpec;
import org.apache.iceberg.Schema;
import org.apache.iceberg.Table;
import org.apache.iceberg.TableProperties;
import org.apache.iceberg.common.DynFields;
import org.apache.iceberg.data.GenericRecord;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.data.orc.GenericOrcWriter;
import org.apache.iceberg.deletes.EqualityDeleteWriter;
Expand All @@ -38,8 +38,8 @@
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.types.Types;
import org.apache.orc.CompressionKind;
import org.apache.orc.OrcConf;
import org.apache.orc.OrcFile.CompressionStrategy;
import org.apache.orc.OrcFile;
import org.apache.orc.Reader;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

Expand All @@ -54,23 +54,15 @@ public class TestTableProperties {
@TempDir private File testFile;

@Test
public void testOrcTableProperties() throws Exception {
Random random = new Random();
int numOfCodecs = CompressionKind.values().length;
int numOfStrategies = CompressionStrategy.values().length;

long stripeSizeBytes = 32L * 1024 * 1024;
long blockSizeBytes = 128L * 1024 * 1024;
String codecAsString = CompressionKind.values()[random.nextInt(numOfCodecs)].name();
String strategyAsString = CompressionStrategy.values()[random.nextInt(numOfStrategies)].name();
public void testOrcTablePropertiesForDataFile() throws Exception {
String codecAsString = CompressionKind.SNAPPY.name();

ImmutableMap<String, String> properties =
ImmutableMap.of(
TableProperties.ORC_STRIPE_SIZE_BYTES, String.valueOf(stripeSizeBytes),
TableProperties.ORC_BLOCK_SIZE_BYTES, String.valueOf(blockSizeBytes),
TableProperties.ORC_COMPRESSION, codecAsString,
TableProperties.ORC_COMPRESSION_STRATEGY, strategyAsString,
TableProperties.DEFAULT_FILE_FORMAT, FileFormat.ORC.name());
TableProperties.ORC_COMPRESSION,
codecAsString,
TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.ORC.name());

String warehouse = folder.getAbsolutePath();
String tablePath = warehouse.concat("/test");
Expand All @@ -81,42 +73,30 @@ public void testOrcTableProperties() throws Exception {

assertThat(testFile.delete()).isTrue();

FileAppender<Record> writer =
try (FileAppender<Record> writer =
ORC.write(Files.localOutput(testFile))
.forTable(table)
.createWriterFunc(GenericOrcWriter::buildWriter)
.build();

DynFields.BoundField<Configuration> confField =
DynFields.builder().hiddenImpl(writer.getClass(), "conf").build(writer);

Configuration configuration = confField.get();
assertThat(OrcConf.BLOCK_SIZE.getLong(configuration)).isEqualTo(blockSizeBytes);
assertThat(OrcConf.STRIPE_SIZE.getLong(configuration)).isEqualTo(stripeSizeBytes);
assertThat(OrcConf.COMPRESS.getString(configuration)).isEqualTo(codecAsString);
assertThat(OrcConf.COMPRESSION_STRATEGY.getString(configuration)).isEqualTo(strategyAsString);
assertThat(configuration.get(TableProperties.DEFAULT_FILE_FORMAT))
.isEqualTo(FileFormat.ORC.name());
.build()) {
writer.add(GenericRecord.create(SCHEMA).copy(ImmutableMap.of("id", 1, "data", "a")));
}

Reader reader =
OrcFile.createReader(
new Path(testFile.toURI()), OrcFile.readerOptions(new Configuration()));
assertThat(reader.getCompressionKind()).isEqualTo(CompressionKind.SNAPPY);
}

@Test
public void testOrcTableDeleteProperties() throws Exception {
Random random = new Random();
int numOfCodecs = CompressionKind.values().length;
int numOfStrategies = CompressionStrategy.values().length;

long stripeSizeBytes = 32L * 1024 * 1024;
long blockSizeBytes = 128L * 1024 * 1024;
String codecAsString = CompressionKind.values()[random.nextInt(numOfCodecs)].name();
String strategyAsString = CompressionStrategy.values()[random.nextInt(numOfStrategies)].name();
public void testOrcTablePropertiesForDeleteFile() throws Exception {
String codecAsString = CompressionKind.SNAPPY.name();

ImmutableMap<String, String> properties =
ImmutableMap.of(
TableProperties.DELETE_ORC_STRIPE_SIZE_BYTES, String.valueOf(stripeSizeBytes),
TableProperties.DELETE_ORC_BLOCK_SIZE_BYTES, String.valueOf(blockSizeBytes),
TableProperties.DELETE_ORC_COMPRESSION, codecAsString,
TableProperties.DELETE_ORC_COMPRESSION_STRATEGY, strategyAsString,
TableProperties.DEFAULT_FILE_FORMAT, FileFormat.ORC.name());
TableProperties.DELETE_ORC_COMPRESSION,
codecAsString,
TableProperties.DEFAULT_FILE_FORMAT,
FileFormat.ORC.name());

String warehouse = folder.getAbsolutePath();
String tablePath = warehouse.concat("/test");
Expand All @@ -127,26 +107,18 @@ public void testOrcTableDeleteProperties() throws Exception {

assertThat(testFile.delete()).isTrue();

EqualityDeleteWriter<Object> deleteWriter =
try (EqualityDeleteWriter<Object> deleteWriter =
ORC.writeDeletes(Files.localOutput(testFile))
.forTable(table)
.equalityFieldIds(1)
.createWriterFunc(GenericOrcWriter::buildWriter)
.buildEqualityWriter();

DynFields.BoundField<OrcFileAppender<Record>> writer =
DynFields.builder().hiddenImpl(deleteWriter.getClass(), "appender").build(deleteWriter);

OrcFileAppender<Record> orcFileAppender = writer.get();
DynFields.BoundField<Configuration> confField =
DynFields.builder().hiddenImpl(orcFileAppender.getClass(), "conf").build(orcFileAppender);

Configuration configuration = confField.get();
assertThat(OrcConf.BLOCK_SIZE.getLong(configuration)).isEqualTo(blockSizeBytes);
assertThat(OrcConf.STRIPE_SIZE.getLong(configuration)).isEqualTo(stripeSizeBytes);
assertThat(OrcConf.COMPRESS.getString(configuration)).isEqualTo(codecAsString);
assertThat(OrcConf.COMPRESSION_STRATEGY.getString(configuration)).isEqualTo(strategyAsString);
assertThat(configuration.get(TableProperties.DEFAULT_FILE_FORMAT))
.isEqualTo(FileFormat.ORC.name());
.buildEqualityWriter()) {
deleteWriter.write(GenericRecord.create(SCHEMA).copy(ImmutableMap.of("id", 1, "data", "a")));
}

Reader reader =
OrcFile.createReader(
new Path(testFile.toURI()), OrcFile.readerOptions(new Configuration()));
assertThat(reader.getCompressionKind()).isEqualTo(CompressionKind.SNAPPY);
}
}