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

HADOOP-8537. Fix TFile tests to pass even when native zlib support is not compiled. Contributed by Todd Lipcon. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1362729 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2012-07-18 00:51:32 +00:00
parent 2e00d28f14
commit 28ebdea81d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -355,6 +355,9 @@ Branch-2 ( Unreleased changes )
HADOOP-8552. Conflict: Same security.log.file for multiple users.
(kkambatl via tucu)
HADOOP-8537. Fix TFile tests to pass even when native zlib support is not
compiled. (todd)
BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active

9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileByteArrays.java
View File

@ -30,6 +30,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.WritableUtils;
import org.apache.hadoop.io.compress.zlib.ZlibFactory;
import org.apache.hadoop.io.file.tfile.TFile.Reader;
import org.apache.hadoop.io.file.tfile.TFile.Writer;
import org.apache.hadoop.io.file.tfile.TFile.Reader.Location;
@ -57,7 +58,7 @@ public class TestTFileByteArrays {
private static final String VALUE = "value";
private FileSystem fs;
private Configuration conf;
private Configuration conf = new Configuration();
private Path path;
private FSDataOutputStream out;
private Writer writer;
@ -71,8 +72,9 @@ public class TestTFileByteArrays {
* generated key and value strings. This is slightly different based on
* whether or not the native libs are present.
*/
private int records1stBlock = NativeCodeLoader.isNativeCodeLoaded() ? 5674 : 4480;
private int records2ndBlock = NativeCodeLoader.isNativeCodeLoaded() ? 5574 : 4263;
private boolean usingNative = ZlibFactory.isNativeZlibLoaded(conf);
private int records1stBlock = usingNative ? 5674 : 4480;
private int records2ndBlock = usingNative ? 5574 : 4263;
public void init(String compression, String comparator, String outputFile,
int numRecords1stBlock, int numRecords2ndBlock) {
@ -89,7 +91,6 @@ public class TestTFileByteArrays {
@Before
public void setUp() throws IOException {
conf = new Configuration();
path = new Path(ROOT, outputFile);
fs = path.getFileSystem(conf);
out = fs.create(path);