You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2012/01/12 22:59:36 UTC
svn commit: r1230808 - in /pig/trunk: CHANGES.txt ivy.xml
ivy/libraries.properties test/org/apache/pig/test/TestEmptyInputDir.java
test/org/apache/pig/test/Util.java
Author: daijy
Date: Thu Jan 12 21:59:35 2012
New Revision: 1230808
URL: http://svn.apache.org/viewvc?rev=1230808&view=rev
Log:
PIG-2431: Upgrade bundled hadoop version to 1.0.0
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy.xml
pig/trunk/ivy/libraries.properties
pig/trunk/test/org/apache/pig/test/TestEmptyInputDir.java
pig/trunk/test/org/apache/pig/test/Util.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1230808&r1=1230807&r2=1230808&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Jan 12 21:59:35 2012
@@ -369,6 +369,8 @@ Release 0.9.2 - Unreleased
IMPROVEMENTS
+PIG-2431: Upgrade bundled hadoop version to 1.0.0 (daijy)
+
PIG-2447: piggybank: get hive dependency from maven (thw via azaroth)
PIG-2347: Fix Pig Unit tests for hadoop 23 (daijy)
Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1230808&r1=1230807&r2=1230808&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Thu Jan 12 21:59:35 2012
@@ -92,6 +92,8 @@
conf="hadoop23->master"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}"
conf="compile->master"/>
+ <dependency org="com.sun.jersey" name="jersey-core" rev="${jersey-core.version}"
+ conf="hadoop20->default"/>
<dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"
conf="hadoop20->default"/>
<dependency org="org.apache.hadoop" name="hadoop-test" rev="${hadoop-test.version}"
Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1230808&r1=1230807&r2=1230808&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Thu Jan 12 21:59:35 2012
@@ -32,8 +32,9 @@ checkstyle.version=4.2
ivy.version=2.2.0
jasper.version=6.1.14
guava.version=11.0
-hadoop-core.version=0.20.2
-hadoop-test.version=0.20.2
+jersey-core.version=1.8
+hadoop-core.version=1.0.0
+hadoop-test.version=1.0.0
hadoop-common.version=0.23.1-SNAPSHOT
hadoop-hdfs.version=0.23.1-SNAPSHOT
hadoop-mapreduce.version=0.23.1-SNAPSHOT
Modified: pig/trunk/test/org/apache/pig/test/TestEmptyInputDir.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEmptyInputDir.java?rev=1230808&r1=1230807&r2=1230808&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEmptyInputDir.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEmptyInputDir.java Thu Jan 12 21:59:35 2012
@@ -80,7 +80,10 @@ public class TestEmptyInputDir {
assertTrue(stats.isSuccessful());
// the sampler job has zero maps
JobStats js = (JobStats)stats.getJobGraph().getSources().get(0);
- assertEquals(0, js.getNumberMaps());
+
+ // This assert fails on 205 due to MAPREDUCE-3606
+ if (!Util.isHadoop205()&&!Util.isHadoop1_0())
+ assertEquals(0, js.getNumberMaps());
FileSystem fs = cluster.getFileSystem();
FileStatus status = fs.getFileStatus(new Path(OUTPUT_FILE));
@@ -110,7 +113,10 @@ public class TestEmptyInputDir {
assertTrue(stats.isSuccessful());
// the indexer job has zero maps
JobStats js = (JobStats)stats.getJobGraph().getSources().get(0);
- assertEquals(0, js.getNumberMaps());
+
+ // This assert fails on 205 due to MAPREDUCE-3606
+ if (!Util.isHadoop205()&&!Util.isHadoop1_0())
+ assertEquals(0, js.getNumberMaps());
FileSystem fs = cluster.getFileSystem();
FileStatus status = fs.getFileStatus(new Path(OUTPUT_FILE));
@@ -141,7 +147,10 @@ public class TestEmptyInputDir {
assertTrue(stats.isSuccessful());
// the indexer job has zero maps
JobStats js = (JobStats)stats.getJobGraph().getSources().get(0);
- assertEquals(0, js.getNumberMaps());
+
+ // This assert fails on 205 due to MAPREDUCE-3606
+ if (!Util.isHadoop205()&&!Util.isHadoop1_0())
+ assertEquals(0, js.getNumberMaps());
FileSystem fs = cluster.getFileSystem();
FileStatus status = fs.getFileStatus(new Path(OUTPUT_FILE));
Modified: pig/trunk/test/org/apache/pig/test/Util.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/Util.java?rev=1230808&r1=1230807&r2=1230808&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/Util.java (original)
+++ pig/trunk/test/org/apache/pig/test/Util.java Thu Jan 12 21:59:35 2012
@@ -1155,4 +1155,18 @@ public class Util {
return false;
return true;
}
+
+ public static boolean isHadoop205() {
+ String version = org.apache.hadoop.util.VersionInfo.getVersion();
+ if (version.matches("\\b0\\.20\\.205\\..+"))
+ return true;
+ return false;
+ }
+
+ public static boolean isHadoop1_0() {
+ String version = org.apache.hadoop.util.VersionInfo.getVersion();
+ if (version.matches("\\b1\\.0\\..+"))
+ return true;
+ return false;
+ }
}