http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
index 2642a80..f6d8388 100644
--- a/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/orc_predicate_pushdown.q.out
@@ -461,14 +461,14 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((t = -1) and s is not null) and (s like 'bob%')) 
(type: boolean)
-              Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 262 Data size: 77718 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: -1 (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 262 Data size: 77718 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 262 Data size: 77718 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -504,14 +504,14 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((t = -1) and s is not null) and (s like 'bob%')) 
(type: boolean)
-              Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 262 Data size: 77718 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: -1 (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 262 Data size: 77718 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 262 Data size: 77718 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -592,23 +592,23 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((s is not null and (s like 'bob%')) and (not (t) IN 
(-1, -2, -3))) and t BETWEEN 25 AND 30) (type: boolean)
-              Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: t (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 65 Data size: 19281 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: tinyint), _col1 (type: string)
                   sort order: ++
-                  Statistics: Num rows: 65 Data size: 19281 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 
(type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -648,23 +648,23 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 311170 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((s is not null and (s like 'bob%')) and (not (t) IN 
(-1, -2, -3))) and t BETWEEN 25 AND 30) (type: boolean)
-              Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: t (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 65 Data size: 19281 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: tinyint), _col1 (type: string)
                   sort order: ++
-                  Statistics: Num rows: 65 Data size: 19281 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 131 Data size: 38859 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 
(type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 131 Data size: 38859 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 65 Data size: 19281 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 131 Data size: 38859 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/d8ee05ae/ql/src/test/results/clientpositive/parallel_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parallel_join1.q.out 
b/ql/src/test/results/clientpositive/parallel_join1.q.out
index 761c85e..3c97671 100644
--- a/ql/src/test/results/clientpositive/parallel_join1.q.out
+++ b/ql/src/test/results/clientpositive/parallel_join1.q.out
@@ -32,31 +32,31 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 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: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 500 Data size: 5312 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: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -66,14 +66,14 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col2
-          Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
             expressions: UDFToInteger(_col0) (type: int), _col2 (type: string)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 550 Data size: 5843 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/d8ee05ae/ql/src/test/results/clientpositive/parquet_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_join.q.out 
b/ql/src/test/results/clientpositive/parquet_join.q.out
index a9629dc..809ed70 100644
--- a/ql/src/test/results/clientpositive/parquet_join.q.out
+++ b/ql/src/test/results/clientpositive/parquet_join.q.out
@@ -81,31 +81,31 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: p2
             Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), myvalue (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -115,14 +115,14 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col2
-          Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col2 (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -181,11 +181,11 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -199,11 +199,11 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), myvalue (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -211,14 +211,14 @@ STAGE PLANS:
                     0 _col0 (type: int)
                     1 _col0 (type: int)
                   outputColumnNames: _col2
-                  Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col2 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 1 Data size: 2 Basic stats: COMPLETE 
Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 1 Data size: 2 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -302,11 +302,11 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value2 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 6 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/parquet_predicate_pushdown.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/parquet_predicate_pushdown.q.out 
b/ql/src/test/results/clientpositive/parquet_predicate_pushdown.q.out
index fbd3491..b322ef1 100644
--- a/ql/src/test/results/clientpositive/parquet_predicate_pushdown.q.out
+++ b/ql/src/test/results/clientpositive/parquet_predicate_pushdown.q.out
@@ -449,14 +449,14 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11539 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((t = -1) and s is not null) and (s like 'bob%')) 
(type: boolean)
-              Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 262 Data size: 2882 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: -1 (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 262 Data size: 2882 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 262 Data size: 2882 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -492,14 +492,14 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11539 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((t = -1) and s is not null) and (s like 'bob%')) 
(type: boolean)
-              Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 262 Data size: 2882 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: -1 (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 262 Data size: 2882 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 262 Data size: 2882 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -580,23 +580,23 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11539 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((s is not null and (s like 'bob%')) and (not (t) IN 
(-1, -2, -3))) and t BETWEEN 25 AND 30) (type: boolean)
-              Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: t (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: tinyint), _col1 (type: string)
                   sort order: ++
-                  Statistics: Num rows: 65 Data size: 715 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 
(type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -636,23 +636,23 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11539 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((s is not null and (s like 'bob%')) and (not (t) IN 
(-1, -2, -3))) and t BETWEEN 25 AND 30) (type: boolean)
-              Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: t (type: tinyint), s (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: tinyint), _col1 (type: string)
                   sort order: ++
-                  Statistics: Num rows: 65 Data size: 715 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 131 Data size: 1441 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 
(type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 131 Data size: 1441 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 65 Data size: 715 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 131 Data size: 1441 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/d8ee05ae/ql/src/test/results/clientpositive/pcr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pcr.q.out 
b/ql/src/test/results/clientpositive/pcr.q.out
index 4e23917..617ca8d 100644
--- a/ql/src/test/results/clientpositive/pcr.q.out
+++ b/ql/src/test/results/clientpositive/pcr.q.out
@@ -2711,16 +2711,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -2731,16 +2731,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -2803,7 +2803,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -2830,7 +2830,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: int), 
_col4 (type: string)
               auto parallelism: false
@@ -2864,13 +2864,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: int), VALUE._col3 
(type: string), '2000-04-08' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
@@ -3013,16 +3013,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -3033,16 +3033,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -3151,7 +3151,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -3178,7 +3178,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: int), 
_col4 (type: string)
               auto parallelism: false
@@ -3212,13 +3212,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: int), VALUE._col3 
(type: string), '2000-04-09' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/pointlookup2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pointlookup2.q.out 
b/ql/src/test/results/clientpositive/pointlookup2.q.out
index b6270b3..a442425 100644
--- a/ql/src/test/results/clientpositive/pointlookup2.q.out
+++ b/ql/src/test/results/clientpositive/pointlookup2.q.out
@@ -387,16 +387,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -407,16 +407,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -479,7 +479,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -506,7 +506,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: int), 
_col4 (type: string)
               auto parallelism: false
@@ -540,13 +540,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: int), VALUE._col3 
(type: string), '2000-04-08' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
@@ -649,16 +649,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -669,16 +669,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string)
                   auto parallelism: false
@@ -787,7 +787,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -814,7 +814,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: int), 
_col4 (type: string)
               auto parallelism: false
@@ -848,13 +848,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: int), VALUE._col3 
(type: string), '2000-04-09' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/pointlookup3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/pointlookup3.q.out 
b/ql/src/test/results/clientpositive/pointlookup3.q.out
index a37e079..6a8039f 100644
--- a/ql/src/test/results/clientpositive/pointlookup3.q.out
+++ b/ql/src/test/results/clientpositive/pointlookup3.q.out
@@ -542,16 +542,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string), ds2 (type: 
string)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string), _col3 (type: string)
                   auto parallelism: false
@@ -562,16 +562,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string), ds1 (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string), _col2 (type: string)
                   auto parallelism: false
@@ -635,7 +635,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4, _col5, _col6
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -662,7 +662,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: string), 
_col4 (type: int), _col5 (type: string), _col6 (type: string)
               auto parallelism: false
@@ -696,13 +696,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: string), VALUE._col3 
(type: int), VALUE._col4 (type: string), VALUE._col5 (type: string), 
'2001-04-08' (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
@@ -805,16 +805,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string), ds2 (type: 
string)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 0
                   value expressions: _col1 (type: string), _col3 (type: string)
                   auto parallelism: false
@@ -825,16 +825,16 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string), ds2 (type: 
string)
                 outputColumnNames: _col0, _col1, _col3
-                Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 20 Data size: 160 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
-                  Statistics: Num rows: 10 Data size: 80 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 160 Basic stats: 
COMPLETE Column stats: NONE
                   tag: 1
                   value expressions: _col1 (type: string), _col3 (type: string)
                   auto parallelism: false
@@ -945,7 +945,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col3, _col4, _col5, _col7
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
@@ -972,7 +972,7 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: int)
               sort order: +
-              Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
               value expressions: _col1 (type: string), _col3 (type: string), 
_col4 (type: int), _col5 (type: string), _col7 (type: string)
               auto parallelism: false
@@ -1006,13 +1006,13 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), '2000-04-08' (type: string), VALUE._col2 (type: string), VALUE._col3 
(type: int), VALUE._col4 (type: string), '2000-04-09' (type: string), 
VALUE._col6 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7
-          Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             GlobalTableId: 0
 #### A masked pattern was here ####
             NumFilesPerFileSink: 1
-            Statistics: Num rows: 11 Data size: 88 Basic stats: COMPLETE 
Column stats: NONE
+            Statistics: Num rows: 22 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/ppd_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby.q.out 
b/ql/src/test/results/clientpositive/ppd_gby.q.out
index 6f8ee53..ee868cc 100644
--- a/ql/src/test/results/clientpositive/ppd_gby.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby.q.out
@@ -25,45 +25,38 @@ STAGE PLANS:
               predicate: ((value > 'val_10') and (value > 'val_200')) (type: 
boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
+                expressions: value (type: string), key (type: string)
+                outputColumnNames: value, key
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-                Filter Operator
-                  predicate: (_col1 > 'val_200') (type: boolean)
-                  Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: _col1 (type: string), _col0 (type: string)
-                    outputColumnNames: _col1, _col0
-                    Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                    Group By Operator
-                      aggregations: count(_col0)
-                      keys: _col1 (type: string)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 18 Data size: 191 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: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: bigint)
+                Group By Operator
+                  aggregations: count(key)
+                  keys: value (type: string)
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 55 Data size: 584 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: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > 30) or (_col0 < 'val_400')) (type: boolean)
-            Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -246,11 +239,11 @@ STAGE PLANS:
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: value (type: string), key (type: string)
-                outputColumnNames: _col1, _col0
+                outputColumnNames: value, key
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
-                  aggregations: count(_col0)
-                  keys: _col1 (type: string)
+                  aggregations: count(key)
+                  keys: value (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/ppd_gby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby2.q.out 
b/ql/src/test/results/clientpositive/ppd_gby2.q.out
index 5fbe70f..68c0ece 100644
--- a/ql/src/test/results/clientpositive/ppd_gby2.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby2.q.out
@@ -28,44 +28,37 @@ STAGE PLANS:
               predicate: ((value > 'val_10') and (value > 'val_200')) (type: 
boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
+                expressions: value (type: string), key (type: string)
+                outputColumnNames: value, key
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-                Filter Operator
-                  predicate: (_col1 > 'val_200') (type: boolean)
-                  Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: _col1 (type: string), _col0 (type: string)
-                    outputColumnNames: _col1, _col0
-                    Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                    Group By Operator
-                      aggregations: count(_col0)
-                      keys: _col1 (type: string)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 18 Data size: 191 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: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: bigint)
+                Group By Operator
+                  aggregations: count(key)
+                  keys: value (type: string)
+                  mode: hash
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 55 Data size: 584 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: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > 30) or (_col0 < 'val_400')) (type: boolean)
-            Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
             Group By Operator
               aggregations: max(_col0)
               keys: _col1 (type: bigint)
               mode: hash
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
                 table:
@@ -81,7 +74,7 @@ STAGE PLANS:
               key expressions: _col0 (type: bigint)
               sort order: +
               Map-reduce partition columns: _col0 (type: bigint)
-              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 18 Data size: 190 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Group By Operator
@@ -89,14 +82,14 @@ STAGE PLANS:
           keys: KEY._col0 (type: bigint)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col0 (type: bigint)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -160,11 +153,11 @@ STAGE PLANS:
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: value (type: string), key (type: string)
-                outputColumnNames: _col1, _col0
+                outputColumnNames: value, key
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
-                  aggregations: count(_col0)
-                  keys: _col1 (type: string)
+                  aggregations: count(key)
+                  keys: value (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/ppd_gby_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_gby_join.q.out 
b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
index e3f71e7..09dfb82 100644
--- a/ql/src/test/results/clientpositive/ppd_gby_join.q.out
+++ b/ql/src/test/results/clientpositive/ppd_gby_join.q.out
@@ -36,53 +36,37 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((((((key > '1') and (key > '20')) and ((value < 
'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> 
'4')) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                expressions: key (type: string)
+                outputColumnNames: _col0
+                Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col0 > '20') and ((_col1 < 'val_50') or (_col0 
> '2')) and (_col0 < '400')) (type: boolean)
-                  Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
-                  Select Operator
-                    expressions: _col0 (type: string)
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: ((_col0 > '2') and (_col0 <> '4')) (type: 
boolean)
-                      Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 1 Data size: 10 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: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
+                  predicate: _col0 is not null (type: boolean)
+                  Statistics: Num rows: 4 Data size: 42 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: 4 Data size: 42 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) 
and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col0 <> '4') (type: boolean)
-                  Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
-                  Filter Operator
-                    predicate: ((_col0 > '1') and (_col0 > '20') and (_col0 < 
'400')) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: _col0 is not null (type: boolean)
-                      Statistics: Num rows: 1 Data size: 10 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: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
+                  predicate: _col0 is not null (type: boolean)
+                  Statistics: Num rows: 6 Data size: 63 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: 6 Data size: 63 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -91,20 +75,20 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 69 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -120,7 +104,7 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -128,10 +112,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 23 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 23 Basic stats: COMPLETE Column 
stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -328,31 +312,31 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((((((key > '1') and (key > '20')) and ((value < 
'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> 
'4')) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 42 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: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) 
and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -361,20 +345,20 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 3 Data size: 34 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 69 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
-            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
                 keys: _col0 (type: string)
                 mode: hash
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   table:
@@ -390,7 +374,7 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -398,10 +382,10 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 2 Data size: 23 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 2 Data size: 23 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/d8ee05ae/ql/src/test/results/clientpositive/ppd_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_join.q.out 
b/ql/src/test/results/clientpositive/ppd_join.q.out
index 58c4e43..f284237 100644
--- a/ql/src/test/results/clientpositive/ppd_join.q.out
+++ b/ql/src/test/results/clientpositive/ppd_join.q.out
@@ -33,54 +33,38 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((((((key > '1') and (key > '20')) and ((value < 
'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> 
'4')) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                expressions: key (type: string)
+                outputColumnNames: _col0
+                Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: ((_col0 > '20') and ((_col1 < 'val_50') or (_col0 
> '2')) and (_col0 < '400')) (type: boolean)
-                  Statistics: Num rows: 1 Data size: 10 Basic stats: COMPLETE 
Column stats: NONE
-                  Select Operator
-                    expressions: _col0 (type: string)
-                    outputColumnNames: _col0
-                    Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: ((_col0 > '2') and (_col0 <> '4')) (type: 
boolean)
-                      Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                      Filter Operator
-                        predicate: _col0 is not null (type: boolean)
-                        Statistics: Num rows: 1 Data size: 10 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: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
+                  predicate: _col0 is not null (type: boolean)
+                  Statistics: Num rows: 4 Data size: 42 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: 4 Data size: 42 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) 
and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
-                  predicate: (_col0 <> '4') (type: boolean)
-                  Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
-                  Filter Operator
-                    predicate: ((_col0 > '1') and (_col0 > '20') and (_col0 < 
'400')) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                    Filter Operator
-                      predicate: _col0 is not null (type: boolean)
-                      Statistics: Num rows: 1 Data size: 10 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: 1 Data size: 10 Basic stats: 
COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: string)
+                  predicate: _col0 is not null (type: boolean)
+                  Statistics: Num rows: 6 Data size: 63 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: 6 Data size: 63 Basic stats: 
COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -89,17 +73,17 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 69 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
-            Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col2 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -580,31 +564,31 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((((((key > '1') and (key > '20')) and ((value < 
'val_50') or (key > '2'))) and (key < '400')) and (key > '2')) and (key <> 
'4')) and key is not null) (type: boolean)
-              Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 42 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: 2 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 4 Data size: 42 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((((key > '2') and (key <> '4')) and (key > '1')) 
and (key > '20')) and (key < '400')) and key is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 3 Data size: 31 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -614,17 +598,17 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 3 Data size: 34 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 69 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
             predicate: ((_col1 > '50') or (_col0 < '50')) (type: boolean)
-            Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col2 (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 2 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 4 Data size: 46 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Reply via email to