hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gunt...@apache.org
Subject svn commit: r1550326 - in /hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer: GenMRProcContext.java GenMapRedUtils.java
Date Thu, 12 Dec 2013 00:26:55 GMT
Author: gunther
Date: Thu Dec 12 00:26:55 2013
New Revision: 1550326

URL: http://svn.apache.org/r1550326
Log:
HIVE-6014: Stage ids differ in the tez branch (Vikram Dixit K via Gunther Hagleitner)

Modified:
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
    hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java?rev=1550326&r1=1550325&r2=1550326&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
(original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMRProcContext.java
Thu Dec 12 00:26:55 2013
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.ql.exec.DependencyCollectionTask;
 import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
 import org.apache.hadoop.hive.ql.exec.Operator;
@@ -440,8 +441,10 @@ public class GenMRProcContext implements
    */
   public DependencyCollectionTask getDependencyTaskForMultiInsert() {
     if (dependencyTaskForMultiInsert == null) {
-      dependencyTaskForMultiInsert =
-          (DependencyCollectionTask) TaskFactory.get(new DependencyCollectionWork(), conf);
+      if (conf.getBoolVar(ConfVars.HIVE_MULTI_INSERT_MOVE_TASKS_SHARE_DEPENDENCIES)) {
+        dependencyTaskForMultiInsert =
+            (DependencyCollectionTask) TaskFactory.get(new DependencyCollectionWork(), conf);
+      }
     }
     return dependencyTaskForMultiInsert;
   }

Modified: hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=1550326&r1=1550325&r2=1550326&view=diff
==============================================================================
--- hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
(original)
+++ hive/branches/tez/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
Thu Dec 12 00:26:55 2013
@@ -1332,7 +1332,7 @@ public final class GenMapRedUtils {
       Task<? extends Serializable> parentTask, DependencyCollectionTask dependencyTask)
{
 
     if (mvTask != null) {
-      if (hconf.getBoolVar(ConfVars.HIVE_MULTI_INSERT_MOVE_TASKS_SHARE_DEPENDENCIES)) {
+      if (dependencyTask != null) {
         parentTask.addDependentTask(dependencyTask);
         if (mvTask.getWork().getLoadTableWork() != null) {
           // Moving tables/partitions depend on the dependencyTask



Mime
View raw message