Skip to content

Possibility of removing DWRF #24315

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

Closed
namya28 wants to merge 1 commit into from
Closed

Possibility of removing DWRF #24315

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: 0 additions & 5 deletions presto-hive-metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@
<artifactId>validation-api</artifactId>
</dependency>

<dependency>
<groupId>com.facebook.hive</groupId>
<artifactId>hive-dwrf</artifactId>
</dependency>

<dependency>
<groupId>org.openjdk.jol</groupId>
<artifactId>jol-core</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions presto-hive-metastore/src/main/java/com/facebook/presto/hive/HiveStorageFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public enum HiveStorageFormat
OrcOutputFormat.class.getName(),
new DataSize(256, Unit.MEGABYTE)),
DWRF(
com.facebook.hive.orc.OrcSerde.class.getName(),
com.facebook.hive.orc.OrcInputFormat.class.getName(),
com.facebook.hive.orc.OrcOutputFormat.class.getName(),
"com.facebook.hive.orc.OrcSerde",
"com.facebook.hive.orc.OrcInputFormat",
"com.facebook.hive.orc.OrcOutputFormat",
new DataSize(256, Unit.MEGABYTE)),
ALPHA(
"com.facebook.alpha.AlphaSerde",
Expand Down
5 changes: 0 additions & 5 deletions presto-hive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
<artifactId>presto-plugin-toolkit</artifactId>
</dependency>

<dependency>
<groupId>com.facebook.hive</groupId>
<artifactId>hive-dwrf</artifactId>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-orc</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions ...-hive/src/main/java/com/facebook/presto/hive/AbstractDwrfEncryptionInformationSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package com.facebook.presto.hive;

import com.facebook.hive.orc.OrcSerde;
import com.facebook.presto.hive.ColumnEncryptionInformation.ColumnWithStructSubfield;
import com.facebook.presto.hive.metastore.Partition;
import com.facebook.presto.hive.metastore.Table;
Expand Down Expand Up @@ -131,10 +130,6 @@ else if (columnEncryptionInformation.isPresent()) {

private static Optional<DwrfTableEncryptionProperties> getTableEncryptionProperties(Table table)
{
if (!OrcSerde.class.getName().equals(table.getStorage().getStorageFormat().getSerDe())) {
return Optional.empty();
}

return fromHiveTableProperties(table.getParameters());
}
}
4 changes: 0 additions & 4 deletions presto-hive/src/main/java/com/facebook/presto/hive/OrcFileWriterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
import static com.facebook.presto.hive.HiveSessionProperties.isStringDictionaryEncodingEnabled;
import static com.facebook.presto.hive.HiveSessionProperties.isStringDictionarySortingEnabled;
import static com.facebook.presto.hive.HiveType.toHiveTypes;
import static com.facebook.presto.orc.OrcEncoding.DWRF;
import static com.facebook.presto.orc.OrcEncoding.ORC;
import static com.facebook.presto.orc.OrcWriterOptions.DEFAULT_MAX_FLATTENED_MAP_KEY_COUNT;
import static com.facebook.presto.orc.metadata.KeyProvider.CRYPTO_SERVICE;
Expand Down Expand Up @@ -212,9 +211,6 @@ public Optional<HiveFileWriter> createFileWriter(
if (OrcOutputFormat.class.getName().equals(storageFormat.getOutputFormat())) {
orcEncoding = ORC;
}
else if (com.facebook.hive.orc.OrcOutputFormat.class.getName().equals(storageFormat.getOutputFormat())) {
orcEncoding = DWRF;
}
else {
return Optional.empty();
}
Expand Down
5 changes: 0 additions & 5 deletions presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfAggregatedPageSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package com.facebook.presto.hive.orc;

import com.facebook.hive.orc.OrcSerde;
import com.facebook.presto.common.type.TypeManager;
import com.facebook.presto.hive.EncryptionInformation;
import com.facebook.presto.hive.FileFormatDataSourceStats;
Expand Down Expand Up @@ -102,10 +101,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
HiveFileContext hiveFileContext,
Optional<EncryptionInformation> encryptionInformation)
{
if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
return Optional.empty();
}

if (fileSplit.getFileSize() == 0) {
throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
}
Expand Down
5 changes: 0 additions & 5 deletions presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfBatchPageSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package com.facebook.presto.hive.orc;

import com.facebook.hive.orc.OrcSerde;
import com.facebook.presto.common.predicate.TupleDomain;
import com.facebook.presto.common.type.TypeManager;
import com.facebook.presto.hive.EncryptionInformation;
Expand Down Expand Up @@ -101,10 +100,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
Optional<EncryptionInformation> encryptionInformation,
Optional<byte[]> rowIDPartitionComponent)
{
if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
return Optional.empty();
}

if (fileSplit.getFileSize() == 0) {
throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
}
Expand Down
5 changes: 0 additions & 5 deletions presto-hive/src/main/java/com/facebook/presto/hive/orc/DwrfSelectivePageSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*/
package com.facebook.presto.hive.orc;

import com.facebook.hive.orc.OrcSerde;
import com.facebook.presto.common.Subfield;
import com.facebook.presto.common.predicate.TupleDomain;
import com.facebook.presto.common.type.TypeManager;
Expand Down Expand Up @@ -111,10 +110,6 @@ public Optional<? extends ConnectorPageSource> createPageSource(
boolean appendRowNumberEnabled,
Optional<byte[]> rowIDPartitionComponent)
{
if (!OrcSerde.class.getName().equals(storage.getStorageFormat().getSerDe())) {
return Optional.empty();
}

if (fileSplit.getFileSize() == 0) {
throw new PrestoException(HIVE_BAD_DATA, "ORC file is empty: " + fileSplit.getPath());
}
Expand Down
3 changes: 0 additions & 3 deletions 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 @@ -24,7 +24,6 @@

import java.util.Map;

import static com.facebook.hive.orc.OrcConf.ConfVars.HIVE_ORC_COMPRESSION;
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.hadoop.hive.conf.HiveConf.ConfVars.COMPRESSRESULT;
import static org.apache.hadoop.io.SequenceFile.CompressionType.BLOCK;
Expand Down Expand Up @@ -102,8 +101,6 @@ private static void setCompressionProperties(Configuration config, HiveCompressi
config.setBoolean(COMPRESSRESULT.varname, compressed);
config.setBoolean("mapred.output.compress", compressed);
config.setBoolean(FileOutputFormat.COMPRESS, compressed);
// For DWRF
com.facebook.hive.orc.OrcConf.setVar(config, HIVE_ORC_COMPRESSION, compression.getOrcCompressionKind().name());
// For ORC
OrcConf.COMPRESS.setString(config, compression.getOrcCompressionKind().name());
// For RCFile and Text
Expand Down