You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2015/07/07 23:46:53 UTC
hive git commit: HIVE-11013 : MiniTez tez_join_hash test on the
branch fails with NPE (initializeOp not called?) (Sergey Shelukhin,
reviewed by Vikram Dixit K)
Repository: hive
Updated Branches:
refs/heads/master afeed2994 -> 63b31c991
HIVE-11013 : MiniTez tez_join_hash test on the branch fails with NPE (initializeOp not called?) (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/63b31c99
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/63b31c99
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/63b31c99
Branch: refs/heads/master
Commit: 63b31c991350eb791a80ca34964d87d6e7de6ea2
Parents: afeed29
Author: Sergey Shelukhin <se...@apache.org>
Authored: Tue Jul 7 14:46:58 2015 -0700
Committer: Sergey Shelukhin <se...@apache.org>
Committed: Tue Jul 7 14:46:58 2015 -0700
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java | 7 +++++++
ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java | 5 +++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/63b31c99/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
index a342738..fa697ef 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/BaseWork.java
@@ -26,6 +26,8 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hive.ql.exec.HashTableDummyOperator;
import org.apache.hadoop.hive.ql.exec.Operator;
import org.apache.hadoop.mapred.JobConf;
@@ -38,6 +40,7 @@ import org.apache.hadoop.hive.ql.plan.Explain.Level;
*/
@SuppressWarnings({"serial"})
public abstract class BaseWork extends AbstractOperatorDesc {
+ static final private Log LOG = LogFactory.getLog(BaseWork.class);
// dummyOps is a reference to all the HashTableDummy operators in the
// plan. These have to be separately initialized when we setup a task.
@@ -86,6 +89,10 @@ public abstract class BaseWork extends AbstractOperatorDesc {
}
public void setDummyOps(List<HashTableDummyOperator> dummyOps) {
+ if (this.dummyOps != null && !this.dummyOps.isEmpty()
+ && (dummyOps == null || dummyOps.isEmpty())) {
+ LOG.info("Removing dummy operators from " + name + " " + this.getClass().getSimpleName());
+ }
this.dummyOps = dummyOps;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/63b31c99/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
index 4893d1c..2cf4534 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/MergeJoinWork.java
@@ -136,6 +136,11 @@ public class MergeJoinWork extends BaseWork {
}
@Override
+ public List<HashTableDummyOperator> getDummyOps() {
+ return getMainWork().getDummyOps();
+ }
+
+ @Override
public void addDummyOp(HashTableDummyOperator dummyOp) {
getMainWork().addDummyOp(dummyOp);
}