You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by px...@apache.org on 2015/08/11 23:12:05 UTC
[7/7] hive git commit: HIVE-9177: Fix child operator references after
NonBlockingOpDeDupProc (II) (Szehon via Xuefu) merged from trunk, r1646994
HIVE-9177: Fix child operator references after NonBlockingOpDeDupProc (II) (Szehon via Xuefu)
merged from trunk, r1646994
git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1646995 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/84af92e6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/84af92e6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/84af92e6
Branch: refs/heads/branch-1.0
Commit: 84af92e6520783d32abe1f5c6c263179748332ae
Parents: 329a336
Author: Xuefu Zhang <xu...@apache.org>
Authored: Sat Dec 20 14:50:56 2014 +0000
Committer: Pengcheng Xiong <px...@apache.org>
Committed: Tue Aug 11 13:59:06 2015 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/84af92e6/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
index 5e0959a..5291851 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/NonBlockingOpDeDupProc.java
@@ -186,7 +186,9 @@ public class NonBlockingOpDeDupProc implements Transform {
* @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()) {