You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2010/02/06 01:17:34 UTC

svn commit: r907135 - in /hadoop/hive/trunk: CHANGES.txt ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java

Author: zshao
Date: Sat Feb  6 00:17:34 2010
New Revision: 907135

URL: http://svn.apache.org/viewvc?rev=907135&view=rev
Log:
HIVE-1129. Fix assertion in ExecDriver.execute. (John Sichi via zshao)

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=907135&r1=907134&r2=907135&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Sat Feb  6 00:17:34 2010
@@ -142,6 +142,8 @@
     HIVE-1124. Create view should expand the query text consistently.
     (John Sichi via zshao)
 
+    HIVE-1129. Fix assertion in ExecDriver.execute. (John Sichi via zshao)
+
 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=907135&r1=907134&r2=907135&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 Sat Feb  6 00:17:34 2010
@@ -566,8 +566,11 @@
     }
 
     // Turn on speculative execution for reducers
-    HiveConf.setVar(job, HiveConf.ConfVars.HADOOPSPECULATIVEEXECREDUCERS,
-        HiveConf.getVar(job, HiveConf.ConfVars.HIVESPECULATIVEEXECREDUCERS));
+    boolean useSpeculativeExecReducers =
+        HiveConf.getBoolVar(job, HiveConf.ConfVars.HIVESPECULATIVEEXECREDUCERS);
+    job.setBoolean(
+      HiveConf.ConfVars.HADOOPSPECULATIVEEXECREDUCERS.varname,
+      useSpeculativeExecReducers);
 
     String inpFormat = HiveConf.getVar(job, HiveConf.ConfVars.HIVEINPUTFORMAT);
     if ((inpFormat == null) || (!StringUtils.isNotBlank(inpFormat))) {