Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-6803. Add native gzip read/write coverage to TestCodec. Contributed by Eli Collins. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@986964 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2010-08-18 21:57:18 +00:00
parent 76e22cc8bf
commit f74a3e4f60
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -122,6 +122,9 @@ Trunk (unreleased changes)
HADOOP-6693. Add metrics to track kerberol login activity. (suresh) HADOOP-6693. Add metrics to track kerberol login activity. (suresh)
HADOOP-6803. Add native gzip read/write coverage to TestCodec.
(Eli Collins via tomwhite)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

33
src/test/core/org/apache/hadoop/io/compress/TestCodec.java
View File

@ -57,6 +57,7 @@ import org.apache.hadoop.io.compress.CompressorStream;
import org.apache.hadoop.io.compress.zlib.BuiltInGzipDecompressor; import org.apache.hadoop.io.compress.zlib.BuiltInGzipDecompressor;
import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater; import org.apache.hadoop.io.compress.zlib.BuiltInZlibDeflater;
import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater; import org.apache.hadoop.io.compress.zlib.BuiltInZlibInflater;
import org.apache.hadoop.io.compress.zlib.ZlibCompressor;
import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel; import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel;
import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy; import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy;
import org.apache.hadoop.io.compress.zlib.ZlibFactory; import org.apache.hadoop.io.compress.zlib.ZlibFactory;
@ -629,22 +630,30 @@ public class TestCodec {
} }
} }
@Test public void testGzipCodecWrite(boolean useNative) throws IOException {
public void testGzipCodecWrite() throws IOException {
// Create a gzipped file using a compressor from the CodecPool, // Create a gzipped file using a compressor from the CodecPool,
// and try to read it back via the regular GZIPInputStream. // and try to read it back via the regular GZIPInputStream.
// Don't use native libs for this test. // Use native libs per the parameter
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, false); conf.setBoolean(CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, useNative);
assertFalse("ZlibFactory is using native libs against request", if (useNative) {
ZlibFactory.isNativeZlibLoaded(conf)); if (!ZlibFactory.isNativeZlibLoaded(conf)) {
LOG.warn("testGzipCodecWrite skipped: native libs not loaded");
return;
}
} else {
assertFalse("ZlibFactory is using native libs against request",
ZlibFactory.isNativeZlibLoaded(conf));
}
// Ensure that the CodecPool has a BuiltInZlibDeflater in it. // Ensure that the CodecPool has a BuiltInZlibDeflater in it.
Compressor zlibCompressor = ZlibFactory.getZlibCompressor(conf); Compressor zlibCompressor = ZlibFactory.getZlibCompressor(conf);
assertNotNull("zlibCompressor is null!", zlibCompressor); assertNotNull("zlibCompressor is null!", zlibCompressor);
assertTrue("ZlibFactory returned unexpected deflator", assertTrue("ZlibFactory returned unexpected deflator",
zlibCompressor instanceof BuiltInZlibDeflater); useNative ? zlibCompressor instanceof ZlibCompressor
: zlibCompressor instanceof BuiltInZlibDeflater);
CodecPool.returnCompressor(zlibCompressor); CodecPool.returnCompressor(zlibCompressor);
// Create a GZIP text file via the Compressor interface. // Create a GZIP text file via the Compressor interface.
@ -680,4 +689,14 @@ public class TestCodec {
verifyGzipFile(fileName, msg); verifyGzipFile(fileName, msg);
} }
@Test
public void testGzipCodecWriteJava() throws IOException {
testGzipCodecWrite(false);
}
@Test
public void testGzipNativeCodecWrite() throws IOException {
testGzipCodecWrite(true);
}
} }