diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index bcba2288300f3..c29618776834b 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -365,16 +365,6 @@ wildfly-openssl-java provided - - org.xerial.snappy - snappy-java - compile - - - org.lz4 - lz4-java - provided - 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 d2ffb22eaafb3..b407ddb11046c 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 @@ -26,7 +26,6 @@ import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.io.compress.zlib.ZlibDecompressor; import org.apache.hadoop.io.compress.zlib.ZlibFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec b/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec index 99b6fb2a3898a..7afcfd066d6bd 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec +++ b/hadoop-common-project/hadoop-common/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec @@ -13,9 +13,6 @@ # org.apache.hadoop.io.compress.BZip2Codec org.apache.hadoop.io.compress.DefaultCodec -org.apache.hadoop.io.compress.DeflateCodec org.apache.hadoop.io.compress.GzipCodec -org.apache.hadoop.io.compress.Lz4Codec -org.apache.hadoop.io.compress.SnappyCodec org.apache.hadoop.io.compress.ZStandardCodec diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index 10d66d055ba35..3f4e43445812c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -221,8 +221,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> test - org.lz4 - lz4-java + org.apache.hadoop + hadoop-compression test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml index 3ce8141c988de..f7b8f3a2a42b5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml @@ -56,8 +56,8 @@ test - org.lz4 - lz4-java + org.apache.hadoop + hadoop-compression test diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 1435eae2d23f6..cbeac8d8ce7db 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -694,6 +694,12 @@ test-jar + + org.apache.hadoop + hadoop-compression + ${hadoop.version} + + com.google.guava guava diff --git a/hadoop-tools/hadoop-compression/pom.xml b/hadoop-tools/hadoop-compression/pom.xml new file mode 100644 index 0000000000000..467176a35d9b5 --- /dev/null +++ b/hadoop-tools/hadoop-compression/pom.xml @@ -0,0 +1,169 @@ + + + + 4.0.0 + + org.apache.hadoop + hadoop-project + 3.4.0-SNAPSHOT + ../../hadoop-project + + hadoop-compression + 3.4.0-SNAPSHOT + Apache Hadoop Compression + Apache Hadoop Compression + jar + + + + org.xerial.snappy + snappy-java + compile + + + org.lz4 + lz4-java + compile + + + + org.apache.hadoop + hadoop-common + compile + + + org.apache.hadoop + hadoop-common + test + test-jar + + + + junit + junit + test + + + org.assertj + assertj-core + test + + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${ignoreTestFailure} + 1 + false + 600 + -Xmx1024m + + **/Test*.java + + true + + + test.build.data + ${basedir}/target/test/data + + + hadoop.log.dir + target/test/logs + + + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + deplist + compile + + list + + + + ${project.basedir}/target/hadoop-tools-deps/${project.artifactId}.tools-builtin.txt + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.apache.hadoop.tools.DistCp + + + + + + prepare-jar + prepare-package + + jar + + + + prepare-test-jar + prepare-package + + test-jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + true + + + + + jar + + + + + + + diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/BlockDecompressorStream.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/DeflateCodec.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/Lz4Codec.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Compressor.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Compressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Compressor.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Compressor.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/Lz4Decompressor.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/lz4/package-info.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyCompressor.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java b/hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java rename to hadoop-tools/hadoop-compression/src/main/java/org/apache/hadoop/io/compress/snappy/package-info.java diff --git a/hadoop-tools/hadoop-compression/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec b/hadoop-tools/hadoop-compression/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec new file mode 100644 index 0000000000000..6a7855978a8ab --- /dev/null +++ b/hadoop-tools/hadoop-compression/src/main/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec @@ -0,0 +1,16 @@ +# +# Licensed 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. +# +org.apache.hadoop.io.compress.DeflateCodec +org.apache.hadoop.io.compress.Lz4Codec +org.apache.hadoop.io.compress.SnappyCodec diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java similarity index 98% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java index c016ff0378957..6811019888450 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java +++ b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/CompressDecompressTester.java @@ -31,7 +31,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.lz4.Lz4Compressor; -import org.apache.hadoop.io.compress.snappy.SnappyCompressor; import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater; import org.apache.hadoop.io.compress.zlib.ZlibCompressor; import org.apache.hadoop.io.compress.zlib.ZlibFactory; @@ -312,7 +311,7 @@ public void assertCompression(String name, Compressor compressor, final Joiner joiner = Joiner.on("- "); final ImmutableMap, Integer> emptySize = ImmutableMap .of(Lz4Compressor.class, 4, ZlibCompressor.class, 16, - SnappyCompressor.class, 4, BuiltInZlibDeflater.class, 16); + BuiltInZlibDeflater.class, 16); @Override void assertCompression(String name, Compressor compressor, @@ -482,8 +481,6 @@ else if (compressor.getClass().isAssignableFrom(BuiltInZlibDeflater.class) else if (compressor.getClass().isAssignableFrom(ZlibCompressor.class)) { return ZlibFactory.isNativeZlibLoaded(new Configuration()); - } else if (compressor.getClass().isAssignableFrom(SnappyCompressor.class)) { - return true; } return false; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/FakeCompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/FakeCompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/FakeCompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/FakeCompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/FakeDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/FakeDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/FakeDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/FakeDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestBlockDecompressorStream.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodec.java similarity index 95% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodec.java index 26867eed91a97..74e200f58c095 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodec.java +++ b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodec.java @@ -142,12 +142,6 @@ public void testBZip2NativeCodec() throws IOException { } } - @Test - public void testSnappyCodec() throws IOException { - codecTest(conf, seed, 0, "org.apache.hadoop.io.compress.SnappyCodec"); - codecTest(conf, seed, count, "org.apache.hadoop.io.compress.SnappyCodec"); - } - @Test public void testLz4Codec() throws IOException { conf.setBoolean( @@ -626,48 +620,6 @@ private static void sequenceFileCodecTest(Configuration conf, int lines, LOG.info("SUCCESS! Completed SequenceFileCodecTest with codec \"" + codecClass + "\""); } - /** - * Regression test for HADOOP-8423: seeking in a block-compressed - * stream would not properly reset the block decompressor state. - */ - @Test - public void testSnappyMapFile() throws Exception { - codecTestMapFile(SnappyCodec.class, CompressionType.BLOCK, 100); - } - - private void codecTestMapFile(Class clazz, - CompressionType type, int records) throws Exception { - - FileSystem fs = FileSystem.get(conf); - LOG.info("Creating MapFiles with " + records + - " records using codec " + clazz.getSimpleName()); - Path path = new Path(GenericTestUtils.getTempPath( - clazz.getSimpleName() + "-" + type + "-" + records)); - - LOG.info("Writing " + path); - createMapFile(conf, fs, path, clazz.newInstance(), type, records); - MapFile.Reader reader = new MapFile.Reader(path, conf); - Text key1 = new Text("002"); - assertNotNull(reader.get(key1, new Text())); - Text key2 = new Text("004"); - assertNotNull(reader.get(key2, new Text())); - } - - private static void createMapFile(Configuration conf, FileSystem fs, Path path, - CompressionCodec codec, CompressionType type, int records) throws IOException { - MapFile.Writer writer = - new MapFile.Writer(conf, path, - MapFile.Writer.keyClass(Text.class), - MapFile.Writer.valueClass(Text.class), - MapFile.Writer.compression(type, codec)); - Text key = new Text(); - for (int j = 0; j < records; j++) { - key.set(String.format("%03d", j)); - writer.append(key, key); - } - writer.close(); - } - public static void main(String[] args) throws IOException { int count = 10000; String codecClass = "org.apache.hadoop.io.compress.DefaultCodec"; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java similarity index 97% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java index edab634a0b877..e54a8ca97da7d 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java +++ b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodecFactory.java @@ -207,11 +207,6 @@ public void testFinding() { codec = factory.getCodecByClassName(BZip2Codec.class.getCanonicalName()); checkCodec("empty factory for bzip2 codec", BZip2Codec.class, codec); - codec = factory.getCodec(new Path("/tmp/foo.snappy")); - checkCodec("empty factory snappy codec", SnappyCodec.class, codec); - codec = factory.getCodecByClassName(SnappyCodec.class.getCanonicalName()); - checkCodec("empty factory snappy codec", SnappyCodec.class, codec); - codec = factory.getCodec(new Path("/tmp/foo.lz4")); checkCodec("empty factory lz4 codec", Lz4Codec.class, codec); codec = factory.getCodecByClassName(Lz4Codec.class.getCanonicalName()); diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCodecPool.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java similarity index 91% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java index 43cb4df1105b2..a01bcff4cfdd2 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java +++ b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressorDecompressor.java @@ -21,8 +21,6 @@ import org.apache.hadoop.io.compress.CompressDecompressTester.CompressionTestStrategy; import org.apache.hadoop.io.compress.lz4.Lz4Compressor; import org.apache.hadoop.io.compress.lz4.Lz4Decompressor; -import org.apache.hadoop.io.compress.snappy.SnappyCompressor; -import org.apache.hadoop.io.compress.snappy.SnappyDecompressor; import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater; import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater; import org.apache.hadoop.test.GenericTestUtils; @@ -56,7 +54,6 @@ public void testCompressorDecompressor() { byte[] rawData = generate(SIZE); try { CompressDecompressTester.of(rawData) - .withCompressDecompressPair(new SnappyCompressor(), new SnappyDecompressor()) .withCompressDecompressPair(new Lz4Compressor(), new Lz4Decompressor()) .withCompressDecompressPair(new BuiltInZlibDeflater(), new BuiltInZlibInflater()) .withTestCases(ImmutableSet.of(CompressionTestStrategy.COMPRESS_DECOMPRESS_SINGLE_BLOCK, @@ -79,9 +76,6 @@ public void testCompressorDecompressorWithExceedBufferLimit() { byte[] rawData = generate(byteSize); try { CompressDecompressTester.of(rawData) - .withCompressDecompressPair( - new SnappyCompressor(bufferSize), - new SnappyDecompressor(bufferSize)) .withCompressDecompressPair( new Lz4Compressor(bufferSize), new Lz4Decompressor(bufferSize)) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestCompressorStream.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestDecompressorStream.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestDecompressorStream.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestDecompressorStream.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestDecompressorStream.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestGzipCodec.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestGzipCodec.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestGzipCodec.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/TestGzipCodec.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBzip2CompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBzip2CompressorDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBzip2CompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBzip2CompressorDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/lz4/TestLz4CompressorDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/snappy/TestSnappyCompressorDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/zlib/TestZlibCompressorDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zstd/TestZStandardCompressorDecompressor.java b/hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/zstd/TestZStandardCompressorDecompressor.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/zstd/TestZStandardCompressorDecompressor.java rename to hadoop-tools/hadoop-compression/src/test/java/org/apache/hadoop/io/compress/zstd/TestZStandardCompressorDecompressor.java diff --git a/hadoop-common-project/hadoop-common/src/test/resources/lz4/.sequencefile.crc b/hadoop-tools/hadoop-compression/src/test/resources/lz4/.sequencefile.crc similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/resources/lz4/.sequencefile.crc rename to hadoop-tools/hadoop-compression/src/test/resources/lz4/.sequencefile.crc diff --git a/hadoop-common-project/hadoop-common/src/test/resources/lz4/sequencefile b/hadoop-tools/hadoop-compression/src/test/resources/lz4/sequencefile similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/resources/lz4/sequencefile rename to hadoop-tools/hadoop-compression/src/test/resources/lz4/sequencefile diff --git a/hadoop-common-project/hadoop-common/src/test/resources/zstd/test_file.txt b/hadoop-tools/hadoop-compression/src/test/resources/zstd/test_file.txt similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/resources/zstd/test_file.txt rename to hadoop-tools/hadoop-compression/src/test/resources/zstd/test_file.txt diff --git a/hadoop-common-project/hadoop-common/src/test/resources/zstd/test_file.txt.zst b/hadoop-tools/hadoop-compression/src/test/resources/zstd/test_file.txt.zst similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/resources/zstd/test_file.txt.zst rename to hadoop-tools/hadoop-compression/src/test/resources/zstd/test_file.txt.zst diff --git a/hadoop-tools/pom.xml b/hadoop-tools/pom.xml index f026bc261e00b..9f6b010ca619a 100644 --- a/hadoop-tools/pom.xml +++ b/hadoop-tools/pom.xml @@ -51,6 +51,7 @@ hadoop-azure-datalake hadoop-aliyun hadoop-fs2img + hadoop-compression