Author: seanzhong
Date: Wed Aug 6 07:40:24 2014
New Revision: 1616116
URL: http://svn.apache.org/r1616116
Log:
MAPREDUCE-5978. native-task: remove test case for not supported codec
Bzip2Codec and DefaultCodec (Manu Zhang)
Removed:
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/resources/test-bzip2-compress-conf.xml
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/resources/test-default-compress-conf.xml
Modified:
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/compresstest/CompressTest.java
Modified:
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt?rev=1616116&r1=1616115&r2=1616116&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt
(original)
+++
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/CHANGES.MAPREDUCE-2841.txt
Wed Aug 6 07:40:24 2014
@@ -10,4 +10,5 @@ MAPREDUCE-5991. native-task should not r
MAPREDUCE-5995. native-task: Revert changes to Text internals (todd)
MAPREDUCE-6005. native-task: Fix some valgrind errors (Binglin Chang)
MAPREDUCE-5984. native-task: Reuse lz4 sources in hadoop-common (Binglin Chang)
-MAPREDUCE-5976. native-task: should not fail to build if snappy is missing
(Manu Zhang)
\ No newline at end of file
+MAPREDUCE-5976. native-task: should not fail to build if snappy is missing
(Manu Zhang)
+MAPREDUCE-5978. native-task: remove test case for not supported codec
Bzip2Codec and DefaultCodec (Manu Zhang)
\ No newline at end of file
Modified:
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/compresstest/CompressTest.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/compresstest/CompressTest.java?rev=1616116&r1=1616115&r2=1616116&view=diff
==============================================================================
---
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/compresstest/CompressTest.java
(original)
+++
hadoop/common/branches/MR-2841/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/java/org/apache/hadoop/mapred/nativetask/compresstest/CompressTest.java
Wed Aug 6 07:40:24 2014
@@ -68,23 +68,6 @@ public class CompressTest {
}
@Test
- public void testBzip2Compress() throws Exception {
- final Configuration nativeconf =
ScenarioConfiguration.getNativeConfiguration();
- nativeconf.addResource(TestConstants.BZIP2_COMPRESS_CONF_PATH);
- final Job nativejob = CompressMapper.getCompressJob("nativebzip2",
nativeconf);
- nativejob.waitForCompletion(true);
-
- final Configuration hadoopconf =
ScenarioConfiguration.getNormalConfiguration();
- hadoopconf.addResource(TestConstants.BZIP2_COMPRESS_CONF_PATH);
- final Job hadoopjob = CompressMapper.getCompressJob("hadoopbzip2",
hadoopconf);
- hadoopjob.waitForCompletion(true);
-
- final boolean compareRet =
ResultVerifier.verify(CompressMapper.outputFileDir + "nativebzip2",
- CompressMapper.outputFileDir + "hadoopbzip2");
- assertEquals("file compare result: if they are the same ,then return
true", true, compareRet);
- }
-
- @Test
public void testLz4Compress() throws Exception {
final Configuration nativeConf =
ScenarioConfiguration.getNativeConfiguration();
nativeConf.addResource(TestConstants.LZ4_COMPRESS_CONF_PATH);
@@ -100,22 +83,6 @@ public class CompressTest {
assertEquals("file compare result: if they are the same ,then return
true", true, compareRet);
}
- @Test
- public void testDefaultCompress() throws Exception {
- final Configuration nativeConf =
ScenarioConfiguration.getNativeConfiguration();
- nativeConf.addResource(TestConstants.DEFAULT_COMPRESS_CONF_PATH);
- final Job nativeJob = CompressMapper.getCompressJob("nativedefault",
nativeConf);
- nativeJob.waitForCompletion(true);
-
- final Configuration hadoopConf =
ScenarioConfiguration.getNormalConfiguration();
- hadoopConf.addResource(TestConstants.DEFAULT_COMPRESS_CONF_PATH);
- final Job hadoopJob = CompressMapper.getCompressJob("hadoopdefault",
hadoopConf);
- hadoopJob.waitForCompletion(true);
- final boolean compareRet =
ResultVerifier.verify(CompressMapper.outputFileDir + "nativedefault",
- CompressMapper.outputFileDir + "hadoopdefault");
- assertEquals("file compare result: if they are the same ,then return
true", true, compareRet);
- }
-
@Before
public void startUp() throws Exception {
final ScenarioConfiguration conf = new ScenarioConfiguration();
