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 8E24110896 for ; Fri, 24 Oct 2014 06:21:16 +0000 (UTC) Received: (qmail 76630 invoked by uid 500); 24 Oct 2014 06:21:16 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 76577 invoked by uid 500); 24 Oct 2014 06:21:16 -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 76566 invoked by uid 99); 24 Oct 2014 06:21:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2014 06:21:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Oct 2014 06:21:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0B59223889BB; Fri, 24 Oct 2014 06:20:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1634003 - in /hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec: MapOperator.java vector/VectorMapOperator.java Date: Fri, 24 Oct 2014 06:20:54 -0000 To: commits@hive.apache.org From: gunther@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141024062055.0B59223889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gunther Date: Fri Oct 24 06:20:54 2014 New Revision: 1634003 URL: http://svn.apache.org/r1634003 Log: HIVE-8586: Record counters aren't updated correctly for vectorized queries (Gunther Hagleitner, reviewed by Vikram Dixit K) Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java?rev=1634003&r1=1634002&r2=1634003&view=diff ============================================================================== --- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java (original) +++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java Fri Oct 24 06:20:54 2014 @@ -499,14 +499,16 @@ public class MapOperator extends Operato throw new HiveException("Hive Runtime Error while processing row " + message, e); } } - rowForwarded(childrenDone); + rowsForwarded(childrenDone, 1); } - protected final void rowForwarded(int childrenDone) { - numRows++; - if (isLogInfoEnabled && numRows == cntr) { - cntr *= 10; - LOG.info(toString() + ": records read - " + numRows); + protected final void rowsForwarded(int childrenDone, int rows) { + numRows += rows; + if (isLogInfoEnabled) { + while (numRows >= cntr) { + cntr *= 10; + LOG.info(toString() + ": records read - " + numRows); + } } if (childrenDone == currentCtxs.length) { setDone(true); Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java?rev=1634003&r1=1634002&r2=1634003&view=diff ============================================================================== --- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java (original) +++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java Fri Oct 24 06:20:54 2014 @@ -46,7 +46,8 @@ public class VectorMapOperator extends M childrenDone++; } } - rowForwarded(childrenDone); + + rowsForwarded(childrenDone, ((VectorizedRowBatch)value).size); } catch (Exception e) { throw new HiveException("Hive Runtime Error while processing row ", e); }