You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2022/07/24 21:26:17 UTC
[orc] branch branch-1.8 updated: ORC-1224: Move `getDecompressor` to `HadoopShimsCurrent`
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.8 by this push:
new e3cb27a85 ORC-1224: Move `getDecompressor` to `HadoopShimsCurrent`
e3cb27a85 is described below
commit e3cb27a8581d1df2d3492caa10507ae5c0bbbffb
Author: William Hyun <wi...@apache.org>
AuthorDate: Sun Jul 24 14:25:56 2022 -0700
ORC-1224: Move `getDecompressor` to `HadoopShimsCurrent`
### What changes were proposed in this pull request?
This PR aims to move `getDecompressor` to `HadoopShimsCurrent`
### Why are the changes needed?
To clean up old Hadoop support.
### How was this patch tested?
Pass the CIs.
Closes #1190 from williamhyun/getDecompressor.
Authored-by: William Hyun <wi...@apache.org>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit f17d2ddc57c85becf398454a2f4f7ac46b9da693)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.../org/apache/orc/impl/HadoopShimsCurrent.java | 21 ++++++++++++++++++++-
.../java/org/apache/orc/impl/HadoopShimsPre2_6.java | 21 +--------------------
.../java/org/apache/orc/impl/HadoopShimsPre2_7.java | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
index 68f98385d..a80245702 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsCurrent.java
@@ -21,6 +21,8 @@ package org.apache.orc.impl;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.hdfs.client.HdfsDataOutputStream;
+import org.apache.hadoop.io.compress.snappy.SnappyDecompressor;
+import org.apache.hadoop.io.compress.zlib.ZlibDecompressor;
import java.io.IOException;
import java.io.OutputStream;
@@ -37,9 +39,26 @@ import java.util.Random;
*/
public class HadoopShimsCurrent implements HadoopShims {
+ static DirectDecompressor getDecompressor( DirectCompressionType codec) {
+ switch (codec) {
+ case ZLIB:
+ return new ZlibDirectDecompressWrapper
+ (new ZlibDecompressor.ZlibDirectDecompressor());
+ case ZLIB_NOHEADER:
+ return new ZlibDirectDecompressWrapper
+ (new ZlibDecompressor.ZlibDirectDecompressor
+ (ZlibDecompressor.CompressionHeader.NO_HEADER, 0));
+ case SNAPPY:
+ return new SnappyDirectDecompressWrapper
+ (new SnappyDecompressor.SnappyDirectDecompressor());
+ default:
+ return null;
+ }
+ }
+
@Override
public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
- return HadoopShimsPre2_6.getDecompressor(codec);
+ return getDecompressor(codec);
}
@Override
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
index fa7df7bfd..1a44f197e 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_6.java
@@ -20,8 +20,6 @@ package org.apache.orc.impl;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.io.compress.snappy.SnappyDecompressor.SnappyDirectDecompressor;
-import org.apache.hadoop.io.compress.zlib.ZlibDecompressor;
import java.io.IOException;
import java.io.OutputStream;
@@ -38,26 +36,9 @@ import java.util.Random;
*/
public class HadoopShimsPre2_6 implements HadoopShims {
- static DirectDecompressor getDecompressor( DirectCompressionType codec) {
- switch (codec) {
- case ZLIB:
- return new ZlibDirectDecompressWrapper
- (new ZlibDecompressor.ZlibDirectDecompressor());
- case ZLIB_NOHEADER:
- return new ZlibDirectDecompressWrapper
- (new ZlibDecompressor.ZlibDirectDecompressor
- (ZlibDecompressor.CompressionHeader.NO_HEADER, 0));
- case SNAPPY:
- return new SnappyDirectDecompressWrapper
- (new SnappyDirectDecompressor());
- default:
- return null;
- }
- }
-
@Override
public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
- return getDecompressor(codec);
+ return HadoopShimsCurrent.getDecompressor(codec);
}
@Override
diff --git a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
index 4a6f9e826..410be1eb8 100644
--- a/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
+++ b/java/shims/src/java/org/apache/orc/impl/HadoopShimsPre2_7.java
@@ -51,7 +51,7 @@ public class HadoopShimsPre2_7 implements HadoopShims {
@Override
public DirectDecompressor getDirectDecompressor(DirectCompressionType codec) {
- return HadoopShimsPre2_6.getDecompressor(codec);
+ return HadoopShimsCurrent.getDecompressor(codec);
}
@Override