Skip to content

[format] Fix ORC zstd compression option inconsistent across writers #9453

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
ArnavBalyan wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

[format] Fix ORC zstd compression option inconsistent across writers #9453

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
5 changes: 2 additions & 3 deletions paimon-format/src/main/java/org/apache/orc/impl/PhysicalFsWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,8 @@ public PhysicalFsWriter(
CompressionCodec codec = OrcCodecPool.getCodec(opts.getCompress());
if (codec != null) {
CompressionCodec.Options tempOptions = codec.getDefaultOptions();
if (codec instanceof ZstdCodec
&& codec.getDefaultOptions() instanceof ZstdCodec.ZstdOptions) {
ZstdCodec.ZstdOptions options = (ZstdCodec.ZstdOptions) codec.getDefaultOptions();
if (codec instanceof ZstdCodec && tempOptions instanceof ZstdCodec.ZstdOptions) {
ZstdCodec.ZstdOptions options = (ZstdCodec.ZstdOptions) tempOptions;
OrcFile.ZstdCompressOptions zstdCompressOptions = opts.getZstdCompressOptions();
if (zstdCompressOptions != null) {
options.setLevel(zstdCompressOptions.getCompressionZstdLevel());
Expand Down
2 changes: 1 addition & 1 deletion paimon-format/src/main/java/org/apache/orc/impl/ZstdCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public int hashCode() {

@Override
public Options getDefaultOptions() {
return DEFAULT_OPTIONS;
return DEFAULT_OPTIONS.copy();
}

/**
Expand Down
5 changes: 5 additions & 0 deletions paimon-format/src/test/java/org/apache/paimon/format/orc/writer/OrcZstdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.apache.orc.CompressionKind;
import org.apache.orc.OrcFile;
import org.apache.orc.Reader;
import org.apache.orc.impl.OrcCodecPool;
import org.apache.orc.impl.ZstdCodec;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
Expand All @@ -58,6 +59,9 @@ class OrcZstdTest {

@Test
void testWriteOrcWithZstd(@TempDir java.nio.file.Path tempDir) throws IOException {
CompressionCodec zstdCodec = OrcCodecPool.getCodec(CompressionKind.ZSTD);
int originalHashCode = zstdCodec.getDefaultOptions().hashCode();

Options options = new Options();
options.set("orc.compress", "zstd");
options.set("orc.stripe.size", "31457280");
Expand Down Expand Up @@ -90,6 +94,7 @@ void testWriteOrcWithZstd(@TempDir java.nio.file.Path tempDir) throws IOExceptio
FormatWriter formatWriter = writerFactory.create(out, "zstd");

Assertions.assertThat(formatWriter).isInstanceOf(OrcBulkWriter.class);
Assertions.assertThat(zstdCodec.getDefaultOptions().hashCode()).isEqualTo(originalHashCode);

Options optionsWithLowLevel = new Options();
optionsWithLowLevel.set("orc.compress", "zstd");
Expand Down
Loading