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 AB3E010CCA for ; Fri, 28 Aug 2015 08:28:41 +0000 (UTC) Received: (qmail 96170 invoked by uid 500); 28 Aug 2015 08:28:41 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 95989 invoked by uid 500); 28 Aug 2015 08:28:41 -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 95971 invoked by uid 99); 28 Aug 2015 08:28:41 -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, 28 Aug 2015 08:28:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48624DFEF0; Fri, 28 Aug 2015 08:28:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gopalv@apache.org To: commits@hive.apache.org Date: Fri, 28 Aug 2015 08:28:42 -0000 Message-Id: In-Reply-To: <838c5a45fef248b7b8e347c05f0dc7be@git.apache.org> References: <838c5a45fef248b7b8e347c05f0dc7be@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hive git commit: HIVE-11659: Make Vectorization use the fast StringExpr (Gopal V, reviewed by Matt McCline) HIVE-11659: Make Vectorization use the fast StringExpr (Gopal V, reviewed by Matt McCline) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ce258168 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ce258168 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ce258168 Branch: refs/heads/master Commit: ce2581680f1c109ea0a43868e0345a15b06b41c8 Parents: b6d1143 Author: Gopal V Authored: Fri Aug 28 01:24:32 2015 -0700 Committer: Gopal V Committed: Fri Aug 28 01:24:32 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java | 2 +- .../hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java | 2 +- .../vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java | 4 ++-- .../ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java | 4 ++-- .../exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java | 4 ++-- .../ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java index 626cea5..aff3551 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorHashKeyWrapper.java @@ -143,7 +143,7 @@ public class VectorHashKeyWrapper extends KeyWrapper { for (int i = 0; i < byteValues.length; ++i) { // the byte comparison is potentially expensive so is better to branch on null if (!isNull[longValues.length + doubleValues.length + i]) { - if (0 != StringExpr.compare( + if (!StringExpr.equal( byteValues[i], byteStarts[i], byteLengths[i], http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java index a21162b..6383e8a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/CuckooSetBytes.java @@ -82,7 +82,7 @@ public class CuckooSetBytes { } private static boolean entryEqual(byte[][] t, int hash, byte[] b, int start, int len) { - return t[hash] != null && StringExpr.compare(t[hash], 0, t[hash].length, b, start, len) == 0; + return t[hash] != null && StringExpr.equal(t[hash], 0, t[hash].length, b, start, len); } public void insert(byte[] x) { http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java index 87a11c0..9f2d4c3 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java @@ -234,8 +234,8 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB */ if (!haveSaveKey || - StringExpr.compare(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], - vector[batchIndex], start[batchIndex], length[batchIndex]) != 0) { + StringExpr.equal(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], + vector[batchIndex], start[batchIndex], length[batchIndex]) == false) { // New key. http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java index 9f10ff1..5a5d54f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java @@ -229,8 +229,8 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate */ if (!haveSaveKey || - StringExpr.compare(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], - vector[batchIndex], start[batchIndex], length[batchIndex]) != 0) { + StringExpr.equal(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], + vector[batchIndex], start[batchIndex], length[batchIndex]) == false) { // New key. http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java index 9ff1141..e9ce739 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java @@ -230,8 +230,8 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe */ if (!haveSaveKey || - StringExpr.compare(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], - vector[batchIndex], start[batchIndex], length[batchIndex]) != 0) { + StringExpr.equal(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], + vector[batchIndex], start[batchIndex], length[batchIndex]) == false) { // New key. http://git-wip-us.apache.org/repos/asf/hive/blob/ce258168/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java index 49efe1a..dfdd6d7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java @@ -290,8 +290,8 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate */ if (!haveSaveKey || - StringExpr.compare(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], - vector[batchIndex], start[batchIndex], length[batchIndex]) != 0) { + StringExpr.equal(vector[saveKeyBatchIndex], start[saveKeyBatchIndex], length[saveKeyBatchIndex], + vector[batchIndex], start[batchIndex], length[batchIndex]) == false) { // New key. if (haveSaveKey) {