You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2014/11/13 17:56:03 UTC
svn commit: r1639388 - in
/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql:
optimizer/physical/SparkMapJoinResolver.java plan/SparkWork.java
Author: xuefu
Date: Thu Nov 13 16:56:02 2014
New Revision: 1639388
URL: http://svn.apache.org/r1639388
Log:
HIVE-8842: Make RDD caching work for multi-insert after HIVE-8793 when map join is involved [Spark Branch] (Rui via Xuefu)
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SparkMapJoinResolver.java
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/SparkWork.java
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SparkMapJoinResolver.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SparkMapJoinResolver.java?rev=1639388&r1=1639387&r2=1639388&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SparkMapJoinResolver.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/SparkMapJoinResolver.java Thu Nov 13 16:56:02 2014
@@ -110,6 +110,8 @@ public class SparkMapJoinResolver implem
// Create a new SparkWork for all the small tables of this work
SparkWork parentWork =
new SparkWork(physicalContext.conf.getVar(HiveConf.ConfVars.HIVEQUERYID));
+ // copy cloneToWork to ensure RDD cache still works
+ parentWork.setCloneToWork(sparkWork.getCloneToWork());
dependencyGraph.get(targetWork).add(parentWork);
dependencyGraph.put(parentWork, new ArrayList<SparkWork>());
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/SparkWork.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/SparkWork.java?rev=1639388&r1=1639387&r2=1639388&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/SparkWork.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/SparkWork.java Thu Nov 13 16:56:02 2014
@@ -58,7 +58,7 @@ public class SparkWork extends AbstractO
private Map<String, List<String>> requiredCounterPrefix;
- private final Map<BaseWork, BaseWork> cloneToWork;
+ private Map<BaseWork, BaseWork> cloneToWork;
public SparkWork(String name) {
this.name = name + ":" + (++counter);
@@ -331,4 +331,8 @@ public class SparkWork extends AbstractO
public Map<BaseWork, BaseWork> getCloneToWork() {
return cloneToWork;
}
+
+ public void setCloneToWork(Map<BaseWork, BaseWork> cloneToWork) {
+ this.cloneToWork = cloneToWork;
+ }
}