http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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/d8ee05ae/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

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
index 441338e..57ee16a 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
@@ -46,9 +46,6 @@ POSTHOOK: query: load data local inpath 
'../../data/files/smbbucket_3.rc' overwr
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@smb_bucket_3
-Warning: Shuffle Join JOIN[27][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-2:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[22][tables = [$hdt$_1, $hdt$_2]] in Stage 
'Stage-4:MAPRED' is a cross product
 PREHOOK: query: explain 
 select * from (select a.key from smb_bucket_1 a join smb_bucket_2 b on (a.key 
= b.key) where a.key = 5) t1 left outer join (select c.key from smb_bucket_2 c 
join smb_bucket_3 d on (c.key = d.key) where c.key=5) t2 on (t1.key=t2.key) 
where t2.key=5
 PREHOOK: type: QUERY
@@ -74,26 +71,30 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 26 Data size: 104 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  sort order: 
+                  key expressions: 5 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: 5 (type: int)
                   Statistics: Num rows: 26 Data size: 104 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: b
             Statistics: Num rows: 51 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (5 = key) (type: boolean)
+              predicate: (key = 5) (type: boolean)
               Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  sort order: 
+                  key expressions: 5 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: 5 (type: int)
                   Statistics: Num rows: 25 Data size: 100 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           keys:
-            0 
-            1 
+            0 _col0 (type: int)
+            1 _col0 (type: int)
           Statistics: Num rows: 28 Data size: 114 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
@@ -107,19 +108,23 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              sort order: 
+              key expressions: 5 (type: int)
+              sort order: +
+              Map-reduce partition columns: 5 (type: int)
               Statistics: Num rows: 28 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             Reduce Output Operator
-              sort order: 
+              key expressions: 5 (type: int)
+              sort order: +
+              Map-reduce partition columns: 5 (type: int)
               Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           keys:
-            0 
-            1 
+            0 _col0 (type: int)
+            1 _col0 (type: int)
           Statistics: Num rows: 31 Data size: 129 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: 5 (type: int), 5 (type: int)
@@ -145,26 +150,30 @@ STAGE PLANS:
               Select Operator
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  sort order: 
+                  key expressions: 5 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: 5 (type: int)
                   Statistics: Num rows: 25 Data size: 100 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: d
             Statistics: Num rows: 55 Data size: 222 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (5 = key) (type: boolean)
+              predicate: (key = 5) (type: boolean)
               Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  sort order: 
+                  key expressions: 5 (type: int)
+                  sort order: +
+                  Map-reduce partition columns: 5 (type: int)
                   Statistics: Num rows: 27 Data size: 108 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           keys:
-            0 
-            1 
+            0 _col0 (type: int)
+            1 _col0 (type: int)
           Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
@@ -179,11 +188,6 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[56][bigTable=?] in task 'Stage-7:MAPRED' is a cross 
product
-Warning: Map Join MAPJOIN[48][bigTable=?] in task 'Stage-6:MAPRED' is a cross 
product
-Warning: Shuffle Join JOIN[27][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-2:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[57][bigTable=?] in task 'Stage-9:MAPRED' is a cross 
product
-Warning: Map Join MAPJOIN[58][bigTable=?] in task 'Stage-10:MAPRED' is a cross 
product
 PREHOOK: query: -- explain
 -- select * from smb_bucket_1 a left outer join smb_bucket_2 b on a.key = 
b.key left outer join src c on a.key=c.value
 
@@ -226,14 +230,14 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 51 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (5 = key) (type: boolean)
+              predicate: (key = 5) (type: boolean)
               Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 
-                    1 
+                    0 5 (type: int)
+                    1 5 (type: int)
 
   Stage: Stage-9
     Map Reduce
@@ -250,8 +254,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 
-                    1 
+                    0 5 (type: int)
+                    1 5 (type: int)
                   Statistics: Num rows: 28 Data size: 114 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -276,8 +280,8 @@ STAGE PLANS:
           TableScan
             HashTable Sink Operator
               keys:
-                0 
-                1 
+                0 5 (type: int)
+                1 5 (type: int)
 
   Stage: Stage-6
     Map Reduce
@@ -287,8 +291,8 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               keys:
-                0 
-                1 
+                0 5 (type: int)
+                1 5 (type: int)
               Statistics: Num rows: 31 Data size: 129 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: 5 (type: int), 5 (type: int)
@@ -315,8 +319,8 @@ STAGE PLANS:
           TableScan
             HashTable Sink Operator
               keys:
-                0 
-                1 
+                0 5 (type: int)
+                1 5 (type: int)
 
   Stage: Stage-7
     Map Reduce
@@ -326,8 +330,8 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
               keys:
-                0 
-                1 
+                0 5 (type: int)
+                1 5 (type: int)
               Statistics: Num rows: 31 Data size: 129 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: 5 (type: int), 5 (type: int)
@@ -348,19 +352,23 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             Reduce Output Operator
-              sort order: 
+              key expressions: 5 (type: int)
+              sort order: +
+              Map-reduce partition columns: 5 (type: int)
               Statistics: Num rows: 28 Data size: 114 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             Reduce Output Operator
-              sort order: 
+              key expressions: 5 (type: int)
+              sort order: +
+              Map-reduce partition columns: 5 (type: int)
               Statistics: Num rows: 29 Data size: 118 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
           keys:
-            0 
-            1 
+            0 _col0 (type: int)
+            1 _col0 (type: int)
           Statistics: Num rows: 31 Data size: 129 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: 5 (type: int), 5 (type: int)
@@ -377,11 +385,11 @@ STAGE PLANS:
   Stage: Stage-14
     Map Reduce Local Work
       Alias -> Map Local Tables:
-        $hdt$_1:$hdt$_1:$hdt$_1:b 
+        $hdt$_1:$hdt$_1:b 
           Fetch Operator
             limit: -1
       Alias -> Map Local Operator Tree:
-        $hdt$_1:$hdt$_1:$hdt$_1:b 
+        $hdt$_1:$hdt$_1:b 
           TableScan
             alias: b
             Statistics: Num rows: 51 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
@@ -392,8 +400,8 @@ STAGE PLANS:
                 Statistics: Num rows: 25 Data size: 100 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 
-                    1 
+                    0 5 (type: int)
+                    1 5 (type: int)
 
   Stage: Stage-10
     Map Reduce
@@ -402,7 +410,7 @@ STAGE PLANS:
             alias: d
             Statistics: Num rows: 55 Data size: 222 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (5 = key) (type: boolean)
+              predicate: (key = 5) (type: boolean)
               Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 Statistics: Num rows: 27 Data size: 108 Basic stats: COMPLETE 
Column stats: NONE
@@ -410,8 +418,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 
-                    1 
+                    0 5 (type: int)
+                    1 5 (type: int)
                   Statistics: Num rows: 29 Data size: 118 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
@@ -428,11 +436,6 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[56][bigTable=?] in task 'Stage-7:MAPRED' is a cross 
product
-Warning: Map Join MAPJOIN[48][bigTable=?] in task 'Stage-6:MAPRED' is a cross 
product
-Warning: Shuffle Join JOIN[27][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-2:MAPRED' is a cross product
-Warning: Map Join MAPJOIN[57][bigTable=?] in task 'Stage-9:MAPRED' is a cross 
product
-Warning: Map Join MAPJOIN[58][bigTable=?] in task 'Stage-10:MAPRED' is a cross 
product
 PREHOOK: query: select * from (select a.key from smb_bucket_1 a join 
smb_bucket_2 b on (a.key = b.key) where a.key = 5) t1 left outer join (select 
c.key from smb_bucket_2 c join smb_bucket_3 d on (c.key = d.key) where c.key=5) 
t2 on (t1.key=t2.key) where t2.key=5
 PREHOOK: type: QUERY
 PREHOOK: Input: default@smb_bucket_1

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out
index 26fa5d4..f6fb649 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out
@@ -73,7 +73,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

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out
index 9fc7f93..0dbd4f4 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_4.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

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out 
b/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
index 5e128a3..e8af090 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 4812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 250 Data size: 2406 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 4812 Basic stats: COMPLETE 
Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1263,7 +1263,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 4812 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 250 Data size: 2406 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 4812 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/sort_merge_join_desc_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
index 398e711..9450084 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
@@ -75,7 +75,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 1763 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/sort_merge_join_desc_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
index dc449fd..6d11948 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
@@ -75,7 +75,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 1763 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/sort_merge_join_desc_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
index 09b9622..d814b9d 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
@@ -79,7 +79,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string), value (type: string)
@@ -93,14 +93,14 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 435 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
                 keys:
                   0 key (type: string), value (type: string)
                   1 key (type: string), value (type: string)
-                Statistics: Num rows: 45 Data size: 478 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 182 Data size: 1939 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
index 259d0b3..fd16246 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
@@ -126,7 +126,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/d8ee05ae/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
index aa4e1bf..d66f45a 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
@@ -178,7 +178,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
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -202,7 +202,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
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -210,7 +210,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 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
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
index 863a4d1..f737de1 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
@@ -259,7 +259,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -276,7 +276,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -284,7 +284,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 1100 Data size: 11686 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out 
b/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
index d9c8cdc..2eb3289 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
@@ -196,7 +196,7 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 6312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value2 is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 517 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 2095 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string), value2 (type: string)
@@ -210,14 +210,14 @@ STAGE PLANS:
             Statistics: Num rows: 500 Data size: 10218 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((key is not null and value2 is not null) and (key < 
10)) (type: boolean)
-              Statistics: Num rows: 41 Data size: 837 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 166 Data size: 3392 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
                 keys:
                   0 key (type: string), value2 (type: string)
                   1 key (type: string), value2 (type: string)
-                Statistics: Num rows: 45 Data size: 920 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 182 Data size: 3731 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out 
b/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
index 9cbc411..baa1dcb 100644
--- a/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
+++ b/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
@@ -268,7 +268,7 @@ STAGE PLANS:
                   alias: dept
                   Statistics: Num rows: 6 Data size: 570 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
-                    predicate: (deptid is not null and deptname is not null) 
(type: boolean)
+                    predicate: (deptname is not null and deptid is not null) 
(type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: deptid (type: int), deptname (type: string)
@@ -342,7 +342,7 @@ STAGE PLANS:
                   alias: d
                   Statistics: Num rows: 6 Data size: 570 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
-                    predicate: (deptid is not null and deptname is not null) 
(type: boolean)
+                    predicate: (deptname is not null and deptid is not null) 
(type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: deptid (type: int), deptname (type: string)
@@ -420,7 +420,7 @@ STAGE PLANS:
                   alias: dept
                   Statistics: Num rows: 6 Data size: 570 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
-                    predicate: (deptid is not null and deptname is not null) 
(type: boolean)
+                    predicate: (deptname is not null and deptid is not null) 
(type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: deptid (type: int), deptname (type: string)
@@ -694,7 +694,7 @@ STAGE PLANS:
                   alias: d
                   Statistics: Num rows: 6 Data size: 570 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Filter Operator
-                    predicate: (deptid is not null and deptname is not null) 
(type: boolean)
+                    predicate: (deptname is not null and deptid is not null) 
(type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: deptid (type: int), deptname (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join1.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join1.q.out
index 31eebde..919adec 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join1.q.out
@@ -36,11 +36,11 @@ 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
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
@@ -59,11 +59,11 @@ 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
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -73,14 +73,14 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col2
                         input vertices:
                           1 Map 2
-                        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/spark/auto_join10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join10.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join10.q.out
index 7e814d0..7441838 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join10.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join10.q.out
@@ -31,11 +31,11 @@ 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
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
@@ -56,11 +56,11 @@ 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
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -70,11 +70,11 @@ STAGE PLANS:
                         outputColumnNames: _col1, _col2
                         input vertices:
                           1 Map 3
-                        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: hash(_col1,_col2) (type: int)
                           outputColumnNames: _col0
-                          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
                           Group By Operator
                             aggregations: sum(_col0)
                             mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join12.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
index 1f480bb..3c7877f 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join12.q.out
@@ -36,91 +36,86 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((UDFToDouble(key) < 80.0) and 
(UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
-                    Statistics: Num rows: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: (((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) < 80.0)) and key is not null) (type: boolean)
+                    Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
+                          2 _col0 (type: string)
             Local Work:
               Map Reduce Local Work
-        Map 4 
+        Map 2 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) < 80.0)) (type: boolean)
+                    predicate: (((UDFToDouble(key) < 80.0) and 
(UDFToDouble(key) < 100.0)) and key is not null) (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: key (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
+                          2 _col0 (type: string)
             Local Work:
               Map Reduce Local Work
 
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 3 <- Map 2 (GROUP, 1)
+        Reducer 4 <- Map 3 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
-        Map 2 
+        Map 3 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) < 80.0)) (type: boolean)
-                    Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
+                      expressions: key (type: string), value (type: string)
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
+                             Inner Join 0 to 2
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
-                        outputColumnNames: _col0, _col2
+                          2 _col0 (type: string)
+                        outputColumnNames: _col0, _col3
                         input vertices:
-                          1 Map 4
-                        Statistics: Num rows: 60 Data size: 642 Basic stats: 
COMPLETE Column stats: NONE
-                        Map Join Operator
-                          condition map:
-                               Inner Join 0 to 1
-                          keys:
-                            0 _col0 (type: string)
-                            1 _col0 (type: string)
-                          outputColumnNames: _col1, _col3
-                          input vertices:
-                            0 Map 1
-                          Statistics: Num rows: 66 Data size: 706 Basic stats: 
COMPLETE Column stats: NONE
-                          Select Operator
-                            expressions: hash(_col1,_col3) (type: int)
+                          0 Map 1
+                          1 Map 2
+                        Statistics: Num rows: 365 Data size: 3878 Basic stats: 
COMPLETE Column stats: NONE
+                        Select Operator
+                          expressions: hash(_col0,_col3) (type: int)
+                          outputColumnNames: _col0
+                          Statistics: Num rows: 365 Data size: 3878 Basic 
stats: COMPLETE Column stats: NONE
+                          Group By Operator
+                            aggregations: sum(_col0)
+                            mode: hash
                             outputColumnNames: _col0
-                            Statistics: Num rows: 66 Data size: 706 Basic 
stats: COMPLETE Column stats: NONE
-                            Group By Operator
-                              aggregations: sum(_col0)
-                              mode: hash
-                              outputColumnNames: _col0
+                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                            Reduce Output Operator
+                              sort order: 
                               Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
-                              Reduce Output Operator
-                                sort order: 
-                                Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
-                                value expressions: _col0 (type: bigint)
+                              value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
-        Reducer 3 
+        Reducer 4 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join13.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
index 0ffe9e3..b46de18 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join13.q.out
@@ -55,11 +55,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((UDFToDouble(key) < 200.0) and 
UDFToDouble(key) is not null) (type: boolean)
-                    Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
                           0 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: 
double)
@@ -97,7 +97,7 @@ STAGE PLANS:
                         Statistics: Num rows: 182 Data size: 1939 Basic stats: 
COMPLETE Column stats: NONE
                         Filter Operator
                           predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) 
is not null (type: boolean)
-                          Statistics: Num rows: 91 Data size: 969 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 182 Data size: 1939 Basic 
stats: COMPLETE Column stats: NONE
                           Map Join Operator
                             condition map:
                                  Inner Join 0 to 1
@@ -107,11 +107,11 @@ STAGE PLANS:
                             outputColumnNames: _col1, _col2
                             input vertices:
                               1 Map 4
-                            Statistics: Num rows: 100 Data size: 1065 Basic 
stats: COMPLETE Column stats: NONE
+                            Statistics: Num rows: 200 Data size: 2132 Basic 
stats: COMPLETE Column stats: NONE
                             Select Operator
                               expressions: hash(_col2,_col1) (type: int)
                               outputColumnNames: _col0
-                              Statistics: Num rows: 100 Data size: 1065 Basic 
stats: COMPLETE Column stats: NONE
+                              Statistics: Num rows: 200 Data size: 2132 Basic 
stats: COMPLETE Column stats: NONE
                               Group By Operator
                                 aggregations: sum(_col0)
                                 mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join15.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join15.q.out
index 5b1234f..72598ae 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join15.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join15.q.out
@@ -31,7 +31,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
                     Spark HashTable Sink Operator
                       keys:
                         0 key (type: string)
@@ -53,7 +53,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
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
@@ -63,15 +63,15 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col5, _col6
                       input vertices:
                         1 Map 4
-                      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: string), _col1 (type: 
string), _col5 (type: string), _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: string), _col1 (type: 
string), _col2 (type: string), _col3 (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
             Local Work:
               Map Reduce Local Work
         Reducer 2 
@@ -79,7 +79,7 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: string), 
KEY.reducesinkkey1 (type: string), KEY.reducesinkkey2 (type: string), 
KEY.reducesinkkey3 (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
                 Group By Operator
                   aggregations: sum(hash(_col0,_col1,_col2,_col3))
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join16.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
index 5c4bbb3..6da1c50 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join16.q.out
@@ -30,12 +30,12 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((((UDFToDouble(value) < 200.0) and 
(UDFToDouble(key) > 10.0)) and (UDFToDouble(key) > 20.0)) and key is not null) 
and value is not null) (type: boolean)
-                    Statistics: Num rows: 5 Data size: 53 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: (((((UDFToDouble(value) < 200.0) and 
(UDFToDouble(key) > 20.0)) and (UDFToDouble(key) > 10.0)) and key is not null) 
and value is not null) (type: boolean)
+                    Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 5 Data size: 53 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string), _col1 (type: string)
@@ -56,11 +56,11 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (((((UDFToDouble(key) > 10.0) and 
(UDFToDouble(key) > 20.0)) and (UDFToDouble(value) < 200.0)) and key is not 
null) and value is not null) (type: boolean)
-                    Statistics: Num rows: 5 Data size: 53 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string), value (type: string)
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 5 Data size: 53 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 18 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -70,11 +70,11 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col3
                         input vertices:
                           1 Map 3
-                        Statistics: Num rows: 5 Data size: 58 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 19 Data size: 210 Basic stats: 
COMPLETE Column stats: NONE
                         Select Operator
                           expressions: hash(_col0,_col3) (type: int)
                           outputColumnNames: _col0
-                          Statistics: Num rows: 5 Data size: 58 Basic stats: 
COMPLETE Column stats: NONE
+                          Statistics: Num rows: 19 Data size: 210 Basic stats: 
COMPLETE Column stats: NONE
                           Group By Operator
                             aggregations: sum(_col0)
                             mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/spark/auto_join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join17.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join17.q.out
index bc492c9..4a93678 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join17.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join17.q.out
@@ -32,11 +32,11 @@ 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
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
@@ -55,11 +55,11 @@ 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
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -69,14 +69,14 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col1, _col2, _col3
                         input vertices:
                           1 Map 2
-                        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), _col1 
(type: string), UDFToInteger(_col2) (type: int), _col3 (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
                           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/spark/auto_join19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join19.q.out 
b/ql/src/test/results/clientpositive/spark/auto_join19.q.out
index 9e4fb8f..88ef3f1 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join19.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join19.q.out
@@ -34,11 +34,11 @@ 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
                       Spark HashTable Sink Operator
                         keys:
                           0 _col0 (type: string)
@@ -57,11 +57,11 @@ STAGE PLANS:
                   Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1000 Data size: 10624 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         condition map:
                              Inner Join 0 to 1
@@ -71,14 +71,14 @@ STAGE PLANS:
                         outputColumnNames: _col0, _col4
                         input vertices:
                           1 Map 2
-                        Statistics: Num rows: 1100 Data size: 11686 Basic 
stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
                         Select Operator
                           expressions: UDFToInteger(_col0) (type: int), _col4 
(type: string)
                           outputColumnNames: _col0, _col1
-                          Statistics: Num rows: 1100 Data size: 11686 Basic 
stats: COMPLETE Column stats: NONE
+                          Statistics: Num rows: 2200 Data size: 23372 Basic 
stats: COMPLETE Column stats: NONE
                           File Output Operator
                             compressed: false
-                            Statistics: Num rows: 1100 Data size: 11686 Basic 
stats: COMPLETE Column stats: NONE
+                            Statistics: Num rows: 2200 Data size: 23372 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