hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject [14/16] hive git commit: HIVE-16230 : Enable CBO in presence of hints (Pengcheng Xiong via Ashutosh Chauhan)
Date Mon, 20 Mar 2017 23:33:50 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/join_reorder4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join_reorder4.q.out b/ql/src/test/results/clientpositive/join_reorder4.q.out
index c41407f..bbc1d86 100644
--- a/ql/src/test/results/clientpositive/join_reorder4.q.out
+++ b/ql/src/test/results/clientpositive/join_reorder4.q.out
@@ -51,78 +51,71 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ STREAMTABLE(a) */ a.*, b.*, c.* from T1 a join T2 b on a.key1=b.key2 join T3 c on a.key1=c.key3
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-0 depends on stages: Stage-4
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        a 
-          Fetch Operator
-            limit: -1
-        c 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        a 
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key1 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-        c 
-          TableScan
-            alias: c
-            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: key3 is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
+              Reduce Output Operator
+                key expressions: key1 (type: string)
+                sort order: +
+                Map-reduce partition columns: key1 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key2 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                     Inner Join 0 to 2
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
-                Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                    table:
-                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-      Local Work:
-        Map Reduce Local Work
+              Reduce Output Operator
+                key expressions: key2 (type: string)
+                sort order: +
+                Map-reduce partition columns: key2 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val2 (type: string)
+          TableScan
+            alias: c
+            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              predicate: key3 is not null (type: boolean)
+              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+              Reduce Output Operator
+                key expressions: key3 (type: string)
+                sort order: +
+                Map-reduce partition columns: key3 (type: string)
+                Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val3 (type: string)
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+               Inner Join 0 to 2
+          keys:
+            0 key1 (type: string)
+            1 key2 (type: string)
+            2 key3 (type: string)
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
+          Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+            Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -148,78 +141,71 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ STREAMTABLE(b) */ a.*, b.*, c.* from T1 a join T2 b on a.key1=b.key2 join T3 c on a.key1=c.key3
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-0 depends on stages: Stage-4
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        a 
-          Fetch Operator
-            limit: -1
-        c 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        a 
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key1 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-        c 
-          TableScan
-            alias: c
-            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: key3 is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
+              Reduce Output Operator
+                key expressions: key1 (type: string)
+                sort order: +
+                Map-reduce partition columns: key1 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key2 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                     Inner Join 0 to 2
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
-                Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                    table:
-                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-      Local Work:
-        Map Reduce Local Work
+              Reduce Output Operator
+                key expressions: key2 (type: string)
+                sort order: +
+                Map-reduce partition columns: key2 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val2 (type: string)
+          TableScan
+            alias: c
+            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              predicate: key3 is not null (type: boolean)
+              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+              Reduce Output Operator
+                key expressions: key3 (type: string)
+                sort order: +
+                Map-reduce partition columns: key3 (type: string)
+                Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val3 (type: string)
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+               Inner Join 0 to 2
+          keys:
+            0 key1 (type: string)
+            1 key2 (type: string)
+            2 key3 (type: string)
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
+          Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+            Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator
@@ -245,78 +231,71 @@ PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ STREAMTABLE(c) */ a.*, b.*, c.* from T1 a join T2 b on a.key1=b.key2 join T3 c on a.key1=c.key3
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-0 depends on stages: Stage-4
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce Local Work
-      Alias -> Map Local Tables:
-        a 
-          Fetch Operator
-            limit: -1
-        c 
-          Fetch Operator
-            limit: -1
-      Alias -> Map Local Operator Tree:
-        a 
+  Stage: Stage-1
+    Map Reduce
+      Map Operator Tree:
           TableScan
             alias: a
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key1 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-        c 
-          TableScan
-            alias: c
-            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-            Filter Operator
-              predicate: key3 is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
-              HashTable Sink Operator
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
+              Reduce Output Operator
+                key expressions: key1 (type: string)
+                sort order: +
+                Map-reduce partition columns: key1 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val1 (type: string)
           TableScan
             alias: b
             Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
             Filter Operator
               predicate: key2 is not null (type: boolean)
               Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
-              Map Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                     Inner Join 0 to 2
-                keys:
-                  0 key1 (type: string)
-                  1 key2 (type: string)
-                  2 key3 (type: string)
-                outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
-                Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
-                  outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-                  Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
-                    table:
-                        input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-      Local Work:
-        Map Reduce Local Work
+              Reduce Output Operator
+                key expressions: key2 (type: string)
+                sort order: +
+                Map-reduce partition columns: key2 (type: string)
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val2 (type: string)
+          TableScan
+            alias: c
+            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+            Filter Operator
+              predicate: key3 is not null (type: boolean)
+              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+              Reduce Output Operator
+                key expressions: key3 (type: string)
+                sort order: +
+                Map-reduce partition columns: key3 (type: string)
+                Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column stats: NONE
+                value expressions: val3 (type: string)
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Inner Join 0 to 1
+               Inner Join 0 to 2
+          keys:
+            0 key1 (type: string)
+            1 key2 (type: string)
+            2 key3 (type: string)
+          outputColumnNames: _col0, _col1, _col5, _col6, _col10, _col11
+          Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), _col5 (type: string), _col6 (type: string), _col10 (type: string), _col11 (type: string)
+            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+            Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 2 Data size: 66 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
index 93efa3c..66fb142 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
@@ -54,36 +54,44 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: unknown
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: b
-                  Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (key is not null and (ds = '2008-04-08')) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    predicate: ((ds = '2008-04-08') and key is not null) (type: boolean)
+                    Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: unknown
         Reducer 2 
@@ -94,13 +102,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 1
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -178,36 +186,44 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: unknown
         Map 3 
             Map Operator Tree:
                 TableScan
                   alias: b
-                  Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: false
-                    predicate: (key is not null and (ds = '2008-04-08')) (type: boolean)
-                    Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    predicate: ((ds = '2008-04-08') and key is not null) (type: boolean)
+                    Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: PARTIAL
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 1 Data size: 94 Basic stats: COMPLETE Column stats: PARTIAL
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: unknown
         Reducer 2 
@@ -218,13 +234,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 1
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -396,15 +412,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -468,15 +488,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -540,13 +564,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col6
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 1
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col6 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -754,15 +778,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -826,15 +854,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -898,13 +930,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col6
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 1
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col6 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
index cea632b..d71a575 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
@@ -124,15 +124,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -198,15 +202,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -270,13 +278,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 0
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -488,15 +496,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -562,15 +574,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -634,13 +650,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 0
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -869,15 +885,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -943,15 +963,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 58 Data size: 6588 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 58 Data size: 6588 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 58 Data size: 6588 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -1064,13 +1088,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 1
                 Statistics: Num rows: 63 Data size: 7246 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 63 Data size: 7246 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
index 4aa0e0e..1bc8ff4 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
@@ -148,15 +148,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -222,15 +226,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -294,13 +302,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col4
                 Position of Big Table: 1
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col4 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -512,15 +520,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 29 Data size: 3294 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -586,15 +598,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 55 Data size: 6252 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -658,13 +674,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col7
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col4
                 Position of Big Table: 1
                 Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col7 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col4 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 60 Data size: 6877 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
index 21ce1f8..c50d3e6 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
@@ -148,15 +148,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -220,15 +224,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -290,13 +298,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col6
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 0
                 Statistics: Num rows: 28 Data size: 3025 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col6 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 28 Data size: 3025 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator
@@ -496,15 +504,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 0
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 0
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -568,15 +580,19 @@ STAGE PLANS:
                     isSamplingPred: false
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: key (type: int)
-                      null sort order: a
-                      sort order: +
-                      Map-reduce partition columns: key (type: int)
+                    Select Operator
+                      expressions: key (type: int), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
-                      tag: 1
-                      value expressions: value (type: string)
-                      auto parallelism: true
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        null sort order: a
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 26 Data size: 2750 Basic stats: COMPLETE Column stats: NONE
+                        tag: 1
+                        value expressions: _col1 (type: string)
+                        auto parallelism: true
             Execution mode: llap
             LLAP IO: no inputs
             Path -> Alias:
@@ -638,13 +654,13 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 key (type: int)
-                  1 key (type: int)
-                outputColumnNames: _col0, _col1, _col6
+                  0 _col0 (type: int)
+                  1 _col0 (type: int)
+                outputColumnNames: _col0, _col1, _col3
                 Position of Big Table: 0
                 Statistics: Num rows: 28 Data size: 3025 Basic stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: int), _col1 (type: string), _col6 (type: string)
+                  expressions: _col0 (type: int), _col1 (type: string), _col3 (type: string)
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 28 Data size: 3025 Basic stats: COMPLETE Column stats: NONE
                   File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/42181575/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
index 53839a3..e806ef3 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_1.q.out
@@ -5471,7 +5471,7 @@ FROM T1 a JOIN T2 b ON a.key = b.key
           JOIN T3 c ON b.key = c.key
           JOIN T4 d ON c.key = d.key
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 1 <- Map 2 (BROADCAST_EDGE), Map 3 (BROADCAST_EDGE), Map 4 (BROADCAST_EDGE)
@@ -5481,33 +5481,39 @@ Stage-0
     limit:-1
     Stage-1
       Map 1 llap
-      File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=3 width=33)
-          Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-          Map Join Operator [MAPJOIN_31] (rows=3 width=33)
-            Conds:FIL_27.key=RS_7.key(Inner),RS_7.key=RS_9.key(Inner),RS_9.key=RS_11.key(Inner),Output:["_col0","_col1","_col5","_col6","_col10","_col11","_col15","_col16"]
-          <-Map 2 [BROADCAST_EDGE] llap
-            BROADCAST [RS_7]
-              PartitionCols:key
-              Filter Operator [FIL_28] (rows=1 width=30)
+      File Output Operator [FS_18]
+        Map Join Operator [MAPJOIN_35] (rows=3 width=33)
+          Conds:SEL_2._col0=RS_13._col0(Inner),RS_13._col0=RS_14._col0(Inner),RS_14._col0=RS_15._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
+        <-Map 2 [BROADCAST_EDGE] llap
+          BROADCAST [RS_13]
+            PartitionCols:_col0
+            Select Operator [SEL_5] (rows=1 width=30)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_32] (rows=1 width=30)
                 predicate:key is not null
-                TableScan [TS_1] (rows=1 width=30)
+                TableScan [TS_3] (rows=1 width=30)
                   default@t2,b,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Map 3 [BROADCAST_EDGE] llap
-            BROADCAST [RS_9]
-              PartitionCols:key
-              Filter Operator [FIL_29] (rows=1 width=20)
+        <-Map 3 [BROADCAST_EDGE] llap
+          BROADCAST [RS_14]
+            PartitionCols:_col0
+            Select Operator [SEL_8] (rows=1 width=20)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_33] (rows=1 width=20)
                 predicate:key is not null
-                TableScan [TS_2] (rows=1 width=20)
+                TableScan [TS_6] (rows=1 width=20)
                   default@t3,c,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Map 4 [BROADCAST_EDGE] llap
-            BROADCAST [RS_11]
-              PartitionCols:key
-              Filter Operator [FIL_30] (rows=1 width=30)
+        <-Map 4 [BROADCAST_EDGE] llap
+          BROADCAST [RS_15]
+            PartitionCols:_col0
+            Select Operator [SEL_11] (rows=1 width=30)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_34] (rows=1 width=30)
                 predicate:key is not null
-                TableScan [TS_3] (rows=1 width=30)
+                TableScan [TS_9] (rows=1 width=30)
                   default@t4,d,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Filter Operator [FIL_27] (rows=1 width=30)
+        <-Select Operator [SEL_2] (rows=1 width=30)
+            Output:["_col0","_col1"]
+            Filter Operator [FIL_31] (rows=1 width=30)
               predicate:key is not null
               TableScan [TS_0] (rows=1 width=30)
                 default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
@@ -5524,7 +5530,7 @@ FROM T1 a JOIN T2 b ON a.key = b.key
           JOIN T3 c ON b.key = c.key
           JOIN T4 d ON c.key = d.key
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 1 <- Map 2 (BROADCAST_EDGE), Map 3 (BROADCAST_EDGE), Map 4 (BROADCAST_EDGE)
@@ -5534,33 +5540,39 @@ Stage-0
     limit:-1
     Stage-1
       Map 1 llap
-      File Output Operator [FS_14]
-        Select Operator [SEL_13] (rows=3 width=33)
-          Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-          Map Join Operator [MAPJOIN_31] (rows=3 width=33)
-            Conds:FIL_27.key=RS_7.key(Inner),RS_7.key=RS_9.key(Inner),RS_9.key=RS_11.key(Inner),Output:["_col0","_col1","_col5","_col6","_col10","_col11","_col15","_col16"]
-          <-Map 2 [BROADCAST_EDGE] llap
-            BROADCAST [RS_7]
-              PartitionCols:key
-              Filter Operator [FIL_28] (rows=1 width=30)
+      File Output Operator [FS_18]
+        Map Join Operator [MAPJOIN_35] (rows=3 width=33)
+          Conds:SEL_2._col0=RS_13._col0(Inner),RS_13._col0=RS_14._col0(Inner),RS_14._col0=RS_15._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
+        <-Map 2 [BROADCAST_EDGE] llap
+          BROADCAST [RS_13]
+            PartitionCols:_col0
+            Select Operator [SEL_5] (rows=1 width=30)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_32] (rows=1 width=30)
                 predicate:key is not null
-                TableScan [TS_1] (rows=1 width=30)
+                TableScan [TS_3] (rows=1 width=30)
                   default@t2,b,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Map 3 [BROADCAST_EDGE] llap
-            BROADCAST [RS_9]
-              PartitionCols:key
-              Filter Operator [FIL_29] (rows=1 width=20)
+        <-Map 3 [BROADCAST_EDGE] llap
+          BROADCAST [RS_14]
+            PartitionCols:_col0
+            Select Operator [SEL_8] (rows=1 width=20)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_33] (rows=1 width=20)
                 predicate:key is not null
-                TableScan [TS_2] (rows=1 width=20)
+                TableScan [TS_6] (rows=1 width=20)
                   default@t3,c,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Map 4 [BROADCAST_EDGE] llap
-            BROADCAST [RS_11]
-              PartitionCols:key
-              Filter Operator [FIL_30] (rows=1 width=30)
+        <-Map 4 [BROADCAST_EDGE] llap
+          BROADCAST [RS_15]
+            PartitionCols:_col0
+            Select Operator [SEL_11] (rows=1 width=30)
+              Output:["_col0","_col1"]
+              Filter Operator [FIL_34] (rows=1 width=30)
                 predicate:key is not null
-                TableScan [TS_3] (rows=1 width=30)
+                TableScan [TS_9] (rows=1 width=30)
                   default@t4,d,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-          <-Filter Operator [FIL_27] (rows=1 width=30)
+        <-Select Operator [SEL_2] (rows=1 width=30)
+            Output:["_col0","_col1"]
+            Filter Operator [FIL_31] (rows=1 width=30)
               predicate:key is not null
               TableScan [TS_0] (rows=1 width=30)
                 default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
@@ -5569,7 +5581,7 @@ PREHOOK: query: explain FROM T1 a JOIN src c ON c.key+1=a.key select /*+ STREAMT
 PREHOOK: type: QUERY
 POSTHOOK: query: explain FROM T1 a JOIN src c ON c.key+1=a.key select /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key))
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 2 <- Map 1 (BROADCAST_EDGE)
@@ -5581,29 +5593,35 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 4 llap
-      File Output Operator [FS_13]
-        Group By Operator [GBY_11] (rows=1 width=24)
+      File Output Operator [FS_16]
+        Group By Operator [GBY_14] (rows=1 width=24)
           Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
         <-Reducer 3 [CUSTOM_SIMPLE_EDGE] llap
-          PARTITION_ONLY_SHUFFLE [RS_10]
-            Group By Operator [GBY_9] (rows=1 width=24)
+          PARTITION_ONLY_SHUFFLE [RS_13]
+            Group By Operator [GBY_12] (rows=1 width=24)
               Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             <-Map 2 [CUSTOM_SIMPLE_EDGE] llap
-              PARTITION_ONLY_SHUFFLE [RS_8]
+              PARTITION_ONLY_SHUFFLE [RS_11]
                 PartitionCols:rand()
-                Map Join Operator [MAPJOIN_18] (rows=550 width=87)
-                  Conds:RS_3.UDFToDouble(key)=FIL_17.(key + 1)(Inner),Output:["_col0","_col1","_col5"]
-                <-Map 1 [BROADCAST_EDGE] llap
-                  BROADCAST [RS_3]
-                    PartitionCols:UDFToDouble(key)
-                    Filter Operator [FIL_16] (rows=1 width=30)
-                      predicate:UDFToDouble(key) is not null
-                      TableScan [TS_0] (rows=1 width=30)
-                        default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-                <-Filter Operator [FIL_17] (rows=500 width=87)
-                    predicate:(key + 1) is not null
-                    TableScan [TS_1] (rows=500 width=87)
-                      default@src,c,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
+                Select Operator [SEL_9] (rows=550 width=87)
+                  Output:["_col0","_col1","_col2"]
+                  Map Join Operator [MAPJOIN_21] (rows=550 width=87)
+                    Conds:RS_6.UDFToDouble(_col0)=SEL_5.(UDFToDouble(_col0) + 1.0)(Inner),Output:["_col0","_col1","_col2"]
+                  <-Map 1 [BROADCAST_EDGE] llap
+                    BROADCAST [RS_6]
+                      PartitionCols:UDFToDouble(_col0)
+                      Select Operator [SEL_2] (rows=1 width=30)
+                        Output:["_col0","_col1"]
+                        Filter Operator [FIL_19] (rows=1 width=30)
+                          predicate:key is not null
+                          TableScan [TS_0] (rows=1 width=30)
+                            default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
+                  <-Select Operator [SEL_5] (rows=500 width=87)
+                      Output:["_col0"]
+                      Filter Operator [FIL_20] (rows=500 width=87)
+                        predicate:key is not null
+                        TableScan [TS_3] (rows=500 width=87)
+                          default@src,c,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: FROM T1 a JOIN src c ON c.key+1=a.key select /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key))
 PREHOOK: type: QUERY
@@ -5666,7 +5684,7 @@ PREHOOK: query: explain select /*+ mapjoin(k)*/ sum(hash(k.key)), sum(hash(v.val
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(k)*/ sum(hash(k.key)), sum(hash(v.val)) from T1 k join T1 v on k.key=v.val
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 1 <- Map 4 (BROADCAST_EDGE)
@@ -5678,29 +5696,35 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 3 llap
-      File Output Operator [FS_13]
-        Group By Operator [GBY_11] (rows=1 width=16)
+      File Output Operator [FS_16]
+        Group By Operator [GBY_14] (rows=1 width=16)
           Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
         <-Reducer 2 [CUSTOM_SIMPLE_EDGE] llap
-          PARTITION_ONLY_SHUFFLE [RS_10]
-            Group By Operator [GBY_9] (rows=1 width=16)
+          PARTITION_ONLY_SHUFFLE [RS_13]
+            Group By Operator [GBY_12] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
             <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
-              PARTITION_ONLY_SHUFFLE [RS_8]
+              PARTITION_ONLY_SHUFFLE [RS_11]
                 PartitionCols:rand()
-                Map Join Operator [MAPJOIN_18] (rows=1 width=33)
-                  Conds:FIL_16.key=RS_5.val(Inner),Output:["_col0","_col6"]
-                <-Map 4 [BROADCAST_EDGE] llap
-                  BROADCAST [RS_5]
-                    PartitionCols:val
-                    Filter Operator [FIL_17] (rows=1 width=30)
-                      predicate:val is not null
-                      TableScan [TS_1] (rows=1 width=30)
-                        default@t1,v,Tbl:COMPLETE,Col:NONE,Output:["val"]
-                <-Filter Operator [FIL_16] (rows=1 width=30)
-                    predicate:key is not null
-                    TableScan [TS_0] (rows=1 width=30)
-                      default@t1,k,Tbl:COMPLETE,Col:NONE,Output:["key"]
+                Select Operator [SEL_9] (rows=1 width=33)
+                  Output:["_col0","_col1"]
+                  Map Join Operator [MAPJOIN_21] (rows=1 width=33)
+                    Conds:SEL_2._col0=RS_7._col0(Inner),Output:["_col0","_col1"]
+                  <-Map 4 [BROADCAST_EDGE] llap
+                    BROADCAST [RS_7]
+                      PartitionCols:_col0
+                      Select Operator [SEL_5] (rows=1 width=30)
+                        Output:["_col0"]
+                        Filter Operator [FIL_20] (rows=1 width=30)
+                          predicate:val is not null
+                          TableScan [TS_3] (rows=1 width=30)
+                            default@t1,v,Tbl:COMPLETE,Col:NONE,Output:["val"]
+                  <-Select Operator [SEL_2] (rows=1 width=30)
+                      Output:["_col0"]
+                      Filter Operator [FIL_19] (rows=1 width=30)
+                        predicate:key is not null
+                        TableScan [TS_0] (rows=1 width=30)
+                          default@t1,k,Tbl:COMPLETE,Col:NONE,Output:["key"]
 
 PREHOOK: query: explain select sum(hash(k.key)), sum(hash(v.val)) from T1 k join T1 v on k.key=v.key
 PREHOOK: type: QUERY
@@ -5838,7 +5862,7 @@ PREHOOK: query: explain FROM T1 a RIGHT OUTER JOIN T2 c ON c.key+1=a.key select
 PREHOOK: type: QUERY
 POSTHOOK: query: explain FROM T1 a RIGHT OUTER JOIN T2 c ON c.key+1=a.key select /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key))
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 2 <- Map 1 (BROADCAST_EDGE)
@@ -5850,31 +5874,37 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 4 llap
-      File Output Operator [FS_11]
-        Group By Operator [GBY_9] (rows=1 width=24)
+      File Output Operator [FS_14]
+        Group By Operator [GBY_12] (rows=1 width=24)
           Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
         <-Reducer 3 [CUSTOM_SIMPLE_EDGE] llap
-          PARTITION_ONLY_SHUFFLE [RS_8]
-            Group By Operator [GBY_7] (rows=1 width=24)
+          PARTITION_ONLY_SHUFFLE [RS_11]
+            Group By Operator [GBY_10] (rows=1 width=24)
               Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             <-Map 2 [CUSTOM_SIMPLE_EDGE] llap
-              PARTITION_ONLY_SHUFFLE [RS_6]
+              PARTITION_ONLY_SHUFFLE [RS_9]
                 PartitionCols:rand()
-                Map Join Operator [MAPJOIN_14] (rows=1 width=33)
-                  Conds:RS_2.UDFToDouble(key)=TS_1.(key + 1)(Right Outer),Output:["_col0","_col1","_col5"]
-                <-Map 1 [BROADCAST_EDGE] llap
-                  BROADCAST [RS_2]
-                    PartitionCols:UDFToDouble(key)
-                    TableScan [TS_0] (rows=1 width=30)
-                      default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-                <-TableScan [TS_1] (rows=1 width=30)
-                    default@t2,c,Tbl:COMPLETE,Col:NONE,Output:["key"]
+                Select Operator [SEL_7] (rows=1 width=33)
+                  Output:["_col0","_col1","_col2"]
+                  Map Join Operator [MAPJOIN_17] (rows=1 width=33)
+                    Conds:RS_4.UDFToDouble(_col0)=SEL_3.(UDFToDouble(_col0) + 1.0)(Right Outer),Output:["_col0","_col1","_col2"]
+                  <-Map 1 [BROADCAST_EDGE] llap
+                    BROADCAST [RS_4]
+                      PartitionCols:UDFToDouble(_col0)
+                      Select Operator [SEL_1] (rows=1 width=30)
+                        Output:["_col0","_col1"]
+                        TableScan [TS_0] (rows=1 width=30)
+                          default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
+                  <-Select Operator [SEL_3] (rows=1 width=30)
+                      Output:["_col0"]
+                      TableScan [TS_2] (rows=1 width=30)
+                        default@t2,c,Tbl:COMPLETE,Col:NONE,Output:["key"]
 
 PREHOOK: query: explain FROM T1 a FULL OUTER JOIN T2 c ON c.key+1=a.key select /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key))
 PREHOOK: type: QUERY
 POSTHOOK: query: explain FROM T1 a FULL OUTER JOIN T2 c ON c.key+1=a.key select /*+ STREAMTABLE(a) */ sum(hash(a.key)), sum(hash(a.val)), sum(hash(c.key))
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 5 (SIMPLE_EDGE)
@@ -5886,34 +5916,40 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 4 llap
-      File Output Operator [FS_11]
-        Group By Operator [GBY_9] (rows=1 width=24)
+      File Output Operator [FS_14]
+        Group By Operator [GBY_12] (rows=1 width=24)
           Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
         <-Reducer 3 [CUSTOM_SIMPLE_EDGE] llap
-          PARTITION_ONLY_SHUFFLE [RS_8]
-            Group By Operator [GBY_7] (rows=1 width=24)
+          PARTITION_ONLY_SHUFFLE [RS_11]
+            Group By Operator [GBY_10] (rows=1 width=24)
               Output:["_col0","_col1","_col2"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)","sum(VALUE._col2)"]
             <-Reducer 2 [CUSTOM_SIMPLE_EDGE] llap
-              PARTITION_ONLY_SHUFFLE [RS_6]
+              PARTITION_ONLY_SHUFFLE [RS_9]
                 PartitionCols:rand()
-                Merge Join Operator [MERGEJOIN_12] (rows=1 width=33)
-                  Conds:RS_2.UDFToDouble(key)=RS_3.(key + 1)(Outer),Output:["_col0","_col1","_col5"]
-                <-Map 1 [SIMPLE_EDGE] llap
-                  SHUFFLE [RS_2]
-                    PartitionCols:UDFToDouble(key)
-                    TableScan [TS_0] (rows=1 width=30)
-                      default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-                <-Map 5 [SIMPLE_EDGE] llap
-                  SHUFFLE [RS_3]
-                    PartitionCols:(key + 1)
-                    TableScan [TS_1] (rows=1 width=30)
-                      default@t2,c,Tbl:COMPLETE,Col:NONE,Output:["key"]
+                Select Operator [SEL_7] (rows=1 width=33)
+                  Output:["_col0","_col1","_col2"]
+                  Merge Join Operator [MERGEJOIN_15] (rows=1 width=33)
+                    Conds:RS_4.UDFToDouble(_col0)=RS_5.(UDFToDouble(_col0) + 1.0)(Outer),Output:["_col0","_col1","_col2"]
+                  <-Map 1 [SIMPLE_EDGE] llap
+                    SHUFFLE [RS_4]
+                      PartitionCols:UDFToDouble(_col0)
+                      Select Operator [SEL_1] (rows=1 width=30)
+                        Output:["_col0","_col1"]
+                        TableScan [TS_0] (rows=1 width=30)
+                          default@t1,a,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
+                  <-Map 5 [SIMPLE_EDGE] llap
+                    SHUFFLE [RS_5]
+                      PartitionCols:(UDFToDouble(_col0) + 1.0)
+                      Select Operator [SEL_3] (rows=1 width=30)
+                        Output:["_col0"]
+                        TableScan [TS_2] (rows=1 width=30)
+                          default@t2,c,Tbl:COMPLETE,Col:NONE,Output:["key"]
 
 PREHOOK: query: explain select /*+ mapjoin(v)*/ sum(hash(k.key)), sum(hash(v.val)) from T1 k left outer join T1 v on k.key+1=v.key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select /*+ mapjoin(v)*/ sum(hash(k.key)), sum(hash(v.val)) from T1 k left outer join T1 v on k.key+1=v.key
 POSTHOOK: type: QUERY
-Plan not optimized by CBO due to missing feature [Hint].
+Plan optimized by CBO.
 
 Vertex dependency in root stage
 Map 1 <- Map 4 (BROADCAST_EDGE)
@@ -5925,23 +5961,29 @@ Stage-0
     limit:-1
     Stage-1
       Reducer 3 llap
-      File Output Operator [FS_11]
-        Group By Operator [GBY_9] (rows=1 width=16)
+      File Output Operator [FS_14]
+        Group By Operator [GBY_12] (rows=1 width=16)
           Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
         <-Reducer 2 [CUSTOM_SIMPLE_EDGE] llap
-          PARTITION_ONLY_SHUFFLE [RS_8]
-            Group By Operator [GBY_7] (rows=1 width=16)
+          PARTITION_ONLY_SHUFFLE [RS_11]
+            Group By Operator [GBY_10] (rows=1 width=16)
               Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"]
             <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
-              PARTITION_ONLY_SHUFFLE [RS_6]
+              PARTITION_ONLY_SHUFFLE [RS_9]
                 PartitionCols:rand()
-                Map Join Operator [MAPJOIN_14] (rows=1 width=33)
-                  Conds:TS_0.(key + 1)=RS_3.UDFToDouble(key)(Left Outer),Output:["_col0","_col6"]
-                <-Map 4 [BROADCAST_EDGE] llap
-                  BROADCAST [RS_3]
-                    PartitionCols:UDFToDouble(key)
-                    TableScan [TS_1] (rows=1 width=30)
-                      default@t1,v,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
-                <-TableScan [TS_0] (rows=1 width=30)
-                    default@t1,k,Tbl:COMPLETE,Col:NONE,Output:["key"]
+                Select Operator [SEL_7] (rows=1 width=33)
+                  Output:["_col0","_col1"]
+                  Map Join Operator [MAPJOIN_17] (rows=1 width=33)
+                    Conds:SEL_1.(UDFToDouble(_col0) + 1.0)=RS_5.UDFToDouble(_col0)(Left Outer),Output:["_col0","_col2"]
+                  <-Map 4 [BROADCAST_EDGE] llap
+                    BROADCAST [RS_5]
+                      PartitionCols:UDFToDouble(_col0)
+                      Select Operator [SEL_3] (rows=1 width=30)
+                        Output:["_col0","_col1"]
+                        TableScan [TS_2] (rows=1 width=30)
+                          default@t1,v,Tbl:COMPLETE,Col:NONE,Output:["key","val"]
+                  <-Select Operator [SEL_1] (rows=1 width=30)
+                      Output:["_col0"]
+                      TableScan [TS_0] (rows=1 width=30)
+                        default@t1,k,Tbl:COMPLETE,Col:NONE,Output:["key"]
 


Mime
View raw message