You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2014/11/21 07:12:15 UTC
svn commit: r1640858 - in
/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql:
optimizer/physical/SparkMapJoinResolver.java plan/MapredLocalWork.java
Author: szehon
Date: Fri Nov 21 06:12:14 2014
New Revision: 1640858
URL: http://svn.apache.org/r1640858
Log:
HIVE-8921 : Investigate test failure on auto_join2.q [Spark Branch] (Chao Sun via Szehon)
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/MapredLocalWork.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=1640858&r1=1640857&r2=1640858&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 Fri Nov 21 06:12:14 2014
@@ -160,16 +160,10 @@ public class SparkMapJoinResolver implem
for (BaseWork parentWork : originalWork.getParents(work)) {
if (containsOp(parentWork,SparkHashTableSinkOperator.class)) {
parentWork.getMapRedLocalWork().setTmpHDFSPath(tmpPath);
- parentWork.getMapRedLocalWork().setDummyParentOp(
- new ArrayList<Operator<? extends OperatorDesc>>());
}
}
- bigTableLocalWork.setAliasToWork(
- new LinkedHashMap<String, Operator<? extends OperatorDesc>>());
- bigTableLocalWork.setAliasToFetchWork(new LinkedHashMap<String, FetchWork>());
bigTableLocalWork.setTmpPath(tmpPath);
-
// TODO: set inputFileChangeSensitive and BucketMapjoinContext,
// TODO: enable non-staged mapjoin
}
Modified: hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java
URL: http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java?rev=1640858&r1=1640857&r2=1640858&view=diff
==============================================================================
--- hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java (original)
+++ hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/plan/MapredLocalWork.java Fri Nov 21 06:12:14 2014
@@ -19,6 +19,7 @@
package org.apache.hadoop.hive.ql.plan;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -54,7 +55,10 @@ public class MapredLocalWork implements
private boolean hasStagedAlias;
public MapredLocalWork() {
-
+ this(new LinkedHashMap<String, Operator<? extends OperatorDesc>>(),
+ new LinkedHashMap<String, FetchWork>());
+ this.dummyParentOp = new ArrayList<Operator<? extends OperatorDesc>>();
+ this.directFetchOp = new LinkedHashMap<MapJoinOperator, List<Operator<? extends OperatorDesc>>>();
}
public MapredLocalWork(
@@ -62,23 +66,20 @@ public class MapredLocalWork implements
final LinkedHashMap<String, FetchWork> aliasToFetchWork) {
this.aliasToWork = aliasToWork;
this.aliasToFetchWork = aliasToFetchWork;
-
}
public MapredLocalWork(MapredLocalWork clone){
this.tmpPath = clone.tmpPath;
this.inputFileChangeSensitive=clone.inputFileChangeSensitive;
-
}
-
public void setDummyParentOp(List<Operator<? extends OperatorDesc>> op){
this.dummyParentOp=op;
}
public List<Operator<? extends OperatorDesc>> getDummyParentOp(){
- return this.dummyParentOp;
+ return dummyParentOp;
}