http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
index f436377..5d3dce7 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out
@@ -59,56 +59,56 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: a
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
         Map 4 
             Map Operator Tree:
                 TableScan
                   alias: b
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
         Map 5 
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -119,18 +119,18 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 3 Data size: 330 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 330 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   keys: _col0 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 3 Data size: 330 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 330 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 3 Data size: 330 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 330 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col1 (type: bigint)
         Reducer 3 
             Reduce Operator Tree:
@@ -139,10 +139,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 110 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 330 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 210 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 630 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -155,10 +155,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 210 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 630 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
index 68c82dd..a8dead4 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out
@@ -56,22 +56,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -80,14 +80,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: UDFToDouble(_col0) (type: double), _col1 (type: 
bigint)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 2 Data size: 200 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -100,14 +100,14 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: UDFToDouble(UDFToLong(_col0)) (type: double), 
_col1 (type: bigint)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 2 Data size: 200 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
index 6486e7f..6363ee6 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_25.q.out
@@ -72,22 +72,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -96,10 +96,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -112,10 +112,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
index 34f6610..419f002 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out
@@ -57,18 +57,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 1 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), UDFToLong(_col1) 
(type: bigint)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.TextInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -78,18 +78,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 2 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), UDFToLong(_col1) 
(type: bigint)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.TextInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -99,18 +99,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 3 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), UDFToLong(_col1) 
(type: bigint)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 9 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.TextInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
index c255184..e5c8c8f 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out
@@ -61,22 +61,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -85,10 +85,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -101,10 +101,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
index 16927f3..3d311ea 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out
@@ -64,35 +64,35 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 1 (type: bigint)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -102,14 +102,14 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 2 (type: bigint)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -122,10 +122,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 7 Data size: 700 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_6.q.out
index 1737686..0278617 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_6.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_6.q.out
@@ -65,22 +65,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -89,10 +89,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -100,7 +100,7 @@ STAGE PLANS:
                       name: default.outputtbl1
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -113,10 +113,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -124,7 +124,7 @@ STAGE PLANS:
                       name: default.outputtbl1
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
index 3f3d7c9..3034bd1 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
@@ -69,22 +69,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -93,10 +93,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -104,7 +104,7 @@ STAGE PLANS:
                       name: default.outputtbl1
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -117,10 +117,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -128,7 +128,7 @@ STAGE PLANS:
                       name: default.outputtbl1
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
index 5e14338..4cf8aca 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out
@@ -56,22 +56,22 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
@@ -80,10 +80,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -96,10 +96,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
index 168ce84..9d651ed 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out
@@ -59,35 +59,35 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 1 (type: bigint)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -97,14 +97,14 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 2 (type: bigint)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -117,10 +117,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 7 Data size: 700 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out 
b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
index 3ae77e0..ec0a860 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out
@@ -68,39 +68,39 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 1 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), UDFToLong(_col1) 
(type: bigint)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 6 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -110,18 +110,18 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: inputtbl1
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: key (type: string), 2 (type: int)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 3 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 300 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: string), UDFToLong(_col1) 
(type: bigint)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 6 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 600 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 7 Data size: 700 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 3 Data size: 900 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -134,10 +134,10 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 7 Data size: 700 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 900 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_view.q.out 
b/ql/src/test/results/clientpositive/spark/union_view.q.out
index 47f6be3..1b73ddb 100644
--- a/ql/src/test/results/clientpositive/spark/union_view.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_view.q.out
@@ -513,11 +513,11 @@ STAGE PLANS:
                 TableScan
                   alias: src_union_1
                   filterExpr: (ds = '1') (type: boolean)
-                  Statistics: Num rows: 500 Data size: 53120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    Statistics: Num rows: 500 Data size: 53120 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      Statistics: Num rows: 502 Data size: 53120 Basic stats: 
PARTIAL Column stats: NONE
+                      Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -539,7 +539,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 502 Data size: 53120 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -561,7 +561,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 502 Data size: 53120 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -615,7 +615,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 1002 Data size: 10624 Basic 
stats: PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -630,11 +630,11 @@ STAGE PLANS:
                 TableScan
                   alias: src_union_2
                   filterExpr: (ds = '2') (type: boolean)
-                  Statistics: Num rows: 1000 Data size: 106240 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    Statistics: Num rows: 1000 Data size: 106240 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                      Statistics: Num rows: 1002 Data size: 10624 Basic stats: 
PARTIAL Column stats: NONE
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -656,7 +656,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 1002 Data size: 10624 Basic 
stats: PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -710,7 +710,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 1002 Data size: 10624 Basic 
stats: PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -732,7 +732,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 1002 Data size: 10624 Basic 
stats: PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -747,11 +747,11 @@ STAGE PLANS:
                 TableScan
                   alias: src_union_3
                   filterExpr: (ds = '3') (type: boolean)
-                  Statistics: Num rows: 1000 Data size: 106240 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    Statistics: Num rows: 1000 Data size: 106240 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      Statistics: Num rows: 1002 Data size: 106240 Basic 
stats: PARTIAL Column stats: NONE
+                      Statistics: Num rows: 1002 Data size: 10624 Basic stats: 
PARTIAL Column stats: NONE
                       Group By Operator
                         aggregations: count()
                         mode: hash
@@ -897,7 +897,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 502 Data size: 53120 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -919,7 +919,7 @@ STAGE PLANS:
                     Select Operator
                       Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
                       Select Operator
-                        Statistics: Num rows: 502 Data size: 53120 Basic 
stats: PARTIAL Column stats: NONE
+                        Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                         Group By Operator
                           aggregations: count()
                           mode: hash
@@ -934,11 +934,11 @@ STAGE PLANS:
                 TableScan
                   alias: src_union_3
                   filterExpr: (ds = '4') (type: boolean)
-                  Statistics: Num rows: 500 Data size: 53120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    Statistics: Num rows: 500 Data size: 53120 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      Statistics: Num rows: 502 Data size: 53120 Basic stats: 
PARTIAL Column stats: NONE
+                      Statistics: Num rows: 502 Data size: 5312 Basic stats: 
PARTIAL Column stats: NONE
                       Group By Operator
                         aggregations: count()
                         mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/spark/vectorization_parquet_projection.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/vectorization_parquet_projection.q.out
 
b/ql/src/test/results/clientpositive/spark/vectorization_parquet_projection.q.out
index dc2771e..7f43294 100644
--- 
a/ql/src/test/results/clientpositive/spark/vectorization_parquet_projection.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/vectorization_parquet_projection.q.out
@@ -499,9 +499,9 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: parquet_nullsplit
-                  Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    Statistics: Num rows: 1 Data size: 20 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
                       aggregations: count()
                       mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats10.q.out 
b/ql/src/test/results/clientpositive/stats10.q.out
index 303273b..75261cb 100644
--- a/ql/src/test/results/clientpositive/stats10.q.out
+++ b/ql/src/test/results/clientpositive/stats10.q.out
@@ -422,7 +422,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: bucket3_1
-            Statistics: Num rows: 1000 Data size: 106240 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats12.q.out 
b/ql/src/test/results/clientpositive/stats12.q.out
index 86ef6b0..cf6bc03 100644
--- a/ql/src/test/results/clientpositive/stats12.q.out
+++ b/ql/src/test/results/clientpositive/stats12.q.out
@@ -49,7 +49,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1 Data size: 232480 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 392 Data size: 232480 Basic stats: COMPLETE 
Column stats: NONE
             Statistics Aggregation Key Prefix: default.analyze_srcpart/
             GatherStats: true
       Path -> Alias:

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats13.q.out 
b/ql/src/test/results/clientpositive/stats13.q.out
index 8c76fcb..6dcb779 100644
--- a/ql/src/test/results/clientpositive/stats13.q.out
+++ b/ql/src/test/results/clientpositive/stats13.q.out
@@ -49,7 +49,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1 Data size: 232480 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 392 Data size: 232480 Basic stats: COMPLETE 
Column stats: NONE
             Statistics Aggregation Key Prefix: default.analyze_srcpart/
             GatherStats: true
       Path -> Alias:

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats2.q.out 
b/ql/src/test/results/clientpositive/stats2.q.out
index 8e971d7..6ad72bf 100644
--- a/ql/src/test/results/clientpositive/stats2.q.out
+++ b/ql/src/test/results/clientpositive/stats2.q.out
@@ -129,7 +129,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_t1
-            Statistics: Num rows: 1 Data size: 232480 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 392 Data size: 232480 Basic stats: COMPLETE 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats7.q.out 
b/ql/src/test/results/clientpositive/stats7.q.out
index 0518e7d..626e5f0 100644
--- a/ql/src/test/results/clientpositive/stats7.q.out
+++ b/ql/src/test/results/clientpositive/stats7.q.out
@@ -47,7 +47,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1 Data size: 232480 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 392 Data size: 232480 Basic stats: COMPLETE 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats8.q.out 
b/ql/src/test/results/clientpositive/stats8.q.out
index ad2aef4..da92f96 100644
--- a/ql/src/test/results/clientpositive/stats8.q.out
+++ b/ql/src/test/results/clientpositive/stats8.q.out
@@ -47,7 +47,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1 Data size: 232480 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 392 Data size: 232480 Basic stats: COMPLETE 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work
@@ -156,7 +156,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 500 Data size: 53120 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: PARTIAL 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work
@@ -226,7 +226,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1000 Data size: 106240 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 1000 Data size: 10624 Basic stats: PARTIAL 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work
@@ -296,7 +296,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 1500 Data size: 159360 Basic stats: PARTIAL 
Column stats: NONE
+            Statistics: Num rows: 1500 Data size: 15936 Basic stats: PARTIAL 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work
@@ -366,7 +366,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcpart
-            Statistics: Num rows: 2000 Data size: 212480 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
 
   Stage: Stage-1
     Stats Work

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats9.q.out 
b/ql/src/test/results/clientpositive/stats9.q.out
index d7e16ee..1f56ce8 100644
--- a/ql/src/test/results/clientpositive/stats9.q.out
+++ b/ql/src/test/results/clientpositive/stats9.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: analyze_srcbucket
-            Statistics: Num rows: 1 Data size: 116030 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Statistics: Num rows: 391 Data size: 116030 Basic stats: COMPLETE 
Column stats: COMPLETE
 
   Stage: Stage-1
     Stats Work

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats_noscan_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_noscan_2.q.out 
b/ql/src/test/results/clientpositive/stats_noscan_2.q.out
index e071792..ef397c3 100644
--- a/ql/src/test/results/clientpositive/stats_noscan_2.q.out
+++ b/ql/src/test/results/clientpositive/stats_noscan_2.q.out
@@ -303,9 +303,9 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: anaylyze_external
-            Statistics: Num rows: 500 Data size: 53120 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              Statistics: Num rows: 500 Data size: 53120 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/stats_ppr_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/stats_ppr_all.q.out 
b/ql/src/test/results/clientpositive/stats_ppr_all.q.out
index 2287c4d..f19e3f5 100644
--- a/ql/src/test/results/clientpositive/stats_ppr_all.q.out
+++ b/ql/src/test/results/clientpositive/stats_ppr_all.q.out
@@ -274,7 +274,7 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: ss
-          Statistics: Num rows: 2 Data size: 256 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 2 Data size: 40 Basic stats: COMPLETE Column 
stats: COMPLETE
           Filter Operator
             predicate: (UDFToDouble(((201500 + (month * 10)) + day)) > 
201511.0) (type: boolean)
             Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out 
b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
index 6b0f531..61d27be 100644
--- a/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainanalyze_5.q.out
@@ -413,7 +413,7 @@ Stage-3
                       Output:["_col0"]
                       Filter Operator [FIL_8] (rows=1/8 width=3)
                         predicate:(cint < -1070551679)
-                        TableScan [TS_0] (rows=943092/12288 width=3)
+                        TableScan [TS_0] (rows=7484/12288 width=3)
                           default@acid_dot,acid_dot, ACID 
table,Tbl:COMPLETE,Col:NONE,Output:["cint"]
 
 PREHOOK: query: select count(*) from acid_dot

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/union_remove_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_1.q.out 
b/ql/src/test/results/clientpositive/union_remove_1.q.out
index 6285d0d..c5ef152 100644
--- a/ql/src/test/results/clientpositive/union_remove_1.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_1.q.out
@@ -51,22 +51,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: inputtbl1
-            Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: key
-              Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -74,10 +74,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -99,22 +99,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: inputtbl1
-            Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: key
-              Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -122,10 +122,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d0fa7d55/ql/src/test/results/clientpositive/union_remove_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_remove_10.q.out 
b/ql/src/test/results/clientpositive/union_remove_10.q.out
index 8b3f4c4..f1f2dd6 100644
--- a/ql/src/test/results/clientpositive/union_remove_10.q.out
+++ b/ql/src/test/results/clientpositive/union_remove_10.q.out
@@ -65,14 +65,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: inputtbl1
-            Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), 1 (type: bigint)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -123,22 +123,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: inputtbl1
-            Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: key
-              Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: key (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -146,10 +146,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                 output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
@@ -161,14 +161,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: inputtbl1
-            Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), 2 (type: bigint)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: 
org.apache.hadoop.hive.ql.io.RCFileInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat

Reply via email to