You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/11/30 19:30:33 UTC
svn commit: r1208656 -
/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
Author: rvs
Date: Wed Nov 30 18:30:32 2011
New Revision: 1208656
URL: http://svn.apache.org/viewvc?rev=1208656&view=rev
Log:
Updating Hive patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch?rev=1208656&r1=1208655&r2=1208656&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hive/patch Wed Nov 30 18:30:32 2011
@@ -1918,6 +1918,19 @@ Index: jdbc/build.xml
<path refid="classpath"/>
</path>
+Index: bin/hive
+===================================================================
+--- bin/hive (revision 1203794)
++++ bin/hive (working copy)
+@@ -179,7 +179,7 @@
+ exit 5
+ fi
+
+-if [ $hadoop_minor_ver -ne 20 -o $hadoop_patch_ver -eq 0 ]; then
++if [ "$hadoop_minor_ver$hadoop_patch_ver" -lt "201" ]; then
+ echo "Hive requires Hadoop 0.20.x (x >= 1)."
+ echo "'hadoop version' returned:"
+ echo `$HADOOP version`
Index: build-common.xml
===================================================================
--- build-common.xml (revision 1203794)
@@ -2098,44 +2111,15 @@ Index: ql/src/java/org/apache/hadoop/hiv
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java (revision 1203794)
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java (working copy)
-@@ -282,17 +282,18 @@
- initOutputPrinted = true;
- }
-
-- RunningJob newRj = jc.getJob(rj.getJobID());
-- if (newRj == null) {
-- // under exceptional load, hadoop may not be able to look up status
-- // of finished jobs (because it has purged them from memory). From
-- // hive's perspective - it's equivalent to the job having failed.
-- // So raise a meaningful exception
+@@ -288,7 +288,7 @@
+ // of finished jobs (because it has purged them from memory). From
+ // hive's perspective - it's equivalent to the job having failed.
+ // So raise a meaningful exception
- throw new IOException("Could not find status of job: + rj.getJobID()");
-- } else {
-- th.setRunningJob(newRj);
-- rj = newRj;
-- }
-+ // TODO: Temporarily commented out until https://issues.apache.org/jira/browse/MAPREDUCE-3479 is fixed
-+// RunningJob newRj = jc.getJob(rj.getJobID());
-+// if (newRj == null) {
-+// // under exceptional load, hadoop may not be able to look up status
-+// // of finished jobs (because it has purged them from memory). From
-+// // hive's perspective - it's equivalent to the job having failed.
-+// // So raise a meaningful exception
-+// throw new IOException("Could not find status of job:" + rj.getJobID());
-+// } else {
-+// th.setRunningJob(newRj);
-+// rj = newRj;
-+// }
-
- // If fatal errors happen we should kill the job immediately rather than
- // let the job retry several times, which eventually lead to failure.
-@@ -657,6 +658,7 @@
-
- public int progress(RunningJob rj, JobClient jc) throws IOException {
- jobId = rj.getJobID();
-+ console.printInfo("Job id is " + jobId);
-
- int returnVal = 0;
-
++ throw new IOException("Could not find status of job:" + rj.getJobID());
+ } else {
+ th.setRunningJob(newRj);
+ rj = newRj;
Index: ql/build.xml
===================================================================
--- ql/build.xml (revision 1203794)