You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2019/02/23 16:23:59 UTC

[hive] branch master updated: HIVE-21288: Runtime rowcount calculation is incorrect in vectorized executions (Zoltan Haindrich reviewed by Jesus Camacho Rodriguez)

This is an automated email from the ASF dual-hosted git repository.

kgyrtkirk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new dd4946e  HIVE-21288: Runtime rowcount calculation is incorrect in vectorized executions (Zoltan Haindrich reviewed by Jesus Camacho Rodriguez)
dd4946e is described below

commit dd4946e41148f8020cf35f9326ce215550f125bd
Author: Zoltan Haindrich <ki...@rxd.hu>
AuthorDate: Sat Feb 23 17:20:54 2019 +0100

    HIVE-21288: Runtime rowcount calculation is incorrect in vectorized executions (Zoltan Haindrich reviewed by Jesus Camacho Rodriguez)
    
    Signed-off-by: Zoltan Haindrich <ki...@rxd.hu>
---
 .../org/apache/hadoop/hive/ql/exec/Operator.java   |   2 +-
 .../hive/ql/plan/mapping/TestCounterMapping.java   |   2 +-
 .../clientpositive/llap/orc_llap_counters.q.out    | 178 ++++++++++-----------
 .../clientpositive/llap/orc_llap_counters1.q.out   |  12 +-
 .../results/clientpositive/llap/reopt_dpp.q.out    |   2 +-
 .../clientpositive/llap/reopt_semijoin.q.out       |   2 +-
 .../clientpositive/llap/results_cache_2.q.out      |   6 +-
 .../clientpositive/llap/runtime_stats_hs2.q.out    |  12 +-
 .../clientpositive/llap/tez_input_counters.q.out   |  30 ++--
 .../clientpositive/stat_estimate_drill.q.out       |  40 ++---
 .../clientpositive/tez/explainanalyze_3.q.out      |  32 ++--
 11 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
index b197041..1337da2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Operator.java
@@ -901,13 +901,13 @@ public abstract class Operator<T extends OperatorDesc> implements Serializable,C
   protected void vectorForward(VectorizedRowBatch batch)
       throws HiveException {
 
-    runTimeNumRows++;
     if (getDone()) {
       return;
     }
 
     // Data structures to store original values
     final int size = batch.size;
+    runTimeNumRows += size;
     final boolean selectedInUse = batch.selectedInUse;
     final boolean saveState = (selectedInUse && multiChildren);
     if (saveState) {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/plan/mapping/TestCounterMapping.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/mapping/TestCounterMapping.java
index fdc8701..b705fd7 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/mapping/TestCounterMapping.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/plan/mapping/TestCounterMapping.java
@@ -146,7 +146,7 @@ public class TestCounterMapping {
     FilterOperator filter2 = filters2.get(0);
 
     assertEquals("original check", 7, filter1.getStatistics().getNumRows());
-    assertEquals("optimized check", 1, filter2.getStatistics().getNumRows());
+    assertEquals("optimized check", 6, filter2.getStatistics().getNumRows());
 
   }
 
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
index dad4b1c..007ab04 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
@@ -271,8 +271,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_8: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_7: 2100
-   RECORDS_OUT_OPERATOR_SEL_6: 3
-   RECORDS_OUT_OPERATOR_TS_0: 3
+   RECORDS_OUT_OPERATOR_SEL_6: 2100
+   RECORDS_OUT_OPERATOR_TS_0: 2100
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 262144
    ALLOCATED_USED_BYTES: 26
@@ -327,13 +327,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 8
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 8
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 8
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 8
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1048576
    ALLOCATED_USED_BYTES: 2731
@@ -367,13 +367,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 22
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 22
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 22
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 22
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -405,13 +405,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 16
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 16
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 16
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 16
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -443,13 +443,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 18
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 18
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 18
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 18
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -487,7 +487,7 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1
    RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -519,13 +519,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 32
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 32
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 32
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 32
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -557,13 +557,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 32
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 32
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 32
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 32
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -595,13 +595,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 1697
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1697
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1697
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 1697
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -633,13 +633,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 12
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 12
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 12
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 12
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -671,13 +671,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 1713
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 1713
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1713
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 1713
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -709,13 +709,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 6
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 6
+   RECORDS_OUT_OPERATOR_TS_0: 100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -747,13 +747,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 50
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 50
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 50
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 50
+   RECORDS_OUT_OPERATOR_TS_0: 1100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -785,13 +785,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 318
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 318
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 318
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 318
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
@@ -908,7 +908,7 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 0
    RECORDS_OUT_OPERATOR_SEL_9: 0
-   RECORDS_OUT_OPERATOR_TS_0: 3
+   RECORDS_OUT_OPERATOR_TS_0: 2100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 354
    CACHE_MISS_BYTES: 0
@@ -962,13 +962,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1310720
    ALLOCATED_USED_BYTES: 13812
@@ -1002,13 +1002,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 6
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 6
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1040,13 +1040,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 6
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 6
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1100,13 +1100,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2100
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 3
+   RECORDS_OUT_OPERATOR_FIL_8: 2100
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2100
-   RECORDS_OUT_OPERATOR_SEL_9: 3
-   RECORDS_OUT_OPERATOR_TS_0: 3
+   RECORDS_OUT_OPERATOR_SEL_9: 2100
+   RECORDS_OUT_OPERATOR_TS_0: 2100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1173,13 +1173,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1211,13 +1211,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1249,13 +1249,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1287,13 +1287,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 81
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 81
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 81
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 81
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1325,13 +1325,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 74
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 74
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 74
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 74
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1363,13 +1363,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 12
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 12
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 12
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 12
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1401,13 +1401,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 13
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 13
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 13
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 13
+   RECORDS_OUT_OPERATOR_TS_0: 2000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1445,7 +1445,7 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 1
    RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_TS_0: 100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1477,13 +1477,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 7
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 7
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 7
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 7
+   RECORDS_OUT_OPERATOR_TS_0: 1100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1620,13 +1620,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1658,13 +1658,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 6
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 2
+   RECORDS_OUT_OPERATOR_FIL_8: 6
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 6
-   RECORDS_OUT_OPERATOR_SEL_9: 2
-   RECORDS_OUT_OPERATOR_TS_0: 2
+   RECORDS_OUT_OPERATOR_SEL_9: 6
+   RECORDS_OUT_OPERATOR_TS_0: 1100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 5935
    CACHE_MISS_BYTES: 0
@@ -1696,13 +1696,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 6982
    CACHE_MISS_BYTES: 0
@@ -1734,13 +1734,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 1
+   RECORDS_OUT_OPERATOR_FIL_8: 2
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2
-   RECORDS_OUT_OPERATOR_SEL_9: 1
-   RECORDS_OUT_OPERATOR_TS_0: 1
+   RECORDS_OUT_OPERATOR_SEL_9: 2
+   RECORDS_OUT_OPERATOR_TS_0: 100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 6982
    CACHE_MISS_BYTES: 0
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
index cbf615f..28e2718 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
@@ -267,13 +267,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2094
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 3
+   RECORDS_OUT_OPERATOR_FIL_8: 2094
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2094
-   RECORDS_OUT_OPERATOR_SEL_9: 3
-   RECORDS_OUT_OPERATOR_TS_0: 3
+   RECORDS_OUT_OPERATOR_SEL_9: 2094
+   RECORDS_OUT_OPERATOR_TS_0: 2100
 Stage-1 LLAP IO COUNTERS:
    ALLOCATED_BYTES: 1310720
    ALLOCATED_USED_BYTES: 2757
@@ -307,13 +307,13 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_0: 1
    RECORDS_OUT_INTERMEDIATE_Map_1: 2094
    RECORDS_OUT_INTERMEDIATE_Reducer_2: 0
-   RECORDS_OUT_OPERATOR_FIL_8: 3
+   RECORDS_OUT_OPERATOR_FIL_8: 2094
    RECORDS_OUT_OPERATOR_FS_12: 1
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 2094
-   RECORDS_OUT_OPERATOR_SEL_9: 3
-   RECORDS_OUT_OPERATOR_TS_0: 3
+   RECORDS_OUT_OPERATOR_SEL_9: 2094
+   RECORDS_OUT_OPERATOR_TS_0: 2100
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 1071
    CACHE_MISS_BYTES: 0
diff --git a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
index 426d92f..62c93d7 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_dpp.q.out
@@ -264,7 +264,7 @@ Stage-0
                     Output:["_col0"]
                     Filter Operator [FIL_24] (runtime: rows=1 width=8)
                       predicate:((d_year = 2000) and d_date_sk is not null)
-                      TableScan [TS_3] (runtime: rows=1 width=8)
+                      TableScan [TS_3] (runtime: rows=2 width=8)
                         default@x1_date_dim,d,Tbl:COMPLETE,Col:COMPLETE,Output:["d_date_sk","d_year"]
                 Dynamic Partitioning Event Operator [EVENT_29] (runtime: rows=1 width=4)
                   Group By Operator [GBY_28] (runtime: rows=1 width=4)
diff --git a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
index e508e14..2fd0fe7 100644
--- a/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/reopt_semijoin.q.out
@@ -348,7 +348,7 @@ STAGE PLANS:
                 TableScan
                   alias: d
                   filterExpr: ((d_moy = 3) and d_date_sk is not null) (type: boolean)
-                  Statistics: (RUNTIME) Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: (RUNTIME) Num rows: 8 Data size: 64 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: ((d_moy = 3) and d_date_sk is not null) (type: boolean)
                     Statistics: (RUNTIME) Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: COMPLETE
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
index a042a68..f4fd6a1 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_2.q.out
@@ -239,14 +239,14 @@ STAGE PLANS:
                 TableScan
                   alias: src
                   filterExpr: (UDFToDouble(key) < 10.0D) (type: boolean)
-                  Statistics: Num rows: 500/1 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 500/500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
-                    Statistics: Num rows: 166/1 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 166/10 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: sign(value) (type: double)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 166/1 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE
+                      Statistics: Num rows: 166/10 Data size: 29548 Basic stats: COMPLETE Column stats: COMPLETE
                       Group By Operator
                         aggregations: count()
                         keys: _col0 (type: double)
diff --git a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
index 8721dd8..b3a9ba5 100644
--- a/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
+++ b/ql/src/test/results/clientpositive/llap/runtime_stats_hs2.q.out
@@ -135,19 +135,19 @@ Stage-0
                 <-Map 1 [SIMPLE_EDGE] vectorized, llap
                   SHUFFLE [RS_33]
                     PartitionCols:_col0
-                    Select Operator [SEL_32] (runtime: rows=1 width=4)
+                    Select Operator [SEL_32] (runtime: rows=5 width=4)
                       Output:["_col0"]
-                      Filter Operator [FIL_31] (runtime: rows=1 width=4)
+                      Filter Operator [FIL_31] (runtime: rows=5 width=4)
                         predicate:((u < 10) and (u > 2))
-                        TableScan [TS_0] (runtime: rows=1 width=4)
+                        TableScan [TS_0] (runtime: rows=8 width=4)
                           default@tx_n3,tx_n3,Tbl:COMPLETE,Col:COMPLETE,Output:["u"]
                 <-Map 4 [SIMPLE_EDGE] vectorized, llap
                   SHUFFLE [RS_36]
                     PartitionCols:_col0
-                    Select Operator [SEL_35] (runtime: rows=1 width=4)
+                    Select Operator [SEL_35] (runtime: rows=3 width=4)
                       Output:["_col0"]
-                      Filter Operator [FIL_34] (runtime: rows=1 width=4)
+                      Filter Operator [FIL_34] (runtime: rows=3 width=4)
                         predicate:((p < 10) and (p > 2))
-                        TableScan [TS_3] (runtime: rows=1 width=4)
+                        TableScan [TS_3] (runtime: rows=5 width=4)
                           default@px_n0,px_n0,Tbl:COMPLETE,Col:COMPLETE,Output:["p"]
 
diff --git a/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out b/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
index fd65242..f5ddaf9 100644
--- a/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_input_counters.q.out
@@ -1581,8 +1581,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_9: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_8: 1000
-   RECORDS_OUT_OPERATOR_SEL_7: 618
-   RECORDS_OUT_OPERATOR_TS_0: 618
+   RECORDS_OUT_OPERATOR_SEL_7: 1000
+   RECORDS_OUT_OPERATOR_TS_0: 1000
 Stage-1 LLAP IO COUNTERS:
    CACHE_MISS_BYTES: 3812
    NUM_DECODED_BATCHES: 618
@@ -1612,8 +1612,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 8
-   RECORDS_OUT_OPERATOR_SEL_9: 4
-   RECORDS_OUT_OPERATOR_TS_0: 4
+   RECORDS_OUT_OPERATOR_SEL_9: 8
+   RECORDS_OUT_OPERATOR_TS_0: 8
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 18
    NUM_DECODED_BATCHES: 4
@@ -1715,8 +1715,8 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_11: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_10: 240
-   RECORDS_OUT_OPERATOR_SEL_9: 148
-   RECORDS_OUT_OPERATOR_TS_0: 148
+   RECORDS_OUT_OPERATOR_SEL_9: 240
+   RECORDS_OUT_OPERATOR_TS_0: 240
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 922
    NUM_DECODED_BATCHES: 148
@@ -1825,10 +1825,10 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_OPERATOR_GBY_7: 74
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_RS_14: 240
-   RECORDS_OUT_OPERATOR_SEL_11: 148
-   RECORDS_OUT_OPERATOR_SEL_13: 148
+   RECORDS_OUT_OPERATOR_SEL_11: 240
+   RECORDS_OUT_OPERATOR_SEL_13: 240
    RECORDS_OUT_OPERATOR_SEL_8: 74
-   RECORDS_OUT_OPERATOR_TS_0: 148
+   RECORDS_OUT_OPERATOR_TS_0: 240
    TOTAL_TABLE_ROWS_WRITTEN: 240
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 922
@@ -2734,19 +2734,19 @@ Stage-1 HIVE COUNTERS:
    RECORDS_OUT_INTERMEDIATE_Reducer_3: 0
    RECORDS_OUT_OPERATOR_EVENT_30: 1
    RECORDS_OUT_OPERATOR_FS_34: 1
-   RECORDS_OUT_OPERATOR_GBY_29: 1
+   RECORDS_OUT_OPERATOR_GBY_29: 309
    RECORDS_OUT_OPERATOR_GBY_33: 1
    RECORDS_OUT_OPERATOR_MAP_0: 0
    RECORDS_OUT_OPERATOR_MERGEJOIN_25: 952
    RECORDS_OUT_OPERATOR_RS_11: 952
    RECORDS_OUT_OPERATOR_RS_27: 1000
    RECORDS_OUT_OPERATOR_RS_32: 240
-   RECORDS_OUT_OPERATOR_SEL_26: 618
-   RECORDS_OUT_OPERATOR_SEL_28: 618
-   RECORDS_OUT_OPERATOR_SEL_31: 74
+   RECORDS_OUT_OPERATOR_SEL_26: 1000
+   RECORDS_OUT_OPERATOR_SEL_28: 1000
+   RECORDS_OUT_OPERATOR_SEL_31: 240
    RECORDS_OUT_OPERATOR_SEL_9: 952
-   RECORDS_OUT_OPERATOR_TS_0: 618
-   RECORDS_OUT_OPERATOR_TS_3: 74
+   RECORDS_OUT_OPERATOR_TS_0: 1000
+   RECORDS_OUT_OPERATOR_TS_3: 240
 Stage-1 LLAP IO COUNTERS:
    CACHE_HIT_BYTES: 3812
    CACHE_MISS_BYTES: 922
diff --git a/ql/src/test/results/clientpositive/stat_estimate_drill.q.out b/ql/src/test/results/clientpositive/stat_estimate_drill.q.out
index 7c3b5a5..c94ff07 100644
--- a/ql/src/test/results/clientpositive/stat_estimate_drill.q.out
+++ b/ql/src/test/results/clientpositive/stat_estimate_drill.q.out
@@ -89,16 +89,16 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: (b) IN (2, 3) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (b) IN (2, 3) (type: boolean)
-              Statistics: Num rows: 200/1 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 200/200 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE
               Group By Operator
                 aggregations: sum(a)
                 keys: b (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2/1 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 2/2 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
@@ -158,16 +158,16 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: (a) IN (1, 2) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (a) IN (1, 2) (type: boolean)
-              Statistics: Num rows: 200/1 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 200/200 Data size: 1600 Basic stats: COMPLETE Column stats: COMPLETE
               Group By Operator
                 aggregations: sum(a)
                 keys: b (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10/1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 10/10 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
@@ -227,16 +227,16 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: ((a = 1) or ((a = 2) and (b = 3))) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (((a = 2) and (b = 3)) or (a = 1)) (type: boolean)
-              Statistics: Num rows: 110/1 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 110/110 Data size: 880 Basic stats: COMPLETE Column stats: COMPLETE
               Group By Operator
                 aggregations: sum(a)
                 keys: b (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10/1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 10/10 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
@@ -296,20 +296,20 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: (a = 1) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (a = 1) (type: boolean)
-              Statistics: Num rows: 100/1 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 100/100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE
               Select Operator
                 expressions: b (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 100/1 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 100/100 Data size: 800 Basic stats: COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: sum(1)
                   keys: _col0 (type: int)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10/1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 10/10 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
@@ -369,12 +369,12 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: ((a = 1) and (b = 2)) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: ((a = 1) and (b = 2)) (type: boolean)
-              Statistics: Num rows: 10/1 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 10/10 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE
               Select Operator
-                Statistics: Num rows: 10/1 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 10/10 Data size: 80 Basic stats: COMPLETE Column stats: COMPLETE
                 Group By Operator
                   aggregations: sum(1)
                   keys: true (type: boolean)
@@ -440,7 +440,7 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: ((a = 1) and (b = 2) and (c = 3)) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 12000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: ((a = 1) and (b = 2) and (c = 3)) (type: boolean)
               Statistics: Num rows: 1/1 Data size: 12 Basic stats: COMPLETE Column stats: COMPLETE
@@ -511,16 +511,16 @@ STAGE PLANS:
           TableScan
             alias: t3
             filterExpr: (struct(a,b)) IN (const struct(1,2), const struct(2,3), const struct(3,4)) (type: boolean)
-            Statistics: Num rows: 1000/1 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
+            Statistics: Num rows: 1000/1000 Data size: 8000 Basic stats: COMPLETE Column stats: COMPLETE
             Filter Operator
               predicate: (struct(a,b)) IN (const struct(1,2), const struct(2,3), const struct(3,4)) (type: boolean)
-              Statistics: Num rows: 30/1 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
+              Statistics: Num rows: 30/30 Data size: 240 Basic stats: COMPLETE Column stats: COMPLETE
               Group By Operator
                 aggregations: sum(a)
                 keys: b (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10/1 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
+                Statistics: Num rows: 10/3 Data size: 120 Basic stats: COMPLETE Column stats: COMPLETE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
index 70ab178..4d34541 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_3.q.out
@@ -416,12 +416,12 @@ Stage-3
                 <-Map 1 [CUSTOM_SIMPLE_EDGE] vectorized
                   File Output Operator [FS_13]
                     table:{"name:":"default.src_autho_test_n4"}
-                    Select Operator [SEL_12] (rows=500/1 width=178)
+                    Select Operator [SEL_12] (rows=500/500 width=178)
                       Output:["_col0","_col1"]
-                      TableScan [TS_0] (rows=500/1 width=178)
+                      TableScan [TS_0] (rows=500/500 width=178)
                         default@src,src,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
                   PARTITION_ONLY_SHUFFLE [RS_15]
-                    Select Operator [SEL_14] (rows=500/1 width=178)
+                    Select Operator [SEL_14] (rows=500/500 width=178)
                       Output:["col1","col2"]
                        Please refer to the previous Select Operator [SEL_12]
         Stage-2
@@ -697,15 +697,15 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_10]
-        Limit [LIM_9] (rows=5/3 width=178)
+        Limit [LIM_9] (rows=5/5 width=178)
           Number of rows:5
-          Select Operator [SEL_8] (rows=500/3 width=178)
+          Select Operator [SEL_8] (rows=500/5 width=178)
             Output:["_col0","_col1"]
           <-Map 1 [SIMPLE_EDGE] vectorized
             SHUFFLE [RS_7]
-              Select Operator [SEL_6] (rows=500/1 width=178)
+              Select Operator [SEL_6] (rows=500/500 width=178)
                 Output:["_col0","_col1"]
-                TableScan [TS_0] (rows=500/1 width=178)
+                TableScan [TS_0] (rows=500/500 width=178)
                   default@src,src,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
 
 PREHOOK: query: create table orc_merge5_n1 (userid bigint, string1 string, subtype double, decimal1 decimal(38,0), ts timestamp) stored as orc
@@ -768,7 +768,7 @@ Stage-3
                               Output:["_col0","_col1","_col2","_col3","_col4"]
                               Filter Operator [FIL_12] (rows=1/3 width=352)
                                 predicate:(userid <= 13L)
-                                TableScan [TS_0] (rows=1/15 width=352)
+                                TableScan [TS_0] (rows=1/15000 width=352)
                                   default@orc_merge5_n1,orc_merge5_n1,Tbl:COMPLETE,Col:NONE,Output:["userid","string1","subtype","decimal1","ts"]
                           PARTITION_ONLY_SHUFFLE [RS_16]
                             Select Operator [SEL_15] (rows=1/3 width=352)
@@ -946,23 +946,23 @@ Stage-0
     Stage-1
       Map 2 vectorized
       File Output Operator [FS_34]
-        Select Operator [SEL_33] (rows=399/50 width=186)
+        Select Operator [SEL_33] (rows=399/480 width=186)
           Output:["_col0","_col1","_col2"]
-          Map Join Operator [MAPJOIN_32] (rows=399/50 width=186)
+          Map Join Operator [MAPJOIN_32] (rows=399/480 width=186)
             BucketMapJoin:true,Conds:RS_29._col0=SEL_31._col0(Inner),HybridGraceHashJoin:true,Output:["_col0","_col1","_col3"]
           <-Map 1 [CUSTOM_EDGE] vectorized
             MULTICAST [RS_29]
               PartitionCols:_col0
-              Select Operator [SEL_28] (rows=242/4 width=95)
+              Select Operator [SEL_28] (rows=242/242 width=95)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_27] (rows=242/4 width=95)
+                Filter Operator [FIL_27] (rows=242/242 width=95)
                   predicate:key is not null
-                  TableScan [TS_0] (rows=242/4 width=95)
+                  TableScan [TS_0] (rows=242/242 width=95)
                     default@tab_n2,a,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]
-          <-Select Operator [SEL_31] (rows=500/4 width=95)
+          <-Select Operator [SEL_31] (rows=500/500 width=95)
               Output:["_col0","_col1"]
-              Filter Operator [FIL_30] (rows=500/4 width=95)
+              Filter Operator [FIL_30] (rows=500/500 width=95)
                 predicate:key is not null
-                TableScan [TS_3] (rows=500/4 width=95)
+                TableScan [TS_3] (rows=500/500 width=95)
                   default@tab_part_n3,b,Tbl:COMPLETE,Col:COMPLETE,Output:["key","value"]