Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F18AB200B5B for ; Fri, 5 Aug 2016 12:31:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F02DD160AAC; Fri, 5 Aug 2016 10:31:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 45A7B160A6D for ; Fri, 5 Aug 2016 12:31:44 +0200 (CEST) Received: (qmail 8558 invoked by uid 500); 5 Aug 2016 10:31:43 -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 8545 invoked by uid 99); 5 Aug 2016 10:31:43 -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, 05 Aug 2016 10:31:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 30306EC22C; Fri, 5 Aug 2016 10:31:43 +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, 05 Aug 2016 10:31:43 -0000 Message-Id: <920d09ee7479473da970abc33f3883d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hive git commit: HIVE-14402: Vectorization: Fix Mapjoin overflow deserialization (Gopal V, reviewed by Matt McCline) archived-at: Fri, 05 Aug 2016 10:31:45 -0000 Repository: hive Updated Branches: refs/heads/master 348b8ec27 -> 7500ab561 HIVE-14402: Vectorization: Fix Mapjoin overflow deserialization (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/19e5f2c8 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/19e5f2c8 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/19e5f2c8 Branch: refs/heads/master Commit: 19e5f2c8aca7a6363d4a74fb79f7f04a9a40f846 Parents: 348b8ec Author: Gopal V Authored: Fri Aug 5 03:26:37 2016 -0700 Committer: Gopal V Committed: Fri Aug 5 03:26:37 2016 -0700 ---------------------------------------------------------------------- .../exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/19e5f2c8/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java index 22eb07e..22b2a17 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java @@ -292,7 +292,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC } ByteSegmentRef byteSegmentRef = hashMapResult.first(); - while (true) { + while (byteSegmentRef != null) { // Fill up as much of the overflow batch as possible with small table values. while (byteSegmentRef != null) { @@ -304,7 +304,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC int length = byteSegmentRef.getLength(); smallTableVectorDeserializeRow.setBytes(bytes, offset, length); - smallTableVectorDeserializeRow.deserialize(overflowBatch, overflowBatch.DEFAULT_SIZE); + smallTableVectorDeserializeRow.deserialize(overflowBatch, overflowBatch.size); } overflowBatch.size++;