Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7328F18320 for ; Fri, 4 Dec 2015 23:53:14 +0000 (UTC) Received: (qmail 91159 invoked by uid 500); 4 Dec 2015 23:53:14 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 91113 invoked by uid 500); 4 Dec 2015 23:53:14 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 91102 invoked by uid 99); 4 Dec 2015 23:53:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2015 23:53:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2EA4CE083A; Fri, 4 Dec 2015 23:53:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jdere@apache.org To: commits@hive.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-12563: NullPointerException with 3-way Tez merge join (Jason Dere, reviewed by Gunther Hagleitner) Date: Fri, 4 Dec 2015 23:53:14 +0000 (UTC) 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 Authored: Fri Dec 4 15:52:56 2015 -0800 Committer: Jason Dere 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 '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 ####