You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2014/08/19 02:21:01 UTC
svn commit: r1618769 - in
/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql:
optimizer/GenMapRedUtils.java plan/ConditionalResolverMergeFiles.java
Author: brock
Date: Tue Aug 19 00:21:01 2014
New Revision: 1618769
URL: http://svn.apache.org/r1618769
Log:
HIVE-7530 - Go thru the common code to find references to HIVE_EXECUCTION_ENGINE to make sure conditions works with Spark (Na Yang via Brock) [Spark Branch]
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=1618769&r1=1618768&r2=1618769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java Tue Aug 19 00:21:01 2014
@@ -1287,6 +1287,10 @@ public final class GenMapRedUtils {
work = new TezWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID));
cplan.setName("Merge");
((TezWork)work).add(cplan);
+ } else if (conf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) {
+ work = new SparkWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID));
+ cplan.setName("Merge");
+ ((SparkWork)work).add(cplan);
} else {
work = new MapredWork();
((MapredWork)work).setMapWork(cplan);
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java?rev=1618769&r1=1618768&r2=1618769&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java Tue Aug 19 00:21:01 2014
@@ -149,6 +149,8 @@ public class ConditionalResolverMergeFil
work = ((MapredWork) mrTask.getWork()).getMapWork();
} else if (mrTask.getWork() instanceof TezWork){
work = (MapWork) ((TezWork) mrTask.getWork()).getAllWork().get(0);
+ } else if (mrTask.getWork() instanceof SparkWork){
+ work = (MapWork) ((SparkWork) mrTask.getWork()).getAllWork().get(0);
} else {
work = (MapWork) mrTask.getWork();
}