Skip to content

Add ZSTD support for writing ORC and DWRF tables #14113

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
mbasmanova merged 1 commit into from
Mar 14, 2020
Merged

Add ZSTD support for writing ORC and DWRF tables #14113

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
29 changes: 22 additions & 7 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveCompressionCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,34 @@
import parquet.hadoop.metadata.CompressionCodecName;

import java.util.Optional;
import java.util.function.Predicate;

import static com.facebook.presto.hive.HiveStorageFormat.DWRF;
import static com.facebook.presto.hive.HiveStorageFormat.ORC;
import static java.util.Objects.requireNonNull;

public enum HiveCompressionCodec
{
NONE(null, CompressionKind.NONE, CompressionCodecName.UNCOMPRESSED),
SNAPPY(SnappyCodec.class, CompressionKind.SNAPPY, CompressionCodecName.SNAPPY),
GZIP(GzipCodec.class, CompressionKind.ZLIB, CompressionCodecName.GZIP);
NONE(null, CompressionKind.NONE, CompressionCodecName.UNCOMPRESSED, f -> true),
Copy link
Contributor

@wenleix wenleix Mar 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: what about format -> true ? ditto for other lambdas.

SNAPPY(SnappyCodec.class, CompressionKind.SNAPPY, CompressionCodecName.SNAPPY, f -> true),
GZIP(GzipCodec.class, CompressionKind.ZLIB, CompressionCodecName.GZIP, f -> true),
ZSTD(null, CompressionKind.ZSTD, null, f -> f == ORC || f == DWRF);

private final Optional<Class<? extends CompressionCodec>> codec;
private final CompressionKind orcCompressionKind;
private final CompressionCodecName parquetCompressionCodec;
private final Optional<CompressionCodecName> parquetCompressionCodec;
private final Predicate<HiveStorageFormat> supportedStorageFormats;

HiveCompressionCodec(Class<? extends CompressionCodec> codec, CompressionKind orcCompressionKind, CompressionCodecName parquetCompressionCodec)
HiveCompressionCodec(
Class<? extends CompressionCodec> codec,
CompressionKind orcCompressionKind,
CompressionCodecName parquetCompressionCodec,
Predicate<HiveStorageFormat> supportedStorageFormats)
{
this.codec = Optional.ofNullable(codec);
this.orcCompressionKind = requireNonNull(orcCompressionKind, "orcCompressionKind is null");
this.parquetCompressionCodec = requireNonNull(parquetCompressionCodec, "parquetCompressionCodec is null");
this.parquetCompressionCodec = Optional.ofNullable(parquetCompressionCodec);
this.supportedStorageFormats = requireNonNull(supportedStorageFormats, "supportedStorageFormats is null");
}

public Optional<Class<? extends CompressionCodec>> getCodec()
Expand All @@ -50,8 +60,13 @@ public CompressionKind getOrcCompressionKind()
return orcCompressionKind;
}

public CompressionCodecName getParquetCompressionCodec()
public Optional<CompressionCodecName> getParquetCompressionCodec()
{
return parquetCompressionCodec;
}

public boolean isSupportedStorageFormat(HiveStorageFormat hiveStorageFormat)
{
return supportedStorageFormats.test(hiveStorageFormat);
}
}
9 changes: 9 additions & 0 deletions presto-hive/src/main/java/com/facebook/presto/hive/HiveWritableTableHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@
package com.facebook.presto.hive;

import com.facebook.presto.hive.metastore.HivePageSinkMetadata;
import com.facebook.presto.spi.PrestoException;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.ImmutableList;

import java.util.List;
import java.util.Optional;

import static com.facebook.presto.spi.StandardErrorCode.GENERIC_USER_ERROR;
import static java.util.Objects.requireNonNull;

public class HiveWritableTableHandle
Expand Down Expand Up @@ -57,6 +59,13 @@ public HiveWritableTableHandle(
this.tableStorageFormat = requireNonNull(tableStorageFormat, "tableStorageFormat is null");
this.partitionStorageFormat = requireNonNull(partitionStorageFormat, "partitionStorageFormat is null");
this.compressionCodec = requireNonNull(compressionCodec, "compressionCodec is null");

if (!compressionCodec.isSupportedStorageFormat(tableStorageFormat)) {
throw new PrestoException(GENERIC_USER_ERROR, String.format("%s compression is not supported with %s", compressionCodec.name(), tableStorageFormat.name()));
}
if (!compressionCodec.isSupportedStorageFormat(partitionStorageFormat)) {
throw new PrestoException(GENERIC_USER_ERROR, String.format("%s compression is not supported with %s", compressionCodec.name(), partitionStorageFormat.name()));
}
}

@JsonProperty
Expand Down
2 changes: 1 addition & 1 deletion presto-hive/src/main/java/com/facebook/presto/hive/util/ConfigurationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private static void setCompressionProperties(Configuration config, HiveCompressi
config.unset(FileOutputFormat.COMPRESS_CODEC);
}
// For Parquet
config.set(ParquetOutputFormat.COMPRESSION, compression.getParquetCompressionCodec().name());
compression.getParquetCompressionCodec().ifPresent(codec -> config.set(ParquetOutputFormat.COMPRESSION, codec.name()));
// For SequenceFile
config.set(FileOutputFormat.COMPRESS_TYPE, BLOCK.toString());
}
Expand Down
2 changes: 1 addition & 1 deletion presto-hive/src/test/java/com/facebook/presto/hive/TestHivePageSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void testAllFormats()
assertGreaterThan(uncompressedLength, 0L);

for (HiveCompressionCodec codec : HiveCompressionCodec.values()) {
if (codec == NONE) {
if (codec == NONE || !codec.isSupportedStorageFormat(format)) {
continue;
}
config.setCompressionCodec(codec);
Expand Down
2 changes: 1 addition & 1 deletion presto-orc/src/test/java/com/facebook/presto/orc/OrcTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ public static OrcTester quickSelectiveOrcTester()
orcTester.nullTestsEnabled = true;
orcTester.skipBatchTestsEnabled = true;
orcTester.formats = ImmutableSet.of(ORC_12, ORC_11, DWRF);
orcTester.compressions = ImmutableSet.of(ZLIB);
orcTester.compressions = ImmutableSet.of(ZLIB, ZSTD);
orcTester.useSelectiveOrcReader = true;

return orcTester;
Expand Down