http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out 
b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
index 85d0777..9488ace 100644
--- a/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
+++ b/ql/src/test/results/clientpositive/distinct_windowing_no_cbo.q.out
@@ -61,18 +61,18 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: over10k
-            Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Reduce Output Operator
               key expressions: si (type: smallint), i (type: int)
               sort order: ++
               Map-reduce partition columns: si (type: smallint)
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: t (type: tinyint)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: tinyint), KEY.reducesinkkey0 (type: 
smallint), KEY.reducesinkkey1 (type: int)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 84795 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -92,16 +92,16 @@ STAGE PLANS:
                         name: first_value
                         window function: GenericUDAFFirstValueEvaluator
                         window frame: RANGE PRECEDING(MAX)~CURRENT
-            Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: first_value_window_0 (type: tinyint)
               outputColumnNames: first_value_window_0
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: first_value_window_0 (type: tinyint)
                 mode: hash
                 outputColumnNames: _col0
-                Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -117,20 +117,20 @@ STAGE PLANS:
               key expressions: _col0 (type: tinyint)
               sort order: +
               Map-reduce partition columns: _col0 (type: tinyint)
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: tinyint)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 42397 Data size: 508765 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
-            Statistics: Num rows: 10 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 10 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -179,17 +179,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: over10k
-            Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Reduce Output Operator
               key expressions: si (type: smallint), i (type: int)
               sort order: ++
               Map-reduce partition columns: si (type: smallint)
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: smallint), KEY.reducesinkkey1 
(type: int)
           outputColumnNames: _col1, _col2
-          Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -209,16 +209,16 @@ STAGE PLANS:
                         name: last_value
                         window function: GenericUDAFLastValueEvaluator
                         window frame: RANGE PRECEDING(MAX)~CURRENT
-            Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: last_value_window_0 (type: int)
               outputColumnNames: last_value_window_0
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: last_value_window_0 (type: int)
                 mode: hash
                 outputColumnNames: _col0
-                Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -234,20 +234,20 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int)
           mode: mergepartial
           outputColumnNames: _col0
-          Statistics: Num rows: 63596 Data size: 508768 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
-            Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -300,18 +300,18 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: over10k
-            Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Reduce Output Operator
               key expressions: si (type: smallint), i (type: int)
               sort order: ++
               Map-reduce partition columns: si (type: smallint)
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: t (type: tinyint)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: tinyint), KEY.reducesinkkey0 (type: 
smallint), KEY.reducesinkkey1 (type: int)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 84795 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -337,16 +337,16 @@ STAGE PLANS:
                         name: first_value
                         window function: GenericUDAFFirstValueEvaluator
                         window frame: RANGE PRECEDING(MAX)~CURRENT
-            Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: last_value_window_0 (type: int), 
first_value_window_1 (type: tinyint)
               outputColumnNames: last_value_window_0, first_value_window_1
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: last_value_window_0 (type: int), first_value_window_1 
(type: tinyint)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -362,20 +362,20 @@ STAGE PLANS:
               key expressions: _col0 (type: int), _col1 (type: tinyint)
               sort order: ++
               Map-reduce partition columns: _col0 (type: int), _col1 (type: 
tinyint)
-              Statistics: Num rows: 84795 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: tinyint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 42397 Data size: 508765 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 50
-            Statistics: Num rows: 50 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 50 Data size: 600 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -474,22 +474,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: over10k
-            Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: si (type: smallint), f (type: float)
               outputColumnNames: si, f
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: max(f)
                 keys: si (type: smallint)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: smallint)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: smallint)
-                  Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: float)
       Reduce Operator Tree:
         Group By Operator
@@ -497,10 +497,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: smallint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 63596 Data size: 508768 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
             predicate: (_col1 > 0.0) (type: boolean)
-            Statistics: Num rows: 21198 Data size: 169584 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -516,12 +516,12 @@ STAGE PLANS:
               key expressions: _col0 (type: smallint), _col1 (type: float)
               sort order: ++
               Map-reduce partition columns: _col0 (type: smallint)
-              Statistics: Num rows: 21198 Data size: 169584 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: smallint), KEY.reducesinkkey1 
(type: float)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 21198 Data size: 169584 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -542,17 +542,17 @@ STAGE PLANS:
                         window function: GenericUDAFRankEvaluator
                         window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
                         isPivotResult: true
-            Statistics: Num rows: 21198 Data size: 169584 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: smallint), _col1 (type: float), 
rank_window_0 (type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 21198 Data size: 169584 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Limit
                 Number of rows: 50
-                Statistics: Num rows: 50 Data size: 400 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 50 Data size: 400 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -651,17 +651,17 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: over10k
-            Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Reduce Output Operator
               key expressions: si (type: smallint), i (type: int)
               sort order: ++
               Map-reduce partition columns: si (type: smallint)
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: smallint), KEY.reducesinkkey1 
(type: int)
           outputColumnNames: _col1, _col2
-          Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Function definitions:
                 Input definition
@@ -682,16 +682,16 @@ STAGE PLANS:
                         window function: GenericUDAFRankEvaluator
                         window frame: ROWS PRECEDING(MAX)~FOLLOWING(MAX)
                         isPivotResult: true
-            Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: rank_window_0 (type: int), _col1 (type: smallint)
               outputColumnNames: rank_window_0, _col1
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: _col1 (type: smallint), rank_window_0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -707,20 +707,20 @@ STAGE PLANS:
               key expressions: _col0 (type: smallint), _col1 (type: int)
               sort order: ++
               Map-reduce partition columns: _col0 (type: smallint), _col1 
(type: int)
-              Statistics: Num rows: 127193 Data size: 1017544 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: smallint), KEY._col1 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 63596 Data size: 508768 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 50
-            Statistics: Num rows: 50 Data size: 400 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 50 Data size: 400 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 1017544 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/drop_table_with_index.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/drop_table_with_index.q.out 
b/ql/src/test/results/clientpositive/drop_table_with_index.q.out
index 87c6978..3175cdb 100644
--- a/ql/src/test/results/clientpositive/drop_table_with_index.q.out
+++ b/ql/src/test/results/clientpositive/drop_table_with_index.q.out
@@ -112,22 +112,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: aa
-            Statistics: Num rows: 120 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: l_shipdate (type: string)
               outputColumnNames: l_shipdate
-              Statistics: Num rows: 120 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(l_shipdate)
                 keys: l_shipdate (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 120 Data size: 12099 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 12099 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: 120 Data size: 12099 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 12099 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -135,10 +135,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 60 Data size: 6049 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 60 Data size: 6049 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 12099 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
index 5d894ab..9fefca1 100644
--- 
a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
+++ 
b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out
@@ -546,22 +546,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 29 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: UDFToDouble(_col0) (type: double)
                   null sort order: a
                   sort order: +
                   Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
-                  Statistics: Num rows: 29 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col0 (type: string), _col1 (type: string)
                   auto parallelism: false

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out 
b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
index 8860513..82b0079 100644
--- a/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
+++ b/ql/src/test/results/clientpositive/filter_cond_pushdown2.q.out
@@ -108,30 +108,30 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: users_table
-            Statistics: Num rows: 21 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: field_3 (type: boolean)
-              Statistics: Num rows: 10 Data size: 1085 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: field_1 (type: int), field_2 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 1085 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
                   keys: _col0 (type: int), _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 1085 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 2280 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: int), _col1 
(type: string)
-                    Statistics: Num rows: 10 Data size: 1085 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 2280 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 5 Data size: 542 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -147,13 +147,13 @@ STAGE PLANS:
               key expressions: _col0 (type: int), _col1 (type: string)
               sort order: ++
               Map-reduce partition columns: _col0 (type: int), _col1 (type: 
string)
-              Statistics: Num rows: 5 Data size: 542 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: _col0 (type: int), _col1 (type: string)
               sort order: ++
               Map-reduce partition columns: _col0 (type: int), _col1 (type: 
string)
-              Statistics: Num rows: 5 Data size: 542 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -162,13 +162,13 @@ STAGE PLANS:
             0 _col0 (type: int), _col1 (type: string)
             1 _col0 (type: int), _col1 (type: string)
           outputColumnNames: _col0, _col3
-          Statistics: Num rows: 5 Data size: 596 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE Column 
stats: NONE
           Group By Operator
             aggregations: count(), sum(if(_col3 is not null, 1, 0))
             keys: _col0 (type: int)
             mode: hash
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 5 Data size: 596 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -184,7 +184,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 5 Data size: 596 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -192,7 +192,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 238 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -207,16 +207,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 2 Data size: 238 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
bigint), VALUE._col1 (type: bigint)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 238 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 2 Data size: 238 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 2508 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -227,30 +227,30 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: users_table
-            Statistics: Num rows: 21 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: field_4 (type: boolean)
-              Statistics: Num rows: 10 Data size: 1085 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: field_1 (type: int), field_2 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 1085 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
                   keys: _col0 (type: int), _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 10 Data size: 1085 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 2280 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int), _col1 (type: string)
                     sort order: ++
                     Map-reduce partition columns: _col0 (type: int), _col1 
(type: string)
-                    Statistics: Num rows: 10 Data size: 1085 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 2280 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 5 Data size: 542 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 2280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out 
b/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
index 707d6de..2969e76 100644
--- a/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
+++ b/ql/src/test/results/clientpositive/gen_udf_example_add10.q.out
@@ -34,27 +34,27 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: add10(x) (type: int), add10(y) (type: double)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: int), _col1 (type: double)
                 sort order: -+
-                Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                 TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), KEY.reducesinkkey1 
(type: double)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
           Limit
             Number of rows: 10
-            Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 2 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/groupby10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby10.q.out 
b/ql/src/test/results/clientpositive/groupby10.q.out
index 66832b0..d48b7db 100644
--- a/ql/src/test/results/clientpositive/groupby10.q.out
+++ b/ql/src/test/results/clientpositive/groupby10.q.out
@@ -56,20 +56,20 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: input
-            Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: int), substr(value, 5) (type: 
string)
                 sort order: ++
                 Map-reduce partition columns: key (type: int)
-                Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
                 table:
@@ -82,7 +82,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: partial1
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -98,7 +98,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -106,14 +106,14 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: final
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -141,14 +141,14 @@ STAGE PLANS:
               key expressions: key (type: int), substr(value, 5) (type: string)
               sort order: ++
               Map-reduce partition columns: key (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(KEY._col1:0._col0), sum(DISTINCT KEY._col1:0._col0)
           keys: KEY._col0 (type: int)
           mode: partial1
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -164,7 +164,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: double), _col2 (type: double)
       Reduce Operator Tree:
         Group By Operator
@@ -172,14 +172,14 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: final
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -301,20 +301,20 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: input
-            Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: int), substr(value, 5) (type: 
string)
                 sort order: ++
                 Map-reduce partition columns: key (type: int)
-                Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
                 table:
@@ -327,7 +327,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: partial1
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -343,7 +343,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -351,14 +351,14 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: final
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -386,14 +386,14 @@ STAGE PLANS:
               key expressions: key (type: int), substr(value, 5) (type: string)
               sort order: ++
               Map-reduce partition columns: key (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           aggregations: sum(KEY._col1:0._col0), sum(DISTINCT KEY._col1:0._col0)
           keys: KEY._col0 (type: int)
           mode: partial1
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -409,7 +409,7 @@ STAGE PLANS:
               key expressions: _col0 (type: int)
               sort order: +
               Map-reduce partition columns: _col0 (type: int)
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: double), _col2 (type: double)
       Reduce Operator Tree:
         Group By Operator
@@ -417,14 +417,14 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: final
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -543,32 +543,32 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: input
-            Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: int), substr(value, 5) (type: 
string)
                 sort order: ++
                 Map-reduce partition columns: key (type: int)
-                Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Forward
-          Statistics: Num rows: 2 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE Column 
stats: NONE
           Group By Operator
             aggregations: sum(DISTINCT KEY._col1:0._col0), count(DISTINCT 
KEY._col1:1._col0)
             keys: KEY._col0 (type: int)
             mode: complete
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -579,14 +579,14 @@ STAGE PLANS:
             keys: KEY._col0 (type: int)
             mode: complete
             outputColumnNames: _col0, _col1, _col2
-            Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), UDFToInteger(_col1) (type: int), 
UDFToInteger(_col2) (type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 1 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 280 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/6a99cf53/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
index 6670d9c..886f234 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_id3.q.out
@@ -38,25 +38,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: key (type: int), value (type: int)
               outputColumnNames: key, value
-              Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 6 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (_col2 = 1) (type: boolean)
-                  Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int), _col1 (type: int), 1 
(type: int)
                     sort order: +++
                     Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), 1 (type: int)
-                    Statistics: Num rows: 3 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 30 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -64,15 +64,15 @@ STAGE PLANS:
           keys: KEY._col0 (type: int), KEY._col1 (type: int), 1 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col3
-          Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
           pruneGroupingSetId: true
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), 1 (type: int), 
_col3 (type: bigint)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -128,22 +128,22 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: key (type: int), value (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count()
                 keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 6 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: int)
                   sort order: +++
                   Map-reduce partition columns: _col0 (type: int), _col1 
(type: int), _col2 (type: int)
-                  Statistics: Num rows: 6 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col3 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -151,17 +151,17 @@ STAGE PLANS:
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 3 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: (_col2 = 1) (type: boolean)
-            Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: int), _col1 (type: int), 1 (type: 
int), _col3 (type: bigint)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

Reply via email to