http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
index 55b763b..44466b8 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
@@ -97,11 +97,11 @@ STAGE PLANS:
             Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -115,11 +115,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -177,11 +177,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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)
@@ -195,11 +195,11 @@ STAGE PLANS:
             Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -237,11 +237,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -380,11 +380,11 @@ STAGE PLANS:
             Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -398,11 +398,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -460,11 +460,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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)
@@ -478,11 +478,11 @@ STAGE PLANS:
             Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -520,11 +520,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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/bucketsortoptimize_insert_6.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
index b30d90c..a7ad04c 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
@@ -85,12 +85,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -224,12 +224,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -376,12 +376,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -394,12 +394,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -456,12 +456,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -474,12 +474,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -516,12 +516,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -597,12 +597,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -615,12 +615,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -677,12 +677,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -695,12 +695,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -737,12 +737,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -811,12 +811,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -968,12 +968,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Sorted Merge Bucket Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1148,12 +1148,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -1166,12 +1166,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1228,12 +1228,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int), _col1 (type: int)
@@ -1246,12 +1246,12 @@ STAGE PLANS:
             alias: b
             Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1288,12 +1288,12 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key is not null and key2 is not null) (type: boolean)
-              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key2 is not null and key is not null) (type: boolean)
+              Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), key2 (type: int), value (type: 
string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 91 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/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
index a893147..326e4d6 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
@@ -86,11 +86,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key = 0) or (key = 5)) and 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -220,11 +220,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key = 0) or (key = 5)) and 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -360,11 +360,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and ((key = 0) or (key = 5))) and 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: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
                 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/bucketsortoptimize_insert_8.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
index e498500..6c4a077 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
@@ -84,11 +84,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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
@@ -217,11 +217,11 @@ 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
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
-                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/cbo_rp_auto_join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
index 59a2f12..5c09fe0 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join1.q.out
@@ -88,7 +88,8 @@ select count(*) from (
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
+  Stage-2 depends on stages: Stage-1
+  Stage-0 depends on stages: Stage-2
 
 STAGE PLANS:
   Stage: Stage-1
@@ -104,27 +105,90 @@ STAGE PLANS:
                 expressions: key (type: int)
                 outputColumnNames: key
                 Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Sorted Merge Bucket Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 key (type: int)
-                    1 key (type: int)
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
-                    Group By Operator
-                      aggregations: count()
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        sort order: 
-                        value expressions: _col0 (type: bigint)
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
+          TableScan
+            alias: subq1:b
+            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: key
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+          keys:
+            0 key (type: int)
+            1 key (type: int)
+          outputColumnNames: $f1, $f10
+          Statistics: Num rows: 6 Data size: 96 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Select Operator
+            expressions: ($f1 * $f10) (type: bigint)
+            outputColumnNames: $f4
+            Statistics: Num rows: 6 Data size: 48 Basic stats: COMPLETE Column 
stats: COMPLETE
+            Group By Operator
+              aggregations: $sum0($f4)
+              mode: hash
+              outputColumnNames: _col0
+              Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
+              File Output Operator
+                compressed: false
+                table:
+                    input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
+                    output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                    serde: 
org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+
+  Stage: Stage-2
+    Map Reduce
+      Map Operator Tree:
+          TableScan
+            Reduce Output Operator
+              sort order: 
+              Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
+              value expressions: _col0 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations: count(VALUE._col0)
+          aggregations: $sum0(VALUE._col0)
           mode: mergepartial
           outputColumnNames: $f0
+          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
           File Output Operator
             compressed: false
+            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -192,34 +256,59 @@ STAGE PLANS:
                 expressions: key (type: int)
                 outputColumnNames: key
                 Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Sorted Merge Bucket Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 key (type: int)
-                    1 key (type: int)
-                  outputColumnNames: key
+                Group By Operator
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
-                    expressions: key (type: int)
+                    expressions: _col0 (type: int)
                     outputColumnNames: key
-                    Group By Operator
-                      keys: key (type: int)
-                      mode: hash
-                      outputColumnNames: _col0
-                      Reduce Output Operator
-                        key expressions: _col0 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: int)
+                    Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
+          TableScan
+            alias: subq2:subq1:b
+            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: key
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Group By Operator
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0
+                  Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: int)
+                    outputColumnNames: key
+                    Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
       Reduce Operator Tree:
-        Group By Operator
-          keys: KEY._col0 (type: int)
-          mode: mergepartial
-          outputColumnNames: key
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+          keys:
+            0 key (type: int)
+            1 key (type: int)
+          Statistics: Num rows: 6 Data size: 0 Basic stats: PARTIAL Column 
stats: COMPLETE
           Select Operator
+            Statistics: Num rows: 6 Data size: 0 Basic stats: PARTIAL Column 
stats: COMPLETE
             Group By Operator
               aggregations: count()
               mode: hash
               outputColumnNames: _col0
+              Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
               File Output Operator
                 compressed: false
                 table:
@@ -233,14 +322,17 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
+              Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
               value expressions: _col0 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
           aggregations: count(VALUE._col0)
           mode: mergepartial
           outputColumnNames: $f0
+          Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
           File Output Operator
             compressed: false
+            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -316,17 +408,16 @@ join
 on src1.key = src2.key
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1, Stage-4
-  Stage-4 is a root stage
-  Stage-0 depends on stages: Stage-2
+  Stage-3 is a root stage
+  Stage-1 depends on stages: Stage-3
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-1
+  Stage: Stage-3
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2:subq2:a
+            alias: src1:subq1:a
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -335,32 +426,57 @@ STAGE PLANS:
                 expressions: key (type: int)
                 outputColumnNames: key
                 Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Sorted Merge Bucket Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 key (type: int)
-                    1 key (type: int)
-                  outputColumnNames: key
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Select Operator
-                    expressions: key (type: int)
-                    outputColumnNames: key
-                    Group By Operator
-                      aggregations: count()
-                      keys: key (type: int)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
-                      Reduce Output Operator
-                        key expressions: _col0 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: int)
-                        value expressions: _col1 (type: bigint)
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
+          TableScan
+            alias: src1:subq1:b
+            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: key
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
       Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: int)
-          mode: mergepartial
-          outputColumnNames: key, $f1
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+          keys:
+            0 key (type: int)
+            1 key (type: int)
+          outputColumnNames: key, $f1, $f10
+          Statistics: Num rows: 6 Data size: 120 Basic stats: COMPLETE Column 
stats: COMPLETE
           File Output Operator
             compressed: false
             table:
@@ -368,85 +484,91 @@ STAGE PLANS:
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-2
+  Stage: Stage-1
     Map Reduce
       Map Operator Tree:
           TableScan
-            Reduce Output Operator
-              key expressions: key (type: int)
-              sort order: +
-              Map-reduce partition columns: key (type: int)
-              value expressions: $f1 (type: bigint)
+            alias: src2:subq2:a
+            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: key
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
+          TableScan
+            alias: src2:subq2:b
+            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+            Filter Operator
+              predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Select Operator
+                expressions: key (type: int)
+                outputColumnNames: key
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Group By Operator
+                  aggregations: count()
+                  keys: key (type: int)
+                  mode: final
+                  outputColumnNames: _col0, _col1
+                  Statistics: Num rows: 6 Data size: 72 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Select Operator
+                    expressions: _col0 (type: int), _col1 (type: bigint)
+                    outputColumnNames: key, $f1
+                    Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      key expressions: key (type: int)
+                      sort order: +
+                      Map-reduce partition columns: key (type: int)
+                      Statistics: Num rows: 6 Data size: 72 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      value expressions: $f1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: key (type: int)
               sort order: +
               Map-reduce partition columns: key (type: int)
-              value expressions: $f1 (type: bigint)
+              Statistics: Num rows: 6 Data size: 120 Basic stats: COMPLETE 
Column stats: COMPLETE
+              value expressions: $f1 (type: bigint), $f10 (type: bigint)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Inner Join 0 to 1
+               Inner Join 0 to 2
           keys:
             0 key (type: int)
             1 key (type: int)
-          outputColumnNames: key, $f1, $f10
+            2 key (type: int)
+          outputColumnNames: key, $f1, $f10, $f11, $f100
+          Statistics: Num rows: 6 Data size: 216 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: key (type: int), $f10 (type: bigint), $f1 (type: 
bigint)
+            expressions: key (type: int), ($f11 * $f100) (type: bigint), ($f1 
* $f10) (type: bigint)
             outputColumnNames: key, cnt1, cnt11
+            Statistics: Num rows: 6 Data size: 120 Basic stats: COMPLETE 
Column stats: COMPLETE
             File Output Operator
               compressed: false
+              Statistics: Num rows: 6 Data size: 120 Basic stats: COMPLETE 
Column stats: COMPLETE
               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
 
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: src1:subq1:a
-            Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-            Filter Operator
-              predicate: key is not null (type: boolean)
-              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-              Select Operator
-                expressions: key (type: int)
-                outputColumnNames: key
-                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
-                Sorted Merge Bucket Map Join Operator
-                  condition map:
-                       Inner Join 0 to 1
-                  keys:
-                    0 key (type: int)
-                    1 key (type: int)
-                  outputColumnNames: key
-                  Select Operator
-                    expressions: key (type: int)
-                    outputColumnNames: key
-                    Group By Operator
-                      aggregations: count()
-                      keys: key (type: int)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
-                      Reduce Output Operator
-                        key expressions: _col0 (type: int)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: int)
-                        value expressions: _col1 (type: bigint)
-      Reduce Operator Tree:
-        Group By Operator
-          aggregations: count(VALUE._col0)
-          keys: KEY._col0 (type: int)
-          mode: mergepartial
-          outputColumnNames: key, $f1
-          File Output Operator
-            compressed: false
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
-
   Stage: Stage-0
     Fetch Operator
       limit: -1
@@ -624,7 +746,7 @@ STAGE PLANS:
             alias: subq2:subq1:a
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 expressions: key (type: int)
@@ -745,7 +867,7 @@ STAGE PLANS:
             alias: subq2:subq1:a
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 expressions: key (type: int)
@@ -947,22 +1069,22 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
               predicate: (key + 1) is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 expressions: (key + 1) (type: int)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: key (type: int)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 2 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 5 Data size: 60 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -970,7 +1092,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: mergepartial
           outputColumnNames: key, $f1
-          Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE Column 
stats: COMPLETE
           File Output Operator
             compressed: false
             table:
@@ -986,14 +1108,14 @@ STAGE PLANS:
               key expressions: key (type: int)
               sort order: +
               Map-reduce partition columns: key (type: int)
-              Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE 
Column stats: COMPLETE
               value expressions: $f1 (type: bigint)
           TableScan
             Reduce Output Operator
               key expressions: key (type: int)
               sort order: +
               Map-reduce partition columns: key (type: int)
-              Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE 
Column stats: COMPLETE
               value expressions: $f1 (type: bigint)
       Reduce Operator Tree:
         Join Operator
@@ -1003,11 +1125,11 @@ STAGE PLANS:
             0 key (type: int)
             1 key (type: int)
           outputColumnNames: $f1, $f10
-          Statistics: Num rows: 1 Data size: 16 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 4 Data size: 64 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
             expressions: ($f1 * $f10) (type: bigint)
             outputColumnNames: $f4
-            Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column 
stats: COMPLETE
+            Statistics: Num rows: 4 Data size: 32 Basic stats: COMPLETE Column 
stats: COMPLETE
             Group By Operator
               aggregations: $sum0($f4)
               mode: hash
@@ -1050,22 +1172,22 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
               predicate: (key + 1) is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
+              Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 expressions: (key + 1) (type: int)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE 
Column stats: COMPLETE
+                Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Group By Operator
                   aggregations: count()
                   keys: key (type: int)
                   mode: hash
                   outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: int)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: int)
-                    Statistics: Num rows: 2 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 5 Data size: 60 Basic stats: 
COMPLETE Column stats: COMPLETE
                     value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
@@ -1073,7 +1195,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: mergepartial
           outputColumnNames: key, $f1
-          Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE Column 
stats: COMPLETE
+          Statistics: Num rows: 5 Data size: 60 Basic stats: COMPLETE Column 
stats: COMPLETE
           File Output Operator
             compressed: false
             table:
@@ -1328,7 +1450,7 @@ STAGE PLANS:
             alias: a:subq2:subq1:a
             Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
-              predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              predicate: ((key < 8) and (key < 6)) (type: boolean)
               Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 expressions: key (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/d8ee05ae/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
index 351699d..b296280 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_auto_join17.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_auto_join17.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: key, value
-                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: string)
@@ -52,11 +52,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: key, value
-                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
@@ -64,14 +64,14 @@ STAGE PLANS:
                     0 key (type: string)
                     1 key (type: string)
                   outputColumnNames: key, value, key0, value0
-                  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(key) (type: int), value (type: 
string), UDFToInteger(key0) (type: int), value0 (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/cbo_rp_cross_product_check_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
index a8080b6..62b611b 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_cross_product_check_2.q.out
@@ -132,11 +132,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: key, value
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 key (type: string)
@@ -150,11 +150,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: key, value
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -162,7 +162,7 @@ STAGE PLANS:
                     0 key (type: string)
                     1 key (type: string)
                   outputColumnNames: key, value, key0, value0
-                  Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -187,7 +187,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[26][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[25][bigTable=?] in task 'Stage-5:MAPRED' is a cross 
product
 PREHOOK: query: explain select * from A join 
          (select d1.key 
           from B d1 join B d2 on d1.key = d2.key 
@@ -219,11 +219,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 key (type: string)
@@ -237,11 +237,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -249,21 +249,21 @@ STAGE PLANS:
                     0 key (type: string)
                     1 key (type: string)
                   outputColumnNames: key
-                  Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 11 Data size: 105 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: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -271,7 +271,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: key
-          Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -454,9 +454,9 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[44][bigTable=?] in task 'Stage-7:MAPRED' is a cross 
product
-Warning: Map Join MAPJOIN[37][bigTable=?] in task 'Stage-6:MAPRED' is a cross 
product
-Warning: Shuffle Join JOIN[21][tables = [, ]] in Stage 'Stage-2:MAPRED' is a 
cross product
+Warning: Map Join MAPJOIN[43][bigTable=?] in task 'Stage-7:MAPRED' is a cross 
product
+Warning: Map Join MAPJOIN[36][bigTable=?] in task 'Stage-6:MAPRED' is a cross 
product
+Warning: Shuffle Join JOIN[20][tables = [, ]] in Stage 'Stage-2:MAPRED' is a 
cross product
 PREHOOK: query: explain select * from 
 (select A.key from A group by key) ss join 
 (select d1.key from B d1 join B d2 on d1.key = d2.key where 1 = 1 group by 
d1.key) od1
@@ -597,7 +597,7 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: key (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -629,11 +629,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 key (type: string)
@@ -647,11 +647,11 @@ STAGE PLANS:
             Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: key
-                Statistics: Num rows: 5 Data size: 48 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 10 Data size: 96 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -659,21 +659,21 @@ STAGE PLANS:
                     0 key (type: string)
                     1 key (type: string)
                   outputColumnNames: key
-                  Statistics: Num rows: 5 Data size: 52 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: key
-                    Statistics: Num rows: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 11 Data size: 105 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: 5 Data size: 52 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 11 Data size: 105 Basic stats: 
COMPLETE Column stats: NONE
       Local Work:
         Map Reduce Local Work
       Reduce Operator Tree:
@@ -681,7 +681,7 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: key
-          Statistics: Num rows: 2 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 5 Data size: 47 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:

Reply via email to