Author: xuefu
Date: Sat Dec 20 14:50:56 2014
New Revision: 1646995
URL: http://svn.apache.org/r1646995
Log:
HIVE-9177: Fix child operator references after NonBlockingOpDeDupProc (II)
(Szehon via Xuefu)
merged from trunk, r1646994
Modified:
hive/branches/spark/ (props changed)
hive/branches/spark/hbase-handler/pom.xml (props changed)
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
Propchange: hive/branches/spark/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 20 14:50:56 2014
@@ -2,4 +2,4 @@
/hive/branches/cbo:1605012-1627125
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
-/hive/trunk:1608589-1642369,1643125,1644171,1644717,1644764,1644780
+/hive/trunk:1608589-1642369,1643125,1644171,1644717,1644764,1644780,1646994
Propchange: hive/branches/spark/hbase-handler/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 20 14:50:56 2014
@@ -2,4 +2,4 @@
/hive/branches/cbo/hbase-handler/pom.xml:1605012-1627125
/hive/branches/tez/hbase-handler/pom.xml:1494760-1622766
/hive/branches/vectorization/hbase-handler/pom.xml:1466908-1527856
-/hive/trunk/hbase-handler/pom.xml:1494760-1537575,1608589-1633422,1633911,1634262,1634442,1634636,1634946,1636885,1636888,1637521,1641875,1642127,1642148,1643125,1644171,1644717,1644764,1644780
+/hive/trunk/hbase-handler/pom.xml:1494760-1537575,1608589-1633422,1633911,1634262,1634442,1634636,1634946,1636885,1636888,1637521,1641875,1642127,1642148,1643125,1644171,1644717,1644764,1644780,1646994
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
URL:
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java?rev=1646995&r1=1646994&r2=1646995&view=diff
==============================================================================
---
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
(original)
+++
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
Sat Dec 20 14:50:56 2014
@@ -186,7 +186,9 @@ public class NonBlockingOpDeDupProc impl
* @param pSEL parent operator
*/
private void fixContextReferences(SelectOperator cSEL, SelectOperator pSEL) {
- Collection<QBJoinTree> qbJoinTrees = pctx.getJoinContext().values();
+ Collection<QBJoinTree> qbJoinTrees = new ArrayList<QBJoinTree>();
+ qbJoinTrees.addAll(pctx.getJoinContext().values());
+ qbJoinTrees.addAll(pctx.getMapJoinContext().values());
for (QBJoinTree qbJoinTree : qbJoinTrees) {
Map<String, Operator<? extends OperatorDesc>> aliasToOpInfo =
qbJoinTree.getAliasToOpInfo();
for (Map.Entry<String, Operator<? extends OperatorDesc>> entry :
aliasToOpInfo.entrySet()) {
