hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pxi...@apache.org
Subject [4/5] hive git commit: HIVE-16293: Column pruner should continue to work when SEL has more than 1 child (Pengcheng Xiong, reviewed by Ashutosh Chauhan)
Date Tue, 04 Apr 2017 21:41:04 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/groupby9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby9.q.out b/ql/src/test/results/clientpositive/groupby9.q.out
index c840df8..f4f1163 100644
--- a/ql/src/test/results/clientpositive/groupby9.q.out
+++ b/ql/src/test/results/clientpositive/groupby9.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -120,7 +120,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -862,7 +862,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -904,7 +904,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -1646,7 +1646,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -1688,7 +1688,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -2431,7 +2431,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -2474,7 +2474,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -3216,7 +3216,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -3258,7 +3258,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
index f6e1b17..1e13288 100644
--- a/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
+++ b/ql/src/test/results/clientpositive/groupby_cube_multi_gby.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: _col0 (type: string), _col2 (type: int)
+            expressions: _col0 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/groupby_position.q.out b/ql/src/test/results/clientpositive/groupby_position.q.out
index 689aced..ff27253 100644
--- a/ql/src/test/results/clientpositive/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/groupby_position.q.out
@@ -76,7 +76,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -118,7 +118,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), _col1 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -270,7 +270,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col0) (type: int), _col1 (type: bigint)
+            expressions: UDFToInteger(_col0) (type: int), UDFToString(_col1) (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -312,7 +312,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
           Select Operator
-            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), _col2 (type: bigint)
+            expressions: UDFToInteger(_col1) (type: int), _col0 (type: string), UDFToString(_col2) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
             File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
index 7c9cb74..1aea388 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
@@ -1021,9 +1021,9 @@ SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	1                   	 
-Bucket Columns:     	[value]             	 
-Sort Columns:       	[Order(col:value, order:1)]	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: INSERT OVERWRITE TABLE test_table PARTITION (part = '1')

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
index 40bdc52..3e29664 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out
@@ -57,7 +57,7 @@ STAGE PLANS:
           Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), UDFToString(_col3) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 750 Data size: 7968 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -775,7 +775,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_table_out_2@part=1
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).agg EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key SIMPLE []
+POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key EXPRESSION []
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: SELECT key, value, GROUPING__ID, count(1) FROM src GROUP BY ROLLUP (key, value)
@@ -1441,9 +1441,9 @@ SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	1                   	 
-Bucket Columns:     	[key, value, grouping_key]	 
-Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1), Order(col:grouping_key, order:1)]	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1') 
@@ -1489,7 +1489,7 @@ STAGE PLANS:
           Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), UDFToString(_col3) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -1580,7 +1580,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_table_out_2@part=1
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).agg EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key SIMPLE []
+POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key EXPRESSION []
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: DESCRIBE FORMATTED test_table_out_2 PARTITION (part = '1')
@@ -1619,9 +1619,9 @@ SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	1                   	 
-Bucket Columns:     	[key, value, grouping_key]	 
-Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1), Order(col:grouping_key, order:1)]	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1') 
@@ -1667,7 +1667,7 @@ STAGE PLANS:
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
           pruneGroupingSetId: true
           Select Operator
-            expressions: _col0 (type: string), _col1 (type: string), _col3 (type: bigint)
+            expressions: _col0 (type: string), _col1 (type: string), UDFToString(_col3) (type: string)
             outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             File Output Operator
@@ -1758,7 +1758,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_table_out_2@part=1
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).agg EXPRESSION [(src)src.null, ]
-POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key SIMPLE []
+POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).grouping_key EXPRESSION []
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: DESCRIBE FORMATTED test_table_out_2 PARTITION (part = '1')
@@ -1797,8 +1797,8 @@ SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	1                   	 
-Bucket Columns:     	[key, value, grouping_key]	 
-Sort Columns:       	[Order(col:key, order:1), Order(col:value, order:1), Order(col:grouping_key, order:1)]	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
index 05e1c66..32edd73 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
@@ -79,14 +79,18 @@ STAGE PLANS:
                 mode: final
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
+                Select Operator
+                  expressions: _col0 (type: string), UDFToString(_col1) (type: string)
+                  outputColumnNames: _col0, _col1
                   Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                      name: default.test_table_out
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
+                    table:
+                        input format: org.apache.hadoop.mapred.TextInputFormat
+                        output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                        serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        name: default.test_table_out
 
   Stage: Stage-7
     Conditional Operator
@@ -265,14 +269,18 @@ STAGE PLANS:
             1 UDFToDouble(_col0) (type: double)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-          File Output Operator
-            compressed: false
+          Select Operator
+            expressions: _col0 (type: string), UDFToString(_col1) (type: string)
+            outputColumnNames: _col0, _col1
             Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.TextInputFormat
-                output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                name: default.test_table_out
+            File Output Operator
+              compressed: false
+              Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
+              table:
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                  name: default.test_table_out
 
   Stage: Stage-0
     Move Operator
@@ -549,13 +557,16 @@ STAGE PLANS:
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          File Output Operator
-            compressed: false
-            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
-                name: default.test_table_out
+          Select Operator
+            expressions: _col0 (type: string), UDFToString(_col1) (type: string)
+            outputColumnNames: _col0, _col1
+            File Output Operator
+              compressed: false
+              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
+                  name: default.test_table_out
 
   Stage: Stage-0
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
index 3fddc65..53aff14 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
@@ -307,8 +307,8 @@ SerDe Library:      	org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 InputFormat:        	org.apache.hadoop.mapred.TextInputFormat	 
 OutputFormat:       	org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat	 
 Compressed:         	No                  	 
-Num Buckets:        	1                   	 
-Bucket Columns:     	[value]             	 
-Sort Columns:       	[Order(col:value, order:1)]	 
+Num Buckets:        	-1                  	 
+Bucket Columns:     	[]                  	 
+Sort Columns:       	[]                  	 
 Storage Desc Params:	 	 
 	serialization.format	1                   

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/input8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input8.q.out b/ql/src/test/results/clientpositive/input8.q.out
index e2b6b4a..d76fc2b 100644
--- a/ql/src/test/results/clientpositive/input8.q.out
+++ b/ql/src/test/results/clientpositive/input8.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
             Select Operator
-              expressions: null (type: double), UDFToInteger((UDFToDouble(key) - null)) (type: int), null (type: double)
+              expressions: null (type: string), UDFToInteger((UDFToDouble(key) - null)) (type: int), null (type: double)
               outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
@@ -106,7 +106,7 @@ INSERT OVERWRITE TABLE dest1 SELECT 4 + NULL, src1.key - NULL, NULL + NULL
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src1
 POSTHOOK: Output: default@dest1
-POSTHOOK: Lineage: dest1.c1 SIMPLE []
+POSTHOOK: Lineage: dest1.c1 EXPRESSION []
 POSTHOOK: Lineage: dest1.c2 EXPRESSION [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: dest1.c3 SIMPLE []
 PREHOOK: query: SELECT dest1.* FROM dest1

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/input9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input9.q.out b/ql/src/test/results/clientpositive/input9.q.out
index 38216a6..af752e0 100644
--- a/ql/src/test/results/clientpositive/input9.q.out
+++ b/ql/src/test/results/clientpositive/input9.q.out
@@ -35,7 +35,7 @@ STAGE PLANS:
               predicate: false (type: boolean)
               Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
               Select Operator
-                expressions: null (type: void), UDFToInteger(key) (type: int)
+                expressions: null (type: string), UDFToInteger(key) (type: int)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
@@ -110,7 +110,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src1
 POSTHOOK: Output: default@dest1
 POSTHOOK: Lineage: dest1.key EXPRESSION [(src1)src1.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: dest1.value SIMPLE []
+POSTHOOK: Lineage: dest1.value EXPRESSION []
 PREHOOK: query: SELECT dest1.* FROM dest1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dest1

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/input_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/input_part10.q.out b/ql/src/test/results/clientpositive/input_part10.q.out
index 1d738b4..4b552ba 100644
--- a/ql/src/test/results/clientpositive/input_part10.q.out
+++ b/ql/src/test/results/clientpositive/input_part10.q.out
@@ -58,14 +58,18 @@ STAGE PLANS:
           Limit
             Number of rows: 1
             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
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-                  name: default.part_special
+            Select Operator
+              expressions: UDFToString(_col0) (type: string), UDFToString(_col1) (type: string)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 1 Data size: 368 Basic stats: COMPLETE Column stats: COMPLETE
+              File Output Operator
+                compressed: false
+                Statistics: Num rows: 1 Data size: 368 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
+                    name: default.part_special
 
   Stage: Stage-0
     Move Operator
@@ -93,8 +97,8 @@ SELECT 1, 2 FROM src LIMIT 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@part_special@ds=2008 04 08/ts=10%3A11%3A12%3D455
-POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE []
-POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE []
+POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a EXPRESSION []
+POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b EXPRESSION []
 PREHOOK: query: DESCRIBE EXTENDED part_special PARTITION(ds='2008 04 08', ts = '10:11:12=455')
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@part_special

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/join38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/join38.q.out b/ql/src/test/results/clientpositive/join38.q.out
index 60c54ce..de66a59 100644
--- a/ql/src/test/results/clientpositive/join38.q.out
+++ b/ql/src/test/results/clientpositive/join38.q.out
@@ -15,17 +15,17 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@tmp
 POSTHOOK: Lineage: tmp.col0 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: tmp.col1 SIMPLE []
-POSTHOOK: Lineage: tmp.col10 SIMPLE []
-POSTHOOK: Lineage: tmp.col11 SIMPLE []
-POSTHOOK: Lineage: tmp.col2 SIMPLE []
-POSTHOOK: Lineage: tmp.col3 SIMPLE []
-POSTHOOK: Lineage: tmp.col4 SIMPLE []
-POSTHOOK: Lineage: tmp.col5 SIMPLE []
-POSTHOOK: Lineage: tmp.col6 SIMPLE []
-POSTHOOK: Lineage: tmp.col7 SIMPLE []
-POSTHOOK: Lineage: tmp.col8 SIMPLE []
-POSTHOOK: Lineage: tmp.col9 SIMPLE []
+POSTHOOK: Lineage: tmp.col1 EXPRESSION []
+POSTHOOK: Lineage: tmp.col10 EXPRESSION []
+POSTHOOK: Lineage: tmp.col11 EXPRESSION []
+POSTHOOK: Lineage: tmp.col2 EXPRESSION []
+POSTHOOK: Lineage: tmp.col3 EXPRESSION []
+POSTHOOK: Lineage: tmp.col4 EXPRESSION []
+POSTHOOK: Lineage: tmp.col5 EXPRESSION []
+POSTHOOK: Lineage: tmp.col6 EXPRESSION []
+POSTHOOK: Lineage: tmp.col7 EXPRESSION []
+POSTHOOK: Lineage: tmp.col8 EXPRESSION []
+POSTHOOK: Lineage: tmp.col9 EXPRESSION []
 PREHOOK: query: select * from tmp
 PREHOOK: type: QUERY
 PREHOOK: Input: default@tmp

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/literal_decimal.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/literal_decimal.q.out b/ql/src/test/results/clientpositive/literal_decimal.q.out
index 6f686eb..f37a0d3 100644
--- a/ql/src/test/results/clientpositive/literal_decimal.q.out
+++ b/ql/src/test/results/clientpositive/literal_decimal.q.out
@@ -20,7 +20,11 @@ STAGE PLANS:
             Limit
               Number of rows: 1
               Statistics: Num rows: 1 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE
-              ListSink
+              Select Operator
+                expressions: _col0 (type: int), _col1 (type: int), _col2 (type: int), _col3 (type: decimal(3,2)), _col4 (type: decimal(3,2)), _col5 (type: bigint), _col6 (type: decimal(30,13)), UDFToString(_col7) (type: string)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7
+                Statistics: Num rows: 1 Data size: 440 Basic stats: COMPLETE Column stats: COMPLETE
+                ListSink
 
 PREHOOK: query: SELECT -1BD, 0BD, 1BD, 3.14BD, -3.14BD, 99999999999999999BD, 99999999999999999.9999999999999BD, 1E99BD FROM src LIMIT 1
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
index c7be3b6..e5e26ec 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
@@ -253,8 +253,8 @@ POSTHOOK: query: insert into table b select NULL, NULL from src limit 10
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@b
-POSTHOOK: Lineage: b.key SIMPLE []
-POSTHOOK: Lineage: b.value SIMPLE []
+POSTHOOK: Lineage: b.key EXPRESSION []
+POSTHOOK: Lineage: b.value EXPRESSION []
 PREHOOK: query: describe formatted b key
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@b

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/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 66fb142..6338f66 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
@@ -570,7 +570,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -659,7 +659,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Input: default@srcbucket_mapjoin_part
 POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -702,7 +702,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Input: default@srcbucket_mapjoin_part
 POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -936,7 +936,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -1025,7 +1025,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Input: default@srcbucket_mapjoin_part
 POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -1068,7 +1068,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Input: default@srcbucket_mapjoin_part
 POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/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 d71a575..7e3d606 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
@@ -284,7 +284,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -375,7 +375,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -420,7 +420,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -656,7 +656,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -747,7 +747,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -792,7 +792,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -1094,7 +1094,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -1187,7 +1187,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-09
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -1234,7 +1234,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-09
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part_2)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/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 1bc8ff4..00cf0f1 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
@@ -308,7 +308,7 @@ STAGE PLANS:
                 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), _col4 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -399,7 +399,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -444,7 +444,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -680,7 +680,7 @@ STAGE PLANS:
                 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), _col4 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -771,7 +771,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -816,7 +816,7 @@ POSTHOOK: Input: default@srcbucket_mapjoin_part@ds=2008-04-08
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2
 POSTHOOK: Input: default@srcbucket_mapjoin_part_2@ds=2008-04-08
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin_part_2)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin_part_2)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin_part)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/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 c50d3e6..7b983f0 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
@@ -304,7 +304,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -389,7 +389,7 @@ on a.key=b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -428,7 +428,7 @@ on a.key=b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -660,7 +660,7 @@ STAGE PLANS:
                 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), _col3 (type: string)
+                  expressions: UDFToString(_col0) (type: string), _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
@@ -745,7 +745,7 @@ on a.key=b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result
@@ -784,7 +784,7 @@ on a.key=b.key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket_mapjoin
 POSTHOOK: Output: default@bucketmapjoin_tmp_result
-POSTHOOK: Lineage: bucketmapjoin_tmp_result.key SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
+POSTHOOK: Lineage: bucketmapjoin_tmp_result.key EXPRESSION [(srcbucket_mapjoin)a.FieldSchema(name:key, type:int, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value1 SIMPLE [(srcbucket_mapjoin)a.FieldSchema(name:value, type:string, comment:null), ]
 POSTHOOK: Lineage: bucketmapjoin_tmp_result.value2 SIMPLE [(srcbucket_mapjoin)b.FieldSchema(name:value, type:string, comment:null), ]
 PREHOOK: query: select count(1) from bucketmapjoin_tmp_result

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
index 087a531..3e848e6 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_2.q.out
@@ -3960,50 +3960,52 @@ Stage-4
           Dependency Collection{}
             Stage-2
               Reducer 5 llap
-              File Output Operator [FS_21]
+              File Output Operator [FS_22]
                 table:{"name:":"default.dest1"}
-                Group By Operator [GBY_19] (rows=1 width=96)
-                  Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
-                <-Reducer 4 [SIMPLE_EDGE] llap
-                  SHUFFLE [RS_18]
-                    PartitionCols:_col0
-                    Group By Operator [GBY_17] (rows=1 width=280)
-                      Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                      Group By Operator [GBY_14] (rows=1 width=272)
-                        Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
-                      <-Union 3 [SIMPLE_EDGE]
-                        <-Map 6 [CONTAINS] llap
-                          Reduce Output Operator [RS_13]
-                            PartitionCols:_col0, _col1
-                            Group By Operator [GBY_12] (rows=1 width=272)
-                              Output:["_col0","_col1"],keys:_col0, _col1
-                              Select Operator [SEL_8] (rows=500 width=10)
-                                Output:["_col0","_col1"]
-                                TableScan [TS_7] (rows=500 width=10)
-                                  Output:["key","value"]
-                        <-Reducer 2 [CONTAINS] llap
-                          Reduce Output Operator [RS_13]
-                            PartitionCols:_col0, _col1
-                            Group By Operator [GBY_12] (rows=1 width=272)
-                              Output:["_col0","_col1"],keys:_col0, _col1
-                              Select Operator [SEL_6] (rows=1 width=272)
-                                Output:["_col0","_col1"]
-                                Group By Operator [GBY_5] (rows=1 width=8)
-                                  Output:["_col0"],aggregations:["count(VALUE._col0)"]
-                                <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
-                                  PARTITION_ONLY_SHUFFLE [RS_4]
-                                    Group By Operator [GBY_3] (rows=1 width=8)
-                                      Output:["_col0"],aggregations:["count(1)"]
-                                      Select Operator [SEL_1] (rows=500 width=10)
-                                        TableScan [TS_0] (rows=500 width=10)
-                                          default@src,s1,Tbl:COMPLETE,Col:COMPLETE
-                  File Output Operator [FS_27]
-                    table:{"name:":"default.dest2"}
-                    Select Operator [SEL_26] (rows=1 width=456)
-                      Output:["_col0","_col1","_col2"]
-                      Group By Operator [GBY_25] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1
-                         Please refer to the previous Group By Operator [GBY_14]
+                Select Operator [SEL_20] (rows=1 width=272)
+                  Output:["_col0","_col1"]
+                  Group By Operator [GBY_19] (rows=1 width=96)
+                    Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
+                  <-Reducer 4 [SIMPLE_EDGE] llap
+                    SHUFFLE [RS_18]
+                      PartitionCols:_col0
+                      Group By Operator [GBY_17] (rows=1 width=280)
+                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                        Group By Operator [GBY_14] (rows=1 width=272)
+                          Output:["_col0","_col1"],keys:KEY._col0, KEY._col1
+                        <-Union 3 [SIMPLE_EDGE]
+                          <-Map 6 [CONTAINS] llap
+                            Reduce Output Operator [RS_13]
+                              PartitionCols:_col0, _col1
+                              Group By Operator [GBY_12] (rows=1 width=272)
+                                Output:["_col0","_col1"],keys:_col0, _col1
+                                Select Operator [SEL_8] (rows=500 width=10)
+                                  Output:["_col0","_col1"]
+                                  TableScan [TS_7] (rows=500 width=10)
+                                    Output:["key","value"]
+                          <-Reducer 2 [CONTAINS] llap
+                            Reduce Output Operator [RS_13]
+                              PartitionCols:_col0, _col1
+                              Group By Operator [GBY_12] (rows=1 width=272)
+                                Output:["_col0","_col1"],keys:_col0, _col1
+                                Select Operator [SEL_6] (rows=1 width=272)
+                                  Output:["_col0","_col1"]
+                                  Group By Operator [GBY_5] (rows=1 width=8)
+                                    Output:["_col0"],aggregations:["count(VALUE._col0)"]
+                                  <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
+                                    PARTITION_ONLY_SHUFFLE [RS_4]
+                                      Group By Operator [GBY_3] (rows=1 width=8)
+                                        Output:["_col0"],aggregations:["count(1)"]
+                                        Select Operator [SEL_1] (rows=500 width=10)
+                                          TableScan [TS_0] (rows=500 width=10)
+                                            default@src,s1,Tbl:COMPLETE,Col:COMPLETE
+                    File Output Operator [FS_29]
+                      table:{"name:":"default.dest2"}
+                      Select Operator [SEL_27] (rows=1 width=456)
+                        Output:["_col0","_col1","_col2"]
+                        Group By Operator [GBY_26] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1
+                           Please refer to the previous Group By Operator [GBY_14]
 Stage-5
   Stats-Aggr Operator
     Stage-1
@@ -4132,66 +4134,70 @@ Stage-4
           Dependency Collection{}
             Stage-2
               Reducer 4 llap
-              File Output Operator [FS_19]
+              File Output Operator [FS_20]
                 table:{"name:":"default.dest1"}
-                Group By Operator [GBY_17] (rows=1 width=96)
-                  Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
-                <-Union 3 [SIMPLE_EDGE]
-                  <-Map 6 [CONTAINS] llap
-                    Reduce Output Operator [RS_16]
-                      PartitionCols:_col0
-                      Group By Operator [GBY_15] (rows=1 width=280)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                        Select Operator [SEL_8] (rows=500 width=10)
-                          Output:["_col0","_col1"]
-                          TableScan [TS_7] (rows=500 width=10)
-                            Output:["key","value"]
-                    Reduce Output Operator [RS_22]
-                      PartitionCols:_col0, _col1
-                      Group By Operator [GBY_21] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
-                         Please refer to the previous Select Operator [SEL_8]
-                  <-Map 7 [CONTAINS] llap
-                    Reduce Output Operator [RS_16]
-                      PartitionCols:_col0
-                      Group By Operator [GBY_15] (rows=1 width=280)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                        Select Operator [SEL_12] (rows=500 width=10)
-                          Output:["_col0","_col1"]
-                          TableScan [TS_11] (rows=500 width=10)
-                            Output:["key","value"]
-                    Reduce Output Operator [RS_22]
-                      PartitionCols:_col0, _col1
-                      Group By Operator [GBY_21] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
-                         Please refer to the previous Select Operator [SEL_12]
-                  <-Reducer 2 [CONTAINS] llap
-                    Reduce Output Operator [RS_16]
-                      PartitionCols:_col0
-                      Group By Operator [GBY_15] (rows=1 width=280)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                        Select Operator [SEL_6] (rows=1 width=272)
-                          Output:["_col0","_col1"]
-                          Group By Operator [GBY_5] (rows=1 width=8)
-                            Output:["_col0"],aggregations:["count(VALUE._col0)"]
-                          <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
-                            PARTITION_ONLY_SHUFFLE [RS_4]
-                              Group By Operator [GBY_3] (rows=1 width=8)
-                                Output:["_col0"],aggregations:["count(1)"]
-                                Select Operator [SEL_1] (rows=500 width=10)
-                                  TableScan [TS_0] (rows=500 width=10)
-                                    default@src,s1,Tbl:COMPLETE,Col:COMPLETE
-                    Reduce Output Operator [RS_22]
-                      PartitionCols:_col0, _col1
-                      Group By Operator [GBY_21] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
-                         Please refer to the previous Select Operator [SEL_6]
+                Select Operator [SEL_18] (rows=1 width=272)
+                  Output:["_col0","_col1"]
+                  Group By Operator [GBY_17] (rows=1 width=96)
+                    Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
+                  <-Union 3 [SIMPLE_EDGE]
+                    <-Map 6 [CONTAINS] llap
+                      Reduce Output Operator [RS_16]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_15] (rows=1 width=280)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                          Select Operator [SEL_8] (rows=500 width=10)
+                            Output:["_col0","_col1"]
+                            TableScan [TS_7] (rows=500 width=10)
+                              Output:["key","value"]
+                      Reduce Output Operator [RS_23]
+                        PartitionCols:_col0, _col1
+                        Group By Operator [GBY_22] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
+                           Please refer to the previous Select Operator [SEL_8]
+                    <-Map 7 [CONTAINS] llap
+                      Reduce Output Operator [RS_16]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_15] (rows=1 width=280)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                          Select Operator [SEL_12] (rows=500 width=10)
+                            Output:["_col0","_col1"]
+                            TableScan [TS_11] (rows=500 width=10)
+                              Output:["key","value"]
+                      Reduce Output Operator [RS_23]
+                        PartitionCols:_col0, _col1
+                        Group By Operator [GBY_22] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
+                           Please refer to the previous Select Operator [SEL_12]
+                    <-Reducer 2 [CONTAINS] llap
+                      Reduce Output Operator [RS_16]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_15] (rows=1 width=280)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                          Select Operator [SEL_6] (rows=1 width=272)
+                            Output:["_col0","_col1"]
+                            Group By Operator [GBY_5] (rows=1 width=8)
+                              Output:["_col0"],aggregations:["count(VALUE._col0)"]
+                            <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
+                              PARTITION_ONLY_SHUFFLE [RS_4]
+                                Group By Operator [GBY_3] (rows=1 width=8)
+                                  Output:["_col0"],aggregations:["count(1)"]
+                                  Select Operator [SEL_1] (rows=500 width=10)
+                                    TableScan [TS_0] (rows=500 width=10)
+                                      default@src,s1,Tbl:COMPLETE,Col:COMPLETE
+                      Reduce Output Operator [RS_23]
+                        PartitionCols:_col0, _col1
+                        Group By Operator [GBY_22] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
+                           Please refer to the previous Select Operator [SEL_6]
               Reducer 5 llap
-              File Output Operator [FS_25]
+              File Output Operator [FS_27]
                 table:{"name:":"default.dest2"}
-                Group By Operator [GBY_23] (rows=1 width=280)
-                  Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT KEY._col2:0._col0)"],keys:KEY._col0, KEY._col1
-                <- Please refer to the previous Union 3 [SIMPLE_EDGE]
+                Select Operator [SEL_25] (rows=1 width=456)
+                  Output:["_col0","_col1","_col2"]
+                  Group By Operator [GBY_24] (rows=1 width=280)
+                    Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT KEY._col2:0._col0)"],keys:KEY._col0, KEY._col1
+                  <- Please refer to the previous Union 3 [SIMPLE_EDGE]
 Stage-5
   Stats-Aggr Operator
     Stage-1
@@ -4236,52 +4242,56 @@ Stage-4
           Dependency Collection{}
             Stage-2
               Reducer 4 llap
-              File Output Operator [FS_16]
+              File Output Operator [FS_17]
                 table:{"name:":"default.dest1"}
-                Group By Operator [GBY_14] (rows=1 width=96)
-                  Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
-                <-Union 3 [SIMPLE_EDGE]
-                  <-Map 6 [CONTAINS] llap
-                    Reduce Output Operator [RS_13]
-                      PartitionCols:_col0
-                      Group By Operator [GBY_12] (rows=1 width=280)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                        Select Operator [SEL_8] (rows=500 width=10)
-                          Output:["_col0","_col1"]
-                          TableScan [TS_7] (rows=500 width=10)
-                            Output:["key","value"]
-                    Reduce Output Operator [RS_19]
-                      PartitionCols:_col0, _col1
-                      Group By Operator [GBY_18] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
-                         Please refer to the previous Select Operator [SEL_8]
-                  <-Reducer 2 [CONTAINS] llap
-                    Reduce Output Operator [RS_13]
-                      PartitionCols:_col0
-                      Group By Operator [GBY_12] (rows=1 width=280)
-                        Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
-                        Select Operator [SEL_6] (rows=1 width=272)
-                          Output:["_col0","_col1"]
-                          Group By Operator [GBY_5] (rows=1 width=8)
-                            Output:["_col0"],aggregations:["count(VALUE._col0)"]
-                          <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
-                            PARTITION_ONLY_SHUFFLE [RS_4]
-                              Group By Operator [GBY_3] (rows=1 width=8)
-                                Output:["_col0"],aggregations:["count(1)"]
-                                Select Operator [SEL_1] (rows=500 width=10)
-                                  TableScan [TS_0] (rows=500 width=10)
-                                    default@src,s1,Tbl:COMPLETE,Col:COMPLETE
-                    Reduce Output Operator [RS_19]
-                      PartitionCols:_col0, _col1
-                      Group By Operator [GBY_18] (rows=1 width=464)
-                        Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
-                         Please refer to the previous Select Operator [SEL_6]
+                Select Operator [SEL_15] (rows=1 width=272)
+                  Output:["_col0","_col1"]
+                  Group By Operator [GBY_14] (rows=1 width=96)
+                    Output:["_col0","_col1"],aggregations:["count(DISTINCT KEY._col1:0._col0)"],keys:KEY._col0
+                  <-Union 3 [SIMPLE_EDGE]
+                    <-Map 6 [CONTAINS] llap
+                      Reduce Output Operator [RS_13]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_12] (rows=1 width=280)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                          Select Operator [SEL_8] (rows=500 width=10)
+                            Output:["_col0","_col1"]
+                            TableScan [TS_7] (rows=500 width=10)
+                              Output:["key","value"]
+                      Reduce Output Operator [RS_20]
+                        PartitionCols:_col0, _col1
+                        Group By Operator [GBY_19] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
+                           Please refer to the previous Select Operator [SEL_8]
+                    <-Reducer 2 [CONTAINS] llap
+                      Reduce Output Operator [RS_13]
+                        PartitionCols:_col0
+                        Group By Operator [GBY_12] (rows=1 width=280)
+                          Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, substr(_col1, 5)
+                          Select Operator [SEL_6] (rows=1 width=272)
+                            Output:["_col0","_col1"]
+                            Group By Operator [GBY_5] (rows=1 width=8)
+                              Output:["_col0"],aggregations:["count(VALUE._col0)"]
+                            <-Map 1 [CUSTOM_SIMPLE_EDGE] llap
+                              PARTITION_ONLY_SHUFFLE [RS_4]
+                                Group By Operator [GBY_3] (rows=1 width=8)
+                                  Output:["_col0"],aggregations:["count(1)"]
+                                  Select Operator [SEL_1] (rows=500 width=10)
+                                    TableScan [TS_0] (rows=500 width=10)
+                                      default@src,s1,Tbl:COMPLETE,Col:COMPLETE
+                      Reduce Output Operator [RS_20]
+                        PartitionCols:_col0, _col1
+                        Group By Operator [GBY_19] (rows=1 width=464)
+                          Output:["_col0","_col1","_col2","_col3"],aggregations:["count(DISTINCT substr(_col1, 5))"],keys:_col0, _col1, substr(_col1, 5)
+                           Please refer to the previous Select Operator [SEL_6]
               Reducer 5 llap
-              File Output Operator [FS_22]
+              File Output Operator [FS_24]
                 table:{"name:":"default.dest2"}
-                Group By Operator [GBY_20] (rows=1 width=280)
-                  Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT KEY._col2:0._col0)"],keys:KEY._col0, KEY._col1
-                <- Please refer to the previous Union 3 [SIMPLE_EDGE]
+                Select Operator [SEL_22] (rows=1 width=456)
+                  Output:["_col0","_col1","_col2"]
+                  Group By Operator [GBY_21] (rows=1 width=280)
+                    Output:["_col0","_col1","_col2"],aggregations:["count(DISTINCT KEY._col2:0._col0)"],keys:KEY._col0, KEY._col1
+                  <- Please refer to the previous Union 3 [SIMPLE_EDGE]
 Stage-5
   Stats-Aggr Operator
     Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/f1e0d56b/ql/src/test/results/clientpositive/llap/filter_join_breaktask2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/filter_join_breaktask2.q.out b/ql/src/test/results/clientpositive/llap/filter_join_breaktask2.q.out
index 6a2396e..26ce0ed 100644
--- a/ql/src/test/results/clientpositive/llap/filter_join_breaktask2.q.out
+++ b/ql/src/test/results/clientpositive/llap/filter_join_breaktask2.q.out
@@ -44,9 +44,9 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c1 SIMPLE []
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c2 SIMPLE []
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c3 SIMPLE []
 POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c4 SIMPLE []
-POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c5 SIMPLE []
-POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c6 SIMPLE []
-POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c7 SIMPLE []
+POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c5 EXPRESSION []
+POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c6 EXPRESSION []
+POSTHOOK: Lineage: t1 PARTITION(ds=2010-04-17).c7 EXPRESSION []
 PREHOOK: query: insert overwrite table T2 partition(ds='2010-04-17') select '5','name', NULL, '2', 'kavin',NULL, '9', 'c', '8', '0', '0', '7', '1','2', '0', '3','2', NULL, '1', NULL, '3','2','0','0','5','10' from src tablesample (1 rows)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -64,9 +64,9 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c13 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c14 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c15 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c16 SIMPLE []
-POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c17 SIMPLE []
+POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c17 EXPRESSION []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c18 SIMPLE []
-POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c19 SIMPLE []
+POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c19 EXPRESSION []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c2 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c20 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c21 SIMPLE []
@@ -74,9 +74,9 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c22 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c23 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c24 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c25 SIMPLE []
-POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c3 SIMPLE []
+POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c3 EXPRESSION []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c4 SIMPLE []
-POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c5 SIMPLE []
+POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c5 EXPRESSION []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c6 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c7 SIMPLE []
 POSTHOOK: Lineage: t2 PARTITION(ds=2010-04-17).c8 SIMPLE []
@@ -118,18 +118,18 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c2 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c20 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c21 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c22 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c23 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c24 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c25 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c26 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c27 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c28 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c23 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c24 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c25 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c26 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c27 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c28 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c29 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c3 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c30 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c31 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c32 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c33 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c33 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c34 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c35 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c36 SIMPLE []
@@ -157,18 +157,18 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c55 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c56 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c57 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c58 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c59 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c59 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c6 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c60 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c61 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c62 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c63 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c64 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c60 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c61 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c62 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c63 EXPRESSION []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c64 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c65 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c66 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c66 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c67 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c68 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c69 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c69 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c7 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c70 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c71 EXPRESSION []
@@ -181,7 +181,7 @@ POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c77 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c78 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c79 SIMPLE []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c8 SIMPLE []
-POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c80 SIMPLE []
+POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c80 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c81 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c82 EXPRESSION []
 POSTHOOK: Lineage: t4 PARTITION(ds=2010-04-17).c83 EXPRESSION []


Mime
View raw message