You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by li...@apache.org on 2020/04/22 19:57:07 UTC
[hadoop] branch branch-3.3 updated: HADOOP-17001. The suffix name
of the unified compression class. Contributed by bianqi
This is an automated email from the ASF dual-hosted git repository.
liuml07 pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 5b92d73 HADOOP-17001. The suffix name of the unified compression class. Contributed by bianqi
5b92d73 is described below
commit 5b92d73a74ca8ed88ed13370cf279462c750fd6f
Author: Mingliang Liu <li...@apache.org>
AuthorDate: Wed Apr 22 12:36:19 2020 -0700
HADOOP-17001. The suffix name of the unified compression class. Contributed by bianqi
---
.../org/apache/hadoop/io/compress/BZip2Codec.java | 2 +-
.../apache/hadoop/io/compress/CodecConstants.java | 68 ++++++++++++++++++++++
.../apache/hadoop/io/compress/DefaultCodec.java | 2 +-
.../org/apache/hadoop/io/compress/GzipCodec.java | 2 +-
.../org/apache/hadoop/io/compress/Lz4Codec.java | 2 +-
.../hadoop/io/compress/PassthroughCodec.java | 3 +-
.../org/apache/hadoop/io/compress/SnappyCodec.java | 2 +-
.../apache/hadoop/io/compress/ZStandardCodec.java | 2 +-
8 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
index 99590ed..7fd5633 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
@@ -236,7 +236,7 @@ public class BZip2Codec implements Configurable, SplittableCompressionCodec {
*/
@Override
public String getDefaultExtension() {
- return ".bz2";
+ return CodecConstants.BZIP2_CODEC_EXTENSION;
}
private static class BZip2CompressionOutputStream extends
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecConstants.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecConstants.java
new file mode 100644
index 0000000..96410a1
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/CodecConstants.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io.compress;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+
+/**
+ * Codec related constants.
+ */
+@InterfaceAudience.Public
+@InterfaceStability.Evolving
+public final class CodecConstants {
+
+ private CodecConstants() {
+ }
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.DefaultCodec}.
+ */
+ public static final String DEFAULT_CODEC_EXTENSION = ".deflate";
+
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.BZip2Codec}.
+ */
+ public static final String BZIP2_CODEC_EXTENSION = ".bz2";
+
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.GzipCodec}.
+ */
+ public static final String GZIP_CODEC_EXTENSION = ".gz";
+
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.Lz4Codec}.
+ */
+ public static final String LZ4_CODEC_EXTENSION = ".lz4";
+
+ /**
+ * Default extension for
+ * {@link org.apache.hadoop.io.compress.PassthroughCodec}.
+ */
+ public static final String PASSTHROUGH_CODEC_EXTENSION = ".passthrough";
+
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.SnappyCodec}.
+ */
+ public static final String SNAPPY_CODEC_EXTENSION = ".snappy";
+
+ /**
+ * Default extension for {@link org.apache.hadoop.io.compress.ZStandardCodec}.
+ */
+ public static final String ZSTANDARD_CODEC_EXTENSION = ".zst";
+}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java
index 33f39ef..d2ffb22 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DefaultCodec.java
@@ -114,7 +114,7 @@ public class DefaultCodec implements Configurable, CompressionCodec, DirectDecom
@Override
public String getDefaultExtension() {
- return ".deflate";
+ return CodecConstants.DEFAULT_CODEC_EXTENSION;
}
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java
index 9bd861d..1535e8c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/GzipCodec.java
@@ -206,7 +206,7 @@ public class GzipCodec extends DefaultCodec {
@Override
public String getDefaultExtension() {
- return ".gz";
+ return CodecConstants.GZIP_CODEC_EXTENSION;
}
static final class GzipZlibCompressor extends ZlibCompressor {
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java
index 45b5e9c..ba6b487 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java
@@ -221,6 +221,6 @@ public class Lz4Codec implements Configurable, CompressionCodec {
*/
@Override
public String getDefaultExtension() {
- return ".lz4";
+ return CodecConstants.LZ4_CODEC_EXTENSION;
}
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/PassthroughCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/PassthroughCodec.java
index a3f0bff..074762c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/PassthroughCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/PassthroughCodec.java
@@ -77,7 +77,8 @@ public class PassthroughCodec
* This default extension is here so that if no extension has been defined,
* some value is still returned: {@value}..
*/
- public static final String DEFAULT_EXTENSION = ".passthrough";
+ public static final String DEFAULT_EXTENSION =
+ CodecConstants.PASSTHROUGH_CODEC_EXTENSION;
private Configuration conf;
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
index cd0c788..686f30c 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java
@@ -225,6 +225,6 @@ public class SnappyCodec implements Configurable, CompressionCodec, DirectDecomp
*/
@Override
public String getDefaultExtension() {
- return ".snappy";
+ return CodecConstants.SNAPPY_CODEC_EXTENSION;
}
}
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/ZStandardCodec.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/ZStandardCodec.java
index c56bbba..a7afebc 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/ZStandardCodec.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/ZStandardCodec.java
@@ -230,7 +230,7 @@ public class ZStandardCodec implements
*/
@Override
public String getDefaultExtension() {
- return ".zst";
+ return CodecConstants.ZSTANDARD_CODEC_EXTENSION;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org