http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out 
b/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out
index ec9fae1..93cc1eb 100644
--- a/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out
@@ -99,7 +99,7 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and (key = '8')) (type: boolean)
-              Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -107,25 +107,25 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 outputColumnNames: _col0, _col6
-                Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col6 (type: 
array<string>)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE 
Column stats: NONE
                   Union
-                    Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                     Lateral View Forward
-                      Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: 
array<string>)
                         outputColumnNames: _col0, _col1
-                        Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                         Lateral View Join Operator
                           outputColumnNames: _col0, _col1, _col2
-                          Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                           File Output Operator
                             compressed: false
-                            Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                            Statistics: Num rows: 12 Data size: 52 Basic 
stats: COMPLETE Column stats: NONE
                             table:
                                 input format: 
org.apache.hadoop.mapred.TextInputFormat
                                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -133,16 +133,16 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col1 (type: array<string>)
                         outputColumnNames: _col0
-                        Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                         UDTF Operator
-                          Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                           function name: explode
                           Lateral View Join Operator
                             outputColumnNames: _col0, _col1, _col2
-                            Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                            Statistics: Num rows: 12 Data size: 52 Basic 
stats: COMPLETE Column stats: NONE
                             File Output Operator
                               compressed: false
-                              Statistics: Num rows: 6 Data size: 82 Basic 
stats: COMPLETE Column stats: NONE
+                              Statistics: Num rows: 12 Data size: 52 Basic 
stats: COMPLETE Column stats: NONE
                               table:
                                   input format: 
org.apache.hadoop.mapred.TextInputFormat
                                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -152,7 +152,7 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and (not (key = '8'))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -160,25 +160,25 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 outputColumnNames: _col0, _col6
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col6 (type: 
array<string>)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE 
Column stats: NONE
                   Union
-                    Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                     Lateral View Forward
-                      Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                       Select Operator
                         expressions: _col0 (type: string), _col1 (type: 
array<string>)
                         outputColumnNames: _col0, _col1
-                        Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                         Lateral View Join Operator
                           outputColumnNames: _col0, _col1, _col2
-                          Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                           File Output Operator
                             compressed: false
-                            Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                            Statistics: Num rows: 12 Data size: 52 Basic 
stats: COMPLETE Column stats: NONE
                             table:
                                 input format: 
org.apache.hadoop.mapred.TextInputFormat
                                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -186,16 +186,16 @@ STAGE PLANS:
                       Select Operator
                         expressions: _col1 (type: array<string>)
                         outputColumnNames: _col0
-                        Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                         UDTF Operator
-                          Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                           function name: explode
                           Lateral View Join Operator
                             outputColumnNames: _col0, _col1, _col2
-                            Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                            Statistics: Num rows: 12 Data size: 52 Basic 
stats: COMPLETE Column stats: NONE
                             File Output Operator
                               compressed: false
-                              Statistics: Num rows: 6 Data size: 82 Basic 
stats: COMPLETE Column stats: NONE
+                              Statistics: Num rows: 12 Data size: 52 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/08f73adc/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_noskew.q.out 
b/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
index a8e3e8b..9b28649 100644
--- a/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
@@ -23,32 +23,32 @@ 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), 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)
           TableScan
             alias: a
             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
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -58,7 +58,7 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (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
             table:
@@ -110,14 +110,14 @@ STAGE PLANS:
             Reduce Output Operator
               key expressions: _col0 (type: string)
               sort order: +
-              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
               TopN Hash Memory Usage: 0.1
               value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: string), VALUE._col0 (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
           Limit
             Number of rows: 30
             Statistics: Num rows: 30 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoin_onesideskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoin_onesideskew.q.out 
b/ql/src/test/results/clientpositive/skewjoin_onesideskew.q.out
index ae47adf..5fec08b 100644
--- a/ql/src/test/results/clientpositive/skewjoin_onesideskew.q.out
+++ b/ql/src/test/results/clientpositive/skewjoin_onesideskew.q.out
@@ -96,32 +96,32 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 21 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: 14 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 14 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: 7 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 14 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -131,10 +131,10 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 3 Data size: 23 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 3 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
@@ -171,7 +171,7 @@ STAGE PLANS:
               outputColumnNames: _col0, _col1
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 2 Data size: 15 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 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/08f73adc/ql/src/test/results/clientpositive/skewjoinopt10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt10.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt10.q.out
index 7655cf3..53ff911 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt10.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt10.q.out
@@ -74,12 +74,12 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and (key = '8')) (type: boolean)
-              Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
                 sort order: +
                 Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: array<string>)
       Reduce Operator Tree:
         Join Operator
@@ -89,11 +89,11 @@ STAGE PLANS:
             0 key (type: string)
             1 key (type: string)
           outputColumnNames: _col0, _col6
-          Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string), _col6 (type: array<string>)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -106,19 +106,19 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
               Lateral View Forward
-                Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: 
array<string>)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                   Lateral View Join Operator
                     outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -126,35 +126,35 @@ STAGE PLANS:
                 Select Operator
                   expressions: _col1 (type: array<string>)
                   outputColumnNames: _col0
-                  Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                   UDTF Operator
-                    Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                     function name: explode
                     Lateral View Join Operator
                       outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.TextInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                             serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
               Lateral View Forward
-                Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: 
array<string>)
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                   Lateral View Join Operator
                     outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
-                      Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                       table:
                           input format: 
org.apache.hadoop.mapred.TextInputFormat
                           output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -162,16 +162,16 @@ STAGE PLANS:
                 Select Operator
                   expressions: _col1 (type: array<string>)
                   outputColumnNames: _col0
-                  Statistics: Num rows: 3 Data size: 41 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE 
Column stats: NONE
                   UDTF Operator
-                    Statistics: Num rows: 3 Data size: 41 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 6 Data size: 26 Basic stats: 
COMPLETE Column stats: NONE
                     function name: explode
                     Lateral View Join Operator
                       outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false
-                        Statistics: Num rows: 6 Data size: 82 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 12 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
                         table:
                             input format: 
org.apache.hadoop.mapred.TextInputFormat
                             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -196,23 +196,23 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and (not (key = '8'))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
                 sort order: +
                 Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: array<string>)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           outputColumnNames: _col0, _col6
-          Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string), _col6 (type: array<string>)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoinopt12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt12.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt12.q.out
index 6c38b97..5109173 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt12.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt12.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and 
(val = '13')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and 
(val = '13')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -77,7 +77,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and 
(val = '13')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = '3') and 
(val = '13')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -135,7 +135,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = 
'3') and (val = '13'))))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = 
'3') and (val = '13'))))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -150,7 +150,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = 
'3') and (val = '13'))))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') and (val = '12')) or ((key = '8') and (val = '18'))) or ((key = 
'3') and (val = '13'))))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoinopt15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt15.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt15.q.out
index e9b2984..75269a2 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt15.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt15.q.out
@@ -101,32 +101,32 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and ((key = 2) or (key = 3))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), val (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 24 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: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and ((key = 2) or (key = 3))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), val (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 24 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: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -136,7 +136,7 @@ STAGE PLANS:
             0 _col0 (type: int)
             1 _col0 (type: int)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -149,20 +149,20 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -431,31 +431,31 @@ STAGE PLANS:
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and ((key = 2) or (key = 3))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 24 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: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: b
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (key is not null and ((key = 2) or (key = 3))) (type: 
boolean)
-              Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
-                Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 24 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: 2 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -463,7 +463,7 @@ STAGE PLANS:
           keys:
             0 _col0 (type: int)
             1 _col0 (type: int)
-          Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -476,7 +476,7 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
                 mode: hash
@@ -488,7 +488,7 @@ STAGE PLANS:
                   value expressions: _col0 (type: bigint)
           TableScan
             Union
-              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: count(1)
                 mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoinopt16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt16.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt16.q.out
index 15b3e62..de98696 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt16.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt16.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (((key = 
'2') and (val = '12')) or (key = '3'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (((key = 
'2') and (val = '12')) or (key = '3'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -77,7 +77,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (((key = 
'2') and (val = '12')) or (key = '3'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (((key = 
'2') and (val = '12')) or (key = '3'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -135,7 +135,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
(((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
(((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -150,7 +150,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
(((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
(((key = '2') and (val = '12')) or (key = '3')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoinopt17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt17.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt17.q.out
index a48d245..ea2b670 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt17.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt17.q.out
@@ -286,7 +286,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (((key = 
'2') and (val = '12')) or (key = '2'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (((key = 
'2') and (val = '12')) or (key = '2'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -301,7 +301,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (((key = 
'2') and (val = '12')) or (key = '2'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (((key = 
'2') and (val = '12')) or (key = '2'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -359,7 +359,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
(((key = '2') and (val = '12')) or (key = '2')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
(((key = '2') and (val = '12')) or (key = '2')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -374,7 +374,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
(((key = '2') and (val = '12')) or (key = '2')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
(((key = '2') and (val = '12')) or (key = '2')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/skewjoinopt18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt18.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt18.q.out
index e84ac4f..925ebc5 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt18.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt18.q.out
@@ -86,23 +86,23 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: UDFToDouble(key) is not null (type: boolean)
-              Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key is not null and UDFToDouble(key) is not null) 
(type: boolean)
+              Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), val (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 6 Data size: 24 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: 3 Data size: 12 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col0 (type: int), _col1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: UDFToDouble(key) is not null (type: boolean)
+              predicate: (key is not null and UDFToDouble(key) is not null) 
(type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -122,10 +122,10 @@ STAGE PLANS:
             0 UDFToDouble(_col0) (type: double)
             1 UDFToDouble(_col0) (type: double)
           outputColumnNames: _col0, _col1, _col2, _col3
-          Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 6 Data size: 26 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 3 Data size: 13 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 6 Data size: 26 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/08f73adc/ql/src/test/results/clientpositive/skewjoinopt2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/skewjoinopt2.q.out 
b/ql/src/test/results/clientpositive/skewjoinopt2.q.out
index d37237f..c2ae731 100644
--- a/ql/src/test/results/clientpositive/skewjoinopt2.q.out
+++ b/ql/src/test/results/clientpositive/skewjoinopt2.q.out
@@ -70,7 +70,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -85,7 +85,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -143,7 +143,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -158,7 +158,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -388,7 +388,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -403,7 +403,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
+              predicate: ((val is not null and key is not null) and ((((key = 
'2') or (key = '7')) or (key = '3')) or (key = '8'))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -485,7 +485,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)
@@ -500,7 +500,7 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
-              predicate: ((key is not null and val is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
+              predicate: ((val is not null and key is not null) and (not 
((((key = '2') or (key = '7')) or (key = '3')) or (key = '8')))) (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), val (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
index 14f913b..d93c85f 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
@@ -392,7 +392,7 @@ 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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
index 9ab334b..e926af3 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
@@ -290,7 +290,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 208 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/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
index ea2fa51..5a3a619 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
@@ -85,7 +85,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 414 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((userid is not null and pageid is not null) and 
postid is not null) and type is not null) (type: boolean)
-              Statistics: Num rows: 1 Data size: 138 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 3 Data size: 414 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/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
index e159f5e..8b76fa3 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
@@ -135,7 +135,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
index 777ff8a..0dba8e5 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
@@ -147,7 +147,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -408,7 +408,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1542 Data size: 16452 Basic stats: 
COMPLETE Column stats: NONE
+              Statistics: Num rows: 3084 Data size: 32904 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/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
index 8383af5..2f6bd2a 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
@@ -135,7 +135,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -339,7 +339,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: UDFToDouble(value) 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
               HashTable Sink Operator
                 keys:
                   0 UDFToDouble(key) (type: double)
@@ -356,7 +356,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: UDFToDouble(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
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -365,15 +365,15 @@ STAGE PLANS:
                   1 UDFToDouble(value) (type: double)
                 outputColumnNames: _col0, _col1, _col5, _col6
                 Position of Big Table: 0
-                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: _col0 (type: int), _col1 (type: string), _col5 
(type: int), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3
-                  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
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
-                    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
                     tag: -1
                     TopN: 10
                     TopN Hash Memory Usage: 0.1
@@ -439,7 +439,7 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
string), VALUE._col1 (type: int), VALUE._col2 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
-          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
           Limit
             Number of rows: 10
             Statistics: Num rows: 10 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
index 28e62d2..701145b 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
@@ -63,7 +63,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -144,7 +144,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -262,7 +262,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -475,7 +475,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -797,7 +797,7 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
                 predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -815,14 +815,14 @@ STAGE PLANS:
               Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Filter Operator
                 predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
                   keys:
                     0 _col0 (type: int)
                     1 _col0 (type: int)
-                  Statistics: Num rows: 5 Data size: 38 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 77 Basic stats: COMPLETE 
Column stats: NONE
                   Group By Operator
                     aggregations: count()
                     mode: hash
@@ -900,7 +900,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1168,7 +1168,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 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/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
index 8608187..55af7fa 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
@@ -107,7 +107,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -367,7 +367,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1804 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 7218 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -575,7 +575,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: (key2 is not null and key is not null) (type: boolean)
-              Statistics: Num rows: 125 Data size: 1804 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 7218 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -789,7 +789,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 125 Data size: 1804 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 7218 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), value (type: string)
@@ -813,7 +813,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 125 Data size: 1804 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 7218 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -822,16 +822,16 @@ STAGE PLANS:
                   1 key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col8
                 Position of Big Table: 0
-                Statistics: Num rows: 137 Data size: 1984 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 550 Data size: 7939 Basic stats: 
COMPLETE Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: int), _col2 
(type: string), _col6 (type: int), _col7 (type: int), _col8 (type: string)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 137 Data size: 1984 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 550 Data size: 7939 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
-                    Statistics: Num rows: 137 Data size: 1984 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 550 Data size: 7939 Basic stats: 
COMPLETE Column stats: NONE
                     tag: -1
                     TopN: 10
                     TopN Hash Memory Usage: 0.1
@@ -897,7 +897,7 @@ STAGE PLANS:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: 
int), VALUE._col1 (type: string), VALUE._col2 (type: int), VALUE._col3 (type: 
int), VALUE._col4 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-          Statistics: Num rows: 137 Data size: 1984 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 550 Data size: 7939 Basic stats: COMPLETE 
Column stats: NONE
           Limit
             Number of rows: 10
             Statistics: Num rows: 10 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out
index 6c78ee5..b4286d3 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out
@@ -55,7 +55,7 @@ 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
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out
index 944d3bc..fec6ed1 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out
@@ -193,7 +193,7 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 70 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/08f73adc/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out
index 379dc0d..32b6487 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out
@@ -69,7 +69,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 111 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 222 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -294,7 +294,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 104 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 2 Data size: 208 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

Reply via email to