Repository: hive Updated Branches: refs/heads/llap ff049caeb -> e8b41216c
HIVE-11011 : LLAP: test auto_sortmerge_join_5 on MiniTez fails with NPE (Sergey Shelukhin, reviewed by Vikram Dixit K) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e8b41216 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e8b41216 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e8b41216 Branch: refs/heads/llap Commit: e8b41216c13c8d3b1cee7c8c1f24a0b32cf3c206 Parents: ff049ca Author: Sergey Shelukhin <ser...@apache.org> Authored: Mon Jul 6 14:17:47 2015 -0700 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Mon Jul 6 14:17:47 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java | 1 - ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java | 4 ++++ .../org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e8b41216/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java index 6c57db3..4e7db07 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/CommonMergeJoinOperator.java @@ -642,7 +642,6 @@ public class CommonMergeJoinOperator extends AbstractMapJoinOperator<CommonMerge } } super.initializeLocalWork(hconf); - return; } public boolean isBigTableWork() { http://git-wip-us.apache.org/repos/asf/hive/blob/e8b41216/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java index 00992d1..ee6af04 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java @@ -658,4 +658,8 @@ public class MapOperator extends Operator<MapWork> implements Serializable, Clon public void setConnectedOperators(int tag, DummyStoreOperator dummyOp) { connectedOperators.put(tag, dummyOp); } + + public Map<Integer, DummyStoreOperator> getConnectedOperators() { + return connectedOperators; + } } http://git-wip-us.apache.org/repos/asf/hive/blob/e8b41216/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java index e205f1e..9ce8b8c 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java @@ -209,6 +209,8 @@ public class MapRecordProcessor extends RecordProcessor { } } + ((TezContext) (MapredContext.get())).setDummyOpsMap(mapOp.getConnectedOperators()); + // initialize map operator mapOp.setConf(mapWork); l4j.info("Main input name is " + mapWork.getName());
