hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jd...@apache.org
Subject hive git commit: HIVE-12563: NullPointerException with 3-way Tez merge join (Jason Dere, reviewed by Gunther Hagleitner)
Date Fri, 04 Dec 2015 23:53:14 GMT
Repository: hive
Updated Branches:
  refs/heads/branch-1 fd378c3e7 -> eb26d988c


HIVE-12563: NullPointerException with 3-way Tez merge join (Jason Dere, reviewed by Gunther
Hagleitner)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/eb26d988
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/eb26d988
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/eb26d988

Branch: refs/heads/branch-1
Commit: eb26d988c89172e673166c85189497962ca81bde
Parents: fd378c3
Author: Jason Dere <jdere@hortonworks.com>
Authored: Fri Dec 4 15:52:56 2015 -0800
Committer: Jason Dere <jdere@hortonworks.com>
Committed: Fri Dec 4 15:52:56 2015 -0800

----------------------------------------------------------------------
 .../test/resources/testconfiguration.properties |  1 +
 .../hive/ql/exec/CommonMergeJoinOperator.java   |  2 +-
 .../queries/clientpositive/mergejoin_3way.q     | 15 ++++++++++
 .../clientpositive/tez/mergejoin_3way.q.out     | 30 ++++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/eb26d988/itests/src/test/resources/testconfiguration.properties
----------------------------------------------------------------------
diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties
index ddff514..c3ac4e4 100644
--- a/itests/src/test/resources/testconfiguration.properties
+++ b/itests/src/test/resources/testconfiguration.properties
@@ -338,6 +338,7 @@ minitez.query.files=bucket_map_join_tez1.q,\
   hybridgrace_hashjoin_2.q,\
   mapjoin_decimal.q,\
   lvj_mapjoin.q, \
+  mergejoin_3way.q,\
   mrr.q,\
   orc_ppd_basic.q,\
   orc_merge_diff_fs.q,\

http://git-wip-us.apache.org/repos/asf/hive/blob/eb26d988/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 296a92d..0a77d31 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
@@ -463,7 +463,7 @@ public class CommonMergeJoinOperator extends AbstractMapJoinOperator<CommonMerge
     while (dataInCache) {
       for (byte pos = 0; pos < order.length; pos++) {
         if (this.foundNextKeyGroup[pos] && this.nextKeyWritables[pos] != null) {
-          promoteNextGroupToCandidate(pos);
+          fetchNextGroup(pos);
         }
       }
       joinOneGroup();

http://git-wip-us.apache.org/repos/asf/hive/blob/eb26d988/ql/src/test/queries/clientpositive/mergejoin_3way.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/mergejoin_3way.q b/ql/src/test/queries/clientpositive/mergejoin_3way.q
new file mode 100644
index 0000000..4c50f1d
--- /dev/null
+++ b/ql/src/test/queries/clientpositive/mergejoin_3way.q
@@ -0,0 +1,15 @@
+set hive.auto.convert.join=false;
+set hive.cbo.enable=false;
+
+select
+  a.key, b.value, c.value
+from
+  src a,
+  src1 b,
+  src1 c
+where
+  a.key = b.key and a.key = c.key
+  and b.key != '' and b.value != ''
+  and a.value > 'wal_6789'
+  and c.value > 'wal_6789'
+;

http://git-wip-us.apache.org/repos/asf/hive/blob/eb26d988/ql/src/test/results/clientpositive/tez/mergejoin_3way.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/mergejoin_3way.q.out b/ql/src/test/results/clientpositive/tez/mergejoin_3way.q.out
new file mode 100644
index 0000000..e644051
--- /dev/null
+++ b/ql/src/test/results/clientpositive/tez/mergejoin_3way.q.out
@@ -0,0 +1,30 @@
+PREHOOK: query: select
+  a.key, b.value, c.value
+from
+  src a,
+  src1 b,
+  src1 c
+where
+  a.key = b.key and a.key = c.key
+  and b.key != '' and b.value != ''
+  and a.value > 'wal_6789'
+  and c.value > 'wal_6789'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Input: default@src1
+#### A masked pattern was here ####
+POSTHOOK: query: select
+  a.key, b.value, c.value
+from
+  src a,
+  src1 b,
+  src1 c
+where
+  a.key = b.key and a.key = c.key
+  and b.key != '' and b.value != ''
+  and a.value > 'wal_6789'
+  and c.value > 'wal_6789'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Input: default@src1
+#### A masked pattern was here ####


Mime
View raw message