You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2014/10/24 08:20:30 UTC
svn commit: r1634002 - in
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec: MapOperator.java
vector/VectorMapOperator.java
Author: gunther
Date: Fri Oct 24 06:20:30 2014
New Revision: 1634002
URL: http://svn.apache.org/r1634002
Log:
HIVE-8586: Record counters aren't updated correctly for vectorized queries (Gunther Hagleitner, reviewed by Vikram Dixit K)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java?rev=1634002&r1=1634001&r2=1634002&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java Fri Oct 24 06:20:30 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/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java?rev=1634002&r1=1634001&r2=1634002&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorMapOperator.java Fri Oct 24 06:20:30 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);
}