http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out 
b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
index aa0db5e..1f73465 100644
--- a/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
+++ b/ql/src/test/results/clientpositive/groupby_grouping_sets_grouping.q.out
@@ -34,34 +34,34 @@ 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
                 keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 90 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: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 40 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), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
-            Statistics: Num rows: 4 Data size: 40 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: 4 Data size: 40 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
@@ -116,34 +116,34 @@ 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
                 keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
-            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
             File Output Operator
               compressed: false
-              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
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -205,37 +205,37 @@ 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
                 keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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: (grouping(_col2, 1) = 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
             Select Operator
               expressions: _col0 (type: int), _col1 (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
               File Output Operator
                 compressed: false
-                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
                 table:
                     input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -292,34 +292,34 @@ 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
                 keys: _col0 (type: int), _col1 (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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: ((grouping(_col2, 0) = 1) or (grouping(_col2, 1) = 1)) 
(type: boolean)
-            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
             Select Operator
               expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: int), CASE WHEN 
(((grouping(_col2, 1) + grouping(_col2, 0)) = 1)) THEN (_col0) ELSE (null) END 
(type: int)
               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
               File Output Operator
                 compressed: false
                 table:
@@ -334,16 +334,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col2 (type: int), _col3 (type: int)
               sort order: -+
-              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: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: int)
           outputColumnNames: _col0, _col1, _col2
-          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
           File Output Operator
             compressed: false
-            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
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -401,34 +401,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 90 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: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 40 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), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
-            Statistics: Num rows: 4 Data size: 40 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: 4 Data size: 40 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
@@ -483,34 +483,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1) (type: int), grouping(_col2, 0) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4
-            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
             File Output Operator
               compressed: false
-              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
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -572,34 +572,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: (grouping(_col2, 1) = 1) (type: boolean)
-                  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
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           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
           pruneGroupingSetId: true
           File Output Operator
             compressed: false
-            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
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -656,34 +656,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: ((grouping(_col2, 0) = 1) or (grouping(_col2, 1) 
= 1)) (type: boolean)
-                  Statistics: Num rows: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 4 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), 
(grouping(_col2, 1) + grouping(_col2, 0)) (type: int)
             outputColumnNames: _col0, _col1, _col2
-            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
             File Output Operator
               compressed: false
               table:
@@ -698,16 +698,16 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col2 (type: int), CASE WHEN ((_col2 = 1)) THEN 
(_col0) END (type: int)
               sort order: -+
-              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: _col0 (type: int), _col1 (type: int)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: int), VALUE._col1 (type: int), 
KEY.reducesinkkey0 (type: int)
           outputColumnNames: _col0, _col1, _col2
-          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
           File Output Operator
             compressed: false
-            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
             table:
                 input format: org.apache.hadoop.mapred.SequenceFileInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -765,34 +765,34 @@ 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
                 keys: key (type: int), value (type: int)
                 mode: hash
                 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
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: int)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: int), _col1 
(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
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          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), 0 (type: int), 
0 (type: int)
             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
@@ -842,34 +842,34 @@ 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
                 keys: key (type: int), value (type: int)
                 mode: hash
                 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
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: int)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: int), _col1 
(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
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          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), 0 (type: int)
             outputColumnNames: _col0, _col1, _col2
-            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
@@ -921,30 +921,30 @@ 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
                 keys: key (type: int), value (type: int)
                 mode: hash
                 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
                 Reduce Output Operator
                   key expressions: _col0 (type: int), _col1 (type: int)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: int), _col1 
(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
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          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
@@ -996,34 +996,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 1, 0) (type: int)
             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
             File Output Operator
               compressed: false
-              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
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1083,34 +1083,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 12 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 120 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: 12 Data size: 120 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 120 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          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
           Select Operator
             expressions: _col0 (type: int), _col1 (type: int), _col2 (type: 
int), grouping(_col2, 0, 1) (type: int)
             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
             File Output Operator
               compressed: false
-              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
               table:
                   input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -1170,34 +1170,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 90 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: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 40 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), _col2 (type: 
int), grouping(_col2, 1, 0) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 4 Data size: 40 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: 4 Data size: 40 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
@@ -1252,34 +1252,34 @@ 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
                 keys: key (type: int), value (type: int), 0 (type: int)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 90 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: 9 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 90 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: int), KEY._col2 (type: 
int)
           mode: mergepartial
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 4 Data size: 40 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), _col2 (type: 
int), grouping(_col2, 0, 1) (type: int)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 4 Data size: 40 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: 4 Data size: 40 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/index_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_serde.q.out 
b/ql/src/test/results/clientpositive/index_serde.q.out
index c1d7ea3..597c165 100644
--- a/ql/src/test/results/clientpositive/index_serde.q.out
+++ b/ql/src/test/results/clientpositive/index_serde.q.out
@@ -161,17 +161,17 @@ STAGE PLANS:
           TableScan
             alias: doctors
             filterExpr: (number > 6) (type: boolean)
-            Statistics: Num rows: 2 Data size: 521 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 521 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (number > 6) (type: boolean)
-              Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 521 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: number (type: int), first_name (type: string), 
last_name (type: string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 521 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1 Data size: 260 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 521 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/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out 
b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
index 32edd73..6a49817 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
@@ -247,19 +247,19 @@ STAGE PLANS:
                     value expressions: _col0 (type: string), _col1 (type: 
bigint)
           TableScan
             alias: src
-            Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: value is not null (type: boolean)
-              Statistics: Num rows: 58 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: value (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 58 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)
                   sort order: +
                   Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
-                  Statistics: Num rows: 58 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 5812 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/input22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input22.q.out 
b/ql/src/test/results/clientpositive/input22.q.out
index 6875106..2561433 100644
--- a/ql/src/test/results/clientpositive/input22.q.out
+++ b/ql/src/test/results/clientpositive/input22.q.out
@@ -36,27 +36,27 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: input4
-            Statistics: Num rows: 58 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)
               outputColumnNames: _col0
-              Statistics: Num rows: 58 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: _col0 (type: string)
                 sort order: +
-                Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
                 TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string)
           outputColumnNames: _col0
-          Statistics: Num rows: 58 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE Column 
stats: NONE
           Limit
             Number of rows: 10
-            Statistics: Num rows: 10 Data size: 1000 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 5812 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 10 Data size: 1000 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 5812 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/input3_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input3_limit.q.out 
b/ql/src/test/results/clientpositive/input3_limit.q.out
index 560de96..07b84ed 100644
--- a/ql/src/test/results/clientpositive/input3_limit.q.out
+++ b/ql/src/test/results/clientpositive/input3_limit.q.out
@@ -48,21 +48,21 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 58 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 58 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: _col0 (type: string)
-                Statistics: Num rows: 58 Data size: 11603 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: string), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 58 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -77,19 +77,19 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: string), _col1 (type: string)
               sort order: ++
-              Statistics: Num rows: 58 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
               TopN Hash Memory Usage: 0.1
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 
(type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 58 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 20
-            Statistics: Num rows: 20 Data size: 4000 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 1 Data size: 11603 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 20 Data size: 4000 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 11603 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/input4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input4.q.out 
b/ql/src/test/results/clientpositive/input4.q.out
index 6984318..bbcce4a 100644
--- a/ql/src/test/results/clientpositive/input4.q.out
+++ b/ql/src/test/results/clientpositive/input4.q.out
@@ -44,7 +44,7 @@ PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN FORMATTED
 SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4 AS Input4Alias
 POSTHOOK: type: QUERY
-{"STAGE DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"-1","Processor 
Tree:":{"TableScan":{"alias:":"input4alias","Statistics:":"Num rows: 29 Data 
size: 5812 Basic stats: COMPLETE Column stats: 
NONE","OperatorId:":"TS_0","children":{"Select Operator":{"expressions:":"value 
(type: string), key (type: 
string)","outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 29 
Data size: 5812 Basic stats: COMPLETE Column stats: 
NONE","OperatorId:":"SEL_1","children":{"ListSink":{"OperatorId:":"LIST_SINK_3"}}}}}}}}}}
+{"STAGE DEPENDENCIES":{"Stage-0":{"ROOT STAGE":"TRUE"}},"STAGE 
PLANS":{"Stage-0":{"Fetch Operator":{"limit:":"-1","Processor 
Tree:":{"TableScan":{"alias:":"input4alias","Statistics:":"Num rows: 1 Data 
size: 5812 Basic stats: COMPLETE Column stats: 
NONE","OperatorId:":"TS_0","children":{"Select Operator":{"expressions:":"value 
(type: string), key (type: 
string)","outputColumnNames:":["_col0","_col1"],"Statistics:":"Num rows: 1 Data 
size: 5812 Basic stats: COMPLETE Column stats: 
NONE","OperatorId:":"SEL_1","children":{"ListSink":{"OperatorId:":"LIST_SINK_3"}}}}}}}}}}
 PREHOOK: query: SELECT Input4Alias.VALUE, Input4Alias.KEY FROM INPUT4 AS 
Input4Alias
 PREHOOK: type: QUERY
 PREHOOK: Input: default@input4

http://git-wip-us.apache.org/repos/asf/hive/blob/6a99cf53/ql/src/test/results/clientpositive/join_star.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_star.q.out 
b/ql/src/test/results/clientpositive/join_star.q.out
index cbb7a03..1215fbb 100644
--- a/ql/src/test/results/clientpositive/join_star.q.out
+++ b/ql/src/test/results/clientpositive/join_star.q.out
@@ -146,14 +146,14 @@ STAGE PLANS:
         $hdt$_1:dim1 
           TableScan
             alias: dim1
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: f1 is not null (type: boolean)
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: f1 (type: int), f2 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col2 (type: int)
@@ -164,14 +164,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: fact
-            Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: d1 is not null (type: boolean)
-              Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: m1 (type: int), m2 (type: int), d1 (type: int)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -179,14 +179,14 @@ STAGE PLANS:
                     0 _col2 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col4
-                  Statistics: Num rows: 8 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int), _col4 
(type: int)
                     outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 8 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 8 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -243,14 +243,14 @@ STAGE PLANS:
         $hdt$_1:dim1 
           TableScan
             alias: dim1
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: f1 is not null (type: boolean)
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: f1 (type: int), f2 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col2 (type: int)
@@ -258,14 +258,14 @@ STAGE PLANS:
         $hdt$_2:dim2 
           TableScan
             alias: dim2
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: f3 is not null (type: boolean)
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: f3 (type: int), f4 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col3 (type: int)
@@ -276,14 +276,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: fact
-            Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (d1 is not null and d2 is not null) (type: boolean)
-              Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: m1 (type: int), m2 (type: int), d1 (type: int), 
d2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -291,7 +291,7 @@ STAGE PLANS:
                     0 _col2 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col3, _col5
-                  Statistics: Num rows: 6 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -299,14 +299,14 @@ STAGE PLANS:
                       0 _col3 (type: int)
                       1 _col0 (type: int)
                     outputColumnNames: _col0, _col1, _col5, _col7
-                    Statistics: Num rows: 6 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col0 (type: int), _col1 (type: int), _col5 
(type: int), _col7 (type: int)
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      Statistics: Num rows: 6 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 6 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -355,57 +355,57 @@ STAGE PLANS:
   Stage: Stage-7
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_0:fact 
+        $hdt$_0:dim1 
           Fetch Operator
             limit: -1
-        $hdt$_1:dim1 
+        $hdt$_2:fact 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_0:fact 
-          TableScan
-            alias: fact
-            Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
-            Filter Operator
-              predicate: d1 is not null (type: boolean)
-              Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: m1 (type: int), m2 (type: int), d1 (type: int)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
-                HashTable Sink Operator
-                  keys:
-                    0 _col0 (type: int)
-                    1 _col2 (type: int)
-        $hdt$_1:dim1 
+        $hdt$_0:dim1 
           TableScan
             alias: dim1
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (f1 is not null and f2 is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: f1 (type: int), f2 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col1 (type: int)
                     1 _col0 (type: int)
+        $hdt$_2:fact 
+          TableScan
+            alias: fact
+            Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
+            Filter Operator
+              predicate: d1 is not null (type: boolean)
+              Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+              Select Operator
+                expressions: m1 (type: int), m2 (type: int), d1 (type: int)
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+                HashTable Sink Operator
+                  keys:
+                    0 _col0 (type: int)
+                    1 _col2 (type: int)
 
   Stage: Stage-5
     Map Reduce
       Map Operator Tree:
           TableScan
             alias: dim2
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: f3 is not null (type: boolean)
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: f3 (type: int), f4 (type: int)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -413,7 +413,7 @@ STAGE PLANS:
                     0 _col1 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col3
-                  Statistics: Num rows: 2 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -421,14 +421,14 @@ STAGE PLANS:
                       0 _col0 (type: int)
                       1 _col2 (type: int)
                     outputColumnNames: _col1, _col3, _col4, _col5
-                    Statistics: Num rows: 8 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 18 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: _col4 (type: int), _col5 (type: int), _col1 
(type: int), _col3 (type: int)
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      Statistics: Num rows: 8 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 18 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 8 Data size: 107 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 18 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -487,11 +487,11 @@ STAGE PLANS:
         $hdt$_1:dim1 
           TableScan
             alias: dim1
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f1 (type: int), f2 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col2 (type: int)
@@ -499,11 +499,11 @@ STAGE PLANS:
         $hdt$_2:dim2 
           TableScan
             alias: dim2
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f3 (type: int), f4 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col4 (type: int)
@@ -514,11 +514,11 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: fact
-            Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: m1 (type: int), m2 (type: int), d1 (type: int)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 8 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Left Outer Join 0 to 1
@@ -526,7 +526,7 @@ STAGE PLANS:
                   0 _col2 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1, _col4
-                Statistics: Num rows: 8 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Left Outer Join 0 to 1
@@ -534,14 +534,14 @@ STAGE PLANS:
                     0 _col4 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col4, _col6
-                  Statistics: Num rows: 8 Data size: 117 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 117 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: int), _col1 (type: int), _col4 
(type: int), _col6 (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3
-                    Statistics: Num rows: 8 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 8 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 117 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -631,11 +631,11 @@ STAGE PLANS:
         $hdt$_1:dim1 
           TableScan
             alias: dim1
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f1 (type: int), f2 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col2 (type: int)
@@ -643,11 +643,11 @@ STAGE PLANS:
         $hdt$_2:dim2 
           TableScan
             alias: dim2
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f3 (type: int), f4 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col5 (type: int)
@@ -655,11 +655,11 @@ STAGE PLANS:
         $hdt$_3:dim3 
           TableScan
             alias: dim3
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f5 (type: int), f6 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col3 (type: int)
@@ -667,11 +667,11 @@ STAGE PLANS:
         $hdt$_4:dim4 
           TableScan
             alias: dim4
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f7 (type: int), f8 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col9 (type: int)
@@ -679,11 +679,11 @@ STAGE PLANS:
         $hdt$_5:dim5 
           TableScan
             alias: dim5
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f9 (type: int), f10 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col11 (type: int)
@@ -691,11 +691,11 @@ STAGE PLANS:
         $hdt$_6:dim6 
           TableScan
             alias: dim6
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f11 (type: int), f12 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col9 (type: int)
@@ -703,11 +703,11 @@ STAGE PLANS:
         $hdt$_7:dim7 
           TableScan
             alias: dim7
-            Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: f13 (type: int), f14 (type: int)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col15 (type: int)
@@ -718,11 +718,11 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: fact
-            Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: m1 (type: int), m2 (type: int), d1 (type: int), d2 
(type: int)
               outputColumnNames: _col0, _col1, _col2, _col3
-              Statistics: Num rows: 6 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 98 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Left Outer Join 0 to 1
@@ -730,7 +730,7 @@ STAGE PLANS:
                   0 _col2 (type: int)
                   1 _col0 (type: int)
                 outputColumnNames: _col0, _col1, _col3, _col5
-                Statistics: Num rows: 6 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 107 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Left Outer Join 0 to 1
@@ -738,7 +738,7 @@ STAGE PLANS:
                     0 _col5 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col0, _col1, _col3, _col5, _col7
-                  Statistics: Num rows: 6 Data size: 117 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 117 Basic stats: COMPLETE 
Column stats: NONE
                   Map Join Operator
                     condition map:
                          Left Outer Join 0 to 1
@@ -746,7 +746,7 @@ STAGE PLANS:
                       0 _col3 (type: int)
                       1 _col0 (type: int)
                     outputColumnNames: _col0, _col1, _col5, _col7, _col9
-                    Statistics: Num rows: 6 Data size: 128 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 128 Basic stats: 
COMPLETE Column stats: NONE
                     Map Join Operator
                       condition map:
                            Left Outer Join 0 to 1
@@ -754,7 +754,7 @@ STAGE PLANS:
                         0 _col9 (type: int)
                         1 _col0 (type: int)
                       outputColumnNames: _col0, _col1, _col5, _col7, _col9, 
_col11
-                      Statistics: Num rows: 6 Data size: 140 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 140 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Left Outer Join 0 to 1
@@ -762,7 +762,7 @@ STAGE PLANS:
                           0 _col11 (type: int)
                           1 _col0 (type: int)
                         outputColumnNames: _col0, _col1, _col5, _col7, _col9, 
_col11, _col13
-                        Statistics: Num rows: 6 Data size: 154 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 154 Basic stats: 
COMPLETE Column stats: NONE
                         Map Join Operator
                           condition map:
                                Left Outer Join 0 to 1
@@ -770,7 +770,7 @@ STAGE PLANS:
                             0 _col9 (type: int)
                             1 _col0 (type: int)
                           outputColumnNames: _col0, _col1, _col5, _col7, 
_col9, _col11, _col13, _col15
-                          Statistics: Num rows: 6 Data size: 169 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 1 Data size: 169 Basic stats: 
COMPLETE Column stats: NONE
                           Map Join Operator
                             condition map:
                                  Left Outer Join 0 to 1
@@ -778,14 +778,14 @@ STAGE PLANS:
                               0 _col15 (type: int)
                               1 _col0 (type: int)
                             outputColumnNames: _col0, _col1, _col5, _col7, 
_col9, _col11, _col13, _col15, _col17
-                            Statistics: Num rows: 6 Data size: 185 Basic 
stats: COMPLETE Column stats: NONE
+                            Statistics: Num rows: 1 Data size: 185 Basic 
stats: COMPLETE Column stats: NONE
                             Select Operator
                               expressions: _col0 (type: int), _col1 (type: 
int), _col5 (type: int), _col7 (type: int), _col9 (type: int), _col11 (type: 
int), _col13 (type: int), _col15 (type: int), _col17 (type: int)
                               outputColumnNames: _col0, _col1, _col2, _col3, 
_col4, _col5, _col6, _col7, _col8
-                              Statistics: Num rows: 6 Data size: 185 Basic 
stats: COMPLETE Column stats: NONE
+                              Statistics: Num rows: 1 Data size: 185 Basic 
stats: COMPLETE Column stats: NONE
                               File Output Operator
                                 compressed: false
-                                Statistics: Num rows: 6 Data size: 185 Basic 
stats: COMPLETE Column stats: NONE
+                                Statistics: Num rows: 1 Data size: 185 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/llap/acid_bucket_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out 
b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
index 61e3dfd..77bea79 100644
--- a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out
@@ -43,22 +43,22 @@ STAGE PLANS:
                   alias: acidtbldefault
                   filterExpr: (a = 1) (type: boolean)
                   buckets included: [1,] of 16
-                  Statistics: Num rows: 8143 Data size: 30948 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
                     predicate: (a = 1) (type: boolean)
-                    Statistics: Num rows: 5 Data size: 19 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     Select Operator
                       expressions: 1 (type: int)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 19 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
                         GlobalTableId: 0
 #### A masked pattern was here ####
                         NumFilesPerFileSink: 1
-                        Statistics: Num rows: 5 Data size: 19 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
 #### A masked pattern was here ####
                         table:
                             input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat

Reply via email to