hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject svn commit: r939391 - in /hadoop/hive/trunk: CHANGES.txt ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
Date Thu, 29 Apr 2010 17:21:40 GMT
Author: namit
Date: Thu Apr 29 17:21:40 2010
New Revision: 939391

URL: http://svn.apache.org/viewvc?rev=939391&view=rev
Log:
HIVE-1330. Fatal error check omitted for reducer-side operators
(Ning Zhang via namit)


Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=939391&r1=939390&r2=939391&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Thu Apr 29 17:21:40 2010
@@ -400,6 +400,9 @@ Trunk -  Unreleased
     HIVE-1326. RowContainer uses hard-coded /tmp path for temporary files
     (Michael Klatt via Ning Zhang)
 
+    HIVE-1330. Fatal error check omitted for reducer-side operators
+    (Ning Zhang via namit)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java?rev=939391&r1=939390&r2=939391&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java Thu Apr 29
17:21:40 2010
@@ -290,6 +290,11 @@ public class ExecDriver extends Task<Map
           return true;
         }
       }
+      if (work.getReducer() != null) {
+        if (work.getReducer().checkFatalErrors(ctrs, errMsg)) {
+          return true;
+        }
+      }
       return false;
     } catch (IOException e) {
       // this exception can be tolerated
@@ -529,10 +534,11 @@ public class ExecDriver extends Task<Map
     }
 
     String hiveScratchDir;
-    if (driverContext.getCtx() != null && driverContext.getCtx().getQueryPath() !=
null)
+    if (driverContext.getCtx() != null && driverContext.getCtx().getQueryPath() !=
null) {
       hiveScratchDir = driverContext.getCtx().getQueryPath().toString();
-    else
+    } else {
       hiveScratchDir = HiveConf.getVar(job, HiveConf.ConfVars.SCRATCHDIR);
+    }
 
     String jobScratchDirStr = hiveScratchDir + File.separator
         + Utilities.randGen.nextInt();



Mime
View raw message