http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_1.q.out 
b/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
index b8383fd..2e83ea3 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_1.q.out
@@ -300,18 +300,18 @@ Stage-0
     Stage-1
       Reducer 2
       File Output Operator [FS_7]
-        Select Operator [SEL_5] (rows=10 width=88)
+        Select Operator [SEL_5] (rows=10 width=97)
           Output:["_col0","_col1","_col2"]
-          Group By Operator [GBY_4] (rows=10 width=91)
+          Group By Operator [GBY_4] (rows=10 width=101)
             
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_3]
               PartitionCols:_col0, _col1, _col2
-              Group By Operator [GBY_2] (rows=10 width=91)
+              Group By Operator [GBY_2] (rows=10 width=101)
                 
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                Select Operator [SEL_1] (rows=20 width=83)
+                Select Operator [SEL_1] (rows=20 width=88)
                   Output:["key","c_int","c_float"]
-                  TableScan [TS_0] (rows=20 width=83)
+                  TableScan [TS_0] (rows=20 width=88)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select x, y, count(*) from (select key, 
(c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, 
cbo_t1.c_int, key) R group by y, x
@@ -339,18 +339,18 @@ Stage-0
               PartitionCols:_col0, _col1
               Group By Operator [GBY_8] (rows=5 width=20)
                 
Output:["_col0","_col1","_col2"],aggregations:["count()"],keys:_col0, _col1
-                Select Operator [SEL_5] (rows=10 width=91)
+                Select Operator [SEL_5] (rows=10 width=101)
                   Output:["_col0","_col1"]
-                  Group By Operator [GBY_4] (rows=10 width=91)
+                  Group By Operator [GBY_4] (rows=10 width=101)
                     
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                   <-Map 1 [SIMPLE_EDGE]
                     SHUFFLE [RS_3]
                       PartitionCols:_col0, _col1, _col2
-                      Group By Operator [GBY_2] (rows=10 width=91)
+                      Group By Operator [GBY_2] (rows=10 width=101)
                         
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                        Select Operator [SEL_1] (rows=20 width=83)
+                        Select Operator [SEL_1] (rows=20 width=88)
                           Output:["key","c_int","c_float"]
-                          TableScan [TS_0] (rows=20 width=83)
+                          TableScan [TS_0] (rows=20 width=88)
                             
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key 
order by a) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from 
cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 
0)  group by c_float, cbo_t2.c_int, key order by q/10 desc, r asc) cbo_t2 on 
cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or 
c_int >= 0) group by cbo_t3.c_int, c order by cbo_t3.c_int+c desc, c
@@ -397,11 +397,11 @@ Stage-0
                         <-Map 11 [SIMPLE_EDGE]
                           SHUFFLE [RS_31]
                             PartitionCols:_col0
-                            Select Operator [SEL_29] (rows=18 width=79)
+                            Select Operator [SEL_29] (rows=18 width=84)
                               Output:["_col0","_col1"]
-                              Filter Operator [FIL_50] (rows=18 width=79)
+                              Filter Operator [FIL_50] (rows=18 width=84)
                                 predicate:key is not null
-                                TableScan [TS_27] (rows=20 width=80)
+                                TableScan [TS_27] (rows=20 width=84)
                                   
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                         <-Reducer 4 [SIMPLE_EDGE]
                           SHUFFLE [RS_30]
@@ -428,9 +428,9 @@ Stage-0
                                               PartitionCols:_col0, _col1, _col2
                                               Group By Operator [GBY_14] 
(rows=2 width=101)
                                                 
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                                                Filter Operator [FIL_49] 
(rows=5 width=74)
+                                                Filter Operator [FIL_49] 
(rows=5 width=93)
                                                   predicate:(((c_int + 1) >= 
0) and ((c_int > 0) or (c_float >= 0)) and key is not null)
-                                                  TableScan [TS_11] (rows=20 
width=83)
+                                                  TableScan [TS_11] (rows=20 
width=88)
                                                     
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                                 <-Reducer 3 [SIMPLE_EDGE]
                                   SHUFFLE [RS_22]
@@ -448,9 +448,9 @@ Stage-0
                                               PartitionCols:_col0, _col1, _col2
                                               Group By Operator [GBY_3] 
(rows=2 width=101)
                                                 
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                                                Filter Operator [FIL_48] 
(rows=5 width=74)
+                                                Filter Operator [FIL_48] 
(rows=5 width=93)
                                                   predicate:(((c_int + 1) >= 
0) and ((c_int > 0) or (c_float >= 0)) and key is not null)
-                                                  TableScan [TS_0] (rows=20 
width=83)
+                                                  TableScan [TS_0] (rows=20 
width=88)
                                                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key 
having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, 
c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and 
(cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key  
having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + 
cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c  having 
cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0  order by 
cbo_t3.c_int % c asc, cbo_t3.c_int desc
@@ -494,11 +494,11 @@ Stage-0
                       <-Map 10 [SIMPLE_EDGE]
                         SHUFFLE [RS_28]
                           PartitionCols:_col0
-                          Select Operator [SEL_26] (rows=18 width=79)
+                          Select Operator [SEL_26] (rows=18 width=84)
                             Output:["_col0","_col1"]
-                            Filter Operator [FIL_46] (rows=18 width=79)
+                            Filter Operator [FIL_46] (rows=18 width=84)
                               predicate:((c_int > 0) and key is not null)
-                              TableScan [TS_24] (rows=20 width=80)
+                              TableScan [TS_24] (rows=20 width=84)
                                 
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                       <-Reducer 4 [SIMPLE_EDGE]
                         SHUFFLE [RS_27]
@@ -527,7 +527,7 @@ Stage-0
                                               
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                               Filter Operator [FIL_44] (rows=1 
width=93)
                                                 predicate:(((c_int + 1) >= 0) 
and ((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or 
(c_float >= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and key is not null)
-                                                TableScan [TS_0] (rows=20 
width=83)
+                                                TableScan [TS_0] (rows=20 
width=88)
                                                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                               <-Reducer 9 [SIMPLE_EDGE]
                                 SHUFFLE [RS_20]
@@ -543,7 +543,7 @@ Stage-0
                                           
Output:["_col0","_col1","_col2"],keys:key, c_int, c_float
                                           Filter Operator [FIL_45] (rows=1 
width=93)
                                             predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and key is not null)
-                                            TableScan [TS_11] (rows=20 
width=83)
+                                            TableScan [TS_11] (rows=20 
width=88)
                                               
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key 
having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as 
q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int 
> 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) 
cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + 
cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c
@@ -583,9 +583,9 @@ Stage-0
                     <-Map 8 [SIMPLE_EDGE]
                       SHUFFLE [RS_23]
                         PartitionCols:_col0
-                        Select Operator [SEL_20] (rows=20 width=80)
+                        Select Operator [SEL_20] (rows=20 width=84)
                           Output:["_col0","_col1"]
-                          TableScan [TS_19] (rows=20 width=80)
+                          TableScan [TS_19] (rows=20 width=84)
                             
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                     <-Reducer 3 [SIMPLE_EDGE]
                       SHUFFLE [RS_21]
@@ -605,7 +605,7 @@ Stage-0
                                     
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                     Filter Operator [FIL_34] (rows=1 width=93)
                                       predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0))
-                                      TableScan [TS_0] (rows=20 width=83)
+                                      TableScan [TS_0] (rows=20 width=88)
                                         
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                     <-Reducer 7 [SIMPLE_EDGE]
                       SHUFFLE [RS_22]
@@ -621,7 +621,7 @@ Stage-0
                                 Output:["_col0","_col1","_col2"],keys:key, 
c_int, c_float
                                 Filter Operator [FIL_35] (rows=1 width=93)
                                   predicate:(((c_int + 1) >= 0) and ((c_int > 
0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float >= 1)) 
and ((UDFToFloat(c_int) + c_float) >= 0.0))
-                                  TableScan [TS_11] (rows=20 width=83)
+                                  TableScan [TS_11] (rows=20 width=88)
                                     
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key 
having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, 
sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 
or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having 
cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 
order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on 
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by 
cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + 
c) >= 0 order by cbo_t3.c_int
@@ -665,11 +665,11 @@ Stage-0
                       <-Map 10 [SIMPLE_EDGE]
                         SHUFFLE [RS_27]
                           PartitionCols:_col0
-                          Select Operator [SEL_24] (rows=20 width=80)
+                          Select Operator [SEL_24] (rows=20 width=84)
                             Output:["_col0","_col1"]
-                            Filter Operator [FIL_41] (rows=20 width=80)
+                            Filter Operator [FIL_41] (rows=20 width=84)
                               predicate:(c_int > 0)
-                              TableScan [TS_22] (rows=20 width=80)
+                              TableScan [TS_22] (rows=20 width=84)
                                 
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                       <-Reducer 3 [SIMPLE_EDGE]
                         SHUFFLE [RS_25]
@@ -689,7 +689,7 @@ Stage-0
                                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                       Filter Operator [FIL_39] (rows=1 
width=93)
                                         predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0))
-                                        TableScan [TS_0] (rows=20 width=83)
+                                        TableScan [TS_0] (rows=20 width=88)
                                           
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                       <-Reducer 9 [SIMPLE_EDGE]
                         SHUFFLE [RS_26]
@@ -709,7 +709,7 @@ Stage-0
                                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                       Filter Operator [FIL_40] (rows=1 
width=93)
                                         predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0))
-                                        TableScan [TS_11] (rows=20 width=83)
+                                        TableScan [TS_11] (rows=20 width=88)
                                           
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key 
having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 
where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  
group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or 
c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on 
cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by 
cbo_t3.c_int, c
@@ -749,11 +749,11 @@ Stage-0
                     <-Map 8 [SIMPLE_EDGE]
                       SHUFFLE [RS_25]
                         PartitionCols:_col0
-                        Select Operator [SEL_23] (rows=18 width=79)
+                        Select Operator [SEL_23] (rows=18 width=84)
                           Output:["_col0","_col1"]
-                          Filter Operator [FIL_41] (rows=18 width=79)
+                          Filter Operator [FIL_41] (rows=18 width=84)
                             predicate:key is not null
-                            TableScan [TS_21] (rows=20 width=80)
+                            TableScan [TS_21] (rows=20 width=84)
                               
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                     <-Reducer 3 [SIMPLE_EDGE]
                       SHUFFLE [RS_24]
@@ -778,7 +778,7 @@ Stage-0
                                         
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                         Filter Operator [FIL_39] (rows=1 
width=93)
                                           predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and key is not null)
-                                          TableScan [TS_0] (rows=20 width=83)
+                                          TableScan [TS_0] (rows=20 width=88)
                                             
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                             <-Reducer 7 [SIMPLE_EDGE]
                               SHUFFLE [RS_17]
@@ -794,7 +794,7 @@ Stage-0
                                         
Output:["_col0","_col1","_col2"],keys:key, c_int, c_float
                                         Filter Operator [FIL_40] (rows=1 
width=93)
                                           predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and key is not null)
-                                          TableScan [TS_8] (rows=20 width=83)
+                                          TableScan [TS_8] (rows=20 width=88)
                                             
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select unionsrc.key FROM (select 'tst1' as key, 
count(1) as value from src) unionsrc
@@ -864,9 +864,9 @@ Stage-0
                   SHUFFLE [RS_3]
                     Group By Operator [GBY_2] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(key)"]
-                      Select Operator [SEL_1] (rows=20 width=76)
+                      Select Operator [SEL_1] (rows=20 width=80)
                         Output:["key"]
-                        TableScan [TS_0] (rows=20 width=76)
+                        TableScan [TS_0] (rows=20 width=80)
                           
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
           <-Reducer 6 [CONTAINS]
             Reduce Output Operator [RS_24]
@@ -878,9 +878,9 @@ Stage-0
                   SHUFFLE [RS_10]
                     Group By Operator [GBY_9] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(key)"]
-                      Select Operator [SEL_8] (rows=20 width=76)
+                      Select Operator [SEL_8] (rows=20 width=80)
                         Output:["key"]
-                        TableScan [TS_7] (rows=20 width=76)
+                        TableScan [TS_7] (rows=20 width=80)
                           
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
           <-Reducer 8 [CONTAINS]
             Reduce Output Operator [RS_24]
@@ -892,9 +892,9 @@ Stage-0
                   SHUFFLE [RS_19]
                     Group By Operator [GBY_18] (rows=1 width=8)
                       Output:["_col0"],aggregations:["count(key)"]
-                      Select Operator [SEL_17] (rows=20 width=76)
+                      Select Operator [SEL_17] (rows=20 width=80)
                         Output:["key"]
-                        TableScan [TS_16] (rows=20 width=76)
+                        TableScan [TS_16] (rows=20 width=80)
                           
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select unionsrc.key, count(1) FROM (select 'max' as 
key, max(c_int) as value from cbo_t3 s1
@@ -944,9 +944,9 @@ Stage-0
                         SHUFFLE [RS_3]
                           Group By Operator [GBY_2] (rows=1 width=8)
                             Output:["_col0"],aggregations:["count(key)"]
-                            Select Operator [SEL_1] (rows=20 width=76)
+                            Select Operator [SEL_1] (rows=20 width=80)
                               Output:["key"]
-                              TableScan [TS_0] (rows=20 width=76)
+                              TableScan [TS_0] (rows=20 width=80)
                                 
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
               <-Reducer 7 [CONTAINS]
                 Reduce Output Operator [RS_26]
@@ -961,9 +961,9 @@ Stage-0
                         SHUFFLE [RS_10]
                           Group By Operator [GBY_9] (rows=1 width=8)
                             Output:["_col0"],aggregations:["count(key)"]
-                            Select Operator [SEL_8] (rows=20 width=76)
+                            Select Operator [SEL_8] (rows=20 width=80)
                               Output:["key"]
-                              TableScan [TS_7] (rows=20 width=76)
+                              TableScan [TS_7] (rows=20 width=80)
                                 
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
               <-Reducer 9 [CONTAINS]
                 Reduce Output Operator [RS_26]
@@ -978,9 +978,9 @@ Stage-0
                         SHUFFLE [RS_19]
                           Group By Operator [GBY_18] (rows=1 width=8)
                             Output:["_col0"],aggregations:["count(key)"]
-                            Select Operator [SEL_17] (rows=20 width=76)
+                            Select Operator [SEL_17] (rows=20 width=80)
                               Output:["key"]
-                              TableScan [TS_16] (rows=20 width=76)
+                              TableScan [TS_16] (rows=20 width=80)
                                 
default@cbo_t3,s1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select cbo_t1.key from cbo_t1 join cbo_t3 where 
cbo_t1.key=cbo_t3.key and cbo_t1.key >= 1
@@ -1003,20 +1003,20 @@ Stage-0
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_6]
             PartitionCols:_col0
-            Select Operator [SEL_2] (rows=6 width=70)
+            Select Operator [SEL_2] (rows=6 width=85)
               Output:["_col0"]
-              Filter Operator [FIL_13] (rows=6 width=70)
+              Filter Operator [FIL_13] (rows=6 width=85)
                 predicate:(UDFToDouble(key) >= 1.0)
-                TableScan [TS_0] (rows=20 width=76)
+                TableScan [TS_0] (rows=20 width=80)
                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
         <-Map 3 [SIMPLE_EDGE]
           SHUFFLE [RS_7]
             PartitionCols:_col0
-            Select Operator [SEL_5] (rows=6 width=70)
+            Select Operator [SEL_5] (rows=6 width=85)
               Output:["_col0"]
-              Filter Operator [FIL_14] (rows=6 width=70)
+              Filter Operator [FIL_14] (rows=6 width=85)
                 predicate:(UDFToDouble(key) >= 1.0)
-                TableScan [TS_3] (rows=20 width=76)
+                TableScan [TS_3] (rows=20 width=80)
                   
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select cbo_t1.c_int, cbo_t2.c_int from cbo_t1 left 
outer join  cbo_t2 on cbo_t1.key=cbo_t2.key
@@ -1041,16 +1041,16 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_4]
               PartitionCols:_col0
-              Select Operator [SEL_1] (rows=20 width=80)
+              Select Operator [SEL_1] (rows=20 width=84)
                 Output:["_col0","_col1"]
-                TableScan [TS_0] (rows=20 width=80)
+                TableScan [TS_0] (rows=20 width=84)
                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_5]
               PartitionCols:_col0
-              Select Operator [SEL_3] (rows=20 width=80)
+              Select Operator [SEL_3] (rows=20 width=84)
                 Output:["_col0","_col1"]
-                TableScan [TS_2] (rows=20 width=80)
+                TableScan [TS_2] (rows=20 width=84)
                   
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select cbo_t1.c_int, cbo_t2.c_int from cbo_t1 full 
outer join  cbo_t2 on cbo_t1.key=cbo_t2.key
@@ -1075,16 +1075,16 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_4]
               PartitionCols:_col0
-              Select Operator [SEL_1] (rows=20 width=80)
+              Select Operator [SEL_1] (rows=20 width=84)
                 Output:["_col0","_col1"]
-                TableScan [TS_0] (rows=20 width=80)
+                TableScan [TS_0] (rows=20 width=84)
                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_5]
               PartitionCols:_col0
-              Select Operator [SEL_3] (rows=20 width=80)
+              Select Operator [SEL_3] (rows=20 width=84)
                 Output:["_col0","_col1"]
-                TableScan [TS_2] (rows=20 width=80)
+                TableScan [TS_2] (rows=20 width=84)
                   
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select b, cbo_t1.c, cbo_t2.p, q, cbo_t3.c_int from 
(select key as a, c_int as b, cbo_t1.c_float as c from cbo_t1) cbo_t1 join 
(select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 on 
cbo_t1.a=p join cbo_t3 on cbo_t1.a=key
@@ -1109,29 +1109,29 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_9]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=18 width=82)
+              Select Operator [SEL_2] (rows=18 width=87)
                 Output:["_col0","_col1","_col2"]
-                Filter Operator [FIL_21] (rows=18 width=82)
+                Filter Operator [FIL_21] (rows=18 width=87)
                   predicate:key is not null
-                  TableScan [TS_0] (rows=20 width=83)
+                  TableScan [TS_0] (rows=20 width=88)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_10]
               PartitionCols:_col0
-              Select Operator [SEL_5] (rows=18 width=79)
+              Select Operator [SEL_5] (rows=18 width=84)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_22] (rows=18 width=79)
+                Filter Operator [FIL_22] (rows=18 width=84)
                   predicate:key is not null
-                  TableScan [TS_3] (rows=20 width=80)
+                  TableScan [TS_3] (rows=20 width=84)
                     
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
           <-Map 4 [SIMPLE_EDGE]
             SHUFFLE [RS_11]
               PartitionCols:_col0
-              Select Operator [SEL_8] (rows=18 width=79)
+              Select Operator [SEL_8] (rows=18 width=84)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_23] (rows=18 width=79)
+                Filter Operator [FIL_23] (rows=18 width=84)
                   predicate:key is not null
-                  TableScan [TS_6] (rows=20 width=80)
+                  TableScan [TS_6] (rows=20 width=84)
                     
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select key, cbo_t1.c_int, cbo_t2.p, q from cbo_t1 join 
(select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2) cbo_t2 on 
cbo_t1.key=p join (select key as a, c_int as b, cbo_t3.c_float as c from 
cbo_t3)cbo_t3 on cbo_t1.key=a
@@ -1156,29 +1156,29 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_9]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=18 width=79)
+              Select Operator [SEL_2] (rows=18 width=84)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_21] (rows=18 width=79)
+                Filter Operator [FIL_21] (rows=18 width=84)
                   predicate:key is not null
-                  TableScan [TS_0] (rows=20 width=80)
+                  TableScan [TS_0] (rows=20 width=84)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_10]
               PartitionCols:_col0
-              Select Operator [SEL_5] (rows=18 width=75)
+              Select Operator [SEL_5] (rows=18 width=80)
                 Output:["_col0"]
-                Filter Operator [FIL_22] (rows=18 width=75)
+                Filter Operator [FIL_22] (rows=18 width=80)
                   predicate:key is not null
-                  TableScan [TS_3] (rows=20 width=76)
+                  TableScan [TS_3] (rows=20 width=80)
                     
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
           <-Map 4 [SIMPLE_EDGE]
             SHUFFLE [RS_11]
               PartitionCols:_col0
-              Select Operator [SEL_8] (rows=18 width=79)
+              Select Operator [SEL_8] (rows=18 width=84)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_23] (rows=18 width=79)
+                Filter Operator [FIL_23] (rows=18 width=84)
                   predicate:key is not null
-                  TableScan [TS_6] (rows=20 width=80)
+                  TableScan [TS_6] (rows=20 width=84)
                     
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select * from (select q, b, cbo_t2.p, cbo_t1.c, 
cbo_t3.c_int from (select key as a, c_int as b, cbo_t1.c_float as c from cbo_t1 
 where (cbo_t1.c_int + 1 == 2) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) 
cbo_t1 full outer join (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r 
from cbo_t2  where (cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or 
cbo_t2.c_float >= 0)) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b 
+ cbo_t2.q == 2) and (b > 0 or c_int >= 0)) R where  (q + 1 = 2) and (R.b > 0 
or c_int >= 0)
@@ -1206,11 +1206,11 @@ Stage-0
             <-Map 5 [SIMPLE_EDGE]
               SHUFFLE [RS_15]
                 PartitionCols:_col0
-                Select Operator [SEL_13] (rows=18 width=79)
+                Select Operator [SEL_13] (rows=18 width=84)
                   Output:["_col0","_col1"]
-                  Filter Operator [FIL_26] (rows=18 width=79)
+                  Filter Operator [FIL_26] (rows=18 width=84)
                     predicate:key is not null
-                    TableScan [TS_11] (rows=20 width=80)
+                    TableScan [TS_11] (rows=20 width=84)
                       
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
             <-Reducer 2 [SIMPLE_EDGE]
               SHUFFLE [RS_14]
@@ -1222,20 +1222,20 @@ Stage-0
                   <-Map 1 [SIMPLE_EDGE]
                     SHUFFLE [RS_6]
                       PartitionCols:_col0
-                      Select Operator [SEL_2] (rows=9 width=82)
+                      Select Operator [SEL_2] (rows=9 width=93)
                         Output:["_col0","_col1","_col2"]
-                        Filter Operator [FIL_24] (rows=9 width=82)
+                        Filter Operator [FIL_24] (rows=9 width=93)
                           predicate:(((c_int + 1) = 2) and ((c_int > 0) or 
(c_float >= 0)) and key is not null)
-                          TableScan [TS_0] (rows=20 width=83)
+                          TableScan [TS_0] (rows=20 width=88)
                             
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                   <-Map 4 [SIMPLE_EDGE]
                     SHUFFLE [RS_7]
                       PartitionCols:_col0
-                      Select Operator [SEL_5] (rows=9 width=79)
+                      Select Operator [SEL_5] (rows=9 width=89)
                         Output:["_col0","_col1"]
-                        Filter Operator [FIL_25] (rows=9 width=82)
+                        Filter Operator [FIL_25] (rows=9 width=93)
                           predicate:(((c_int + 1) = 2) and ((c_int > 0) or 
(c_float >= 0)) and key is not null)
-                          TableScan [TS_3] (rows=20 width=83)
+                          TableScan [TS_3] (rows=20 width=88)
                             
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select * from (select q, b, cbo_t2.p, cbo_t1.c, 
cbo_t3.c_int from (select key as a, c_int as b, cbo_t1.c_float as c from cbo_t1 
 where (cbo_t1.c_int + 1 == 2) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) 
cbo_t1 right outer join (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as 
r from cbo_t2  where (cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or 
cbo_t2.c_float >= 0)) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on 
cbo_t1.a=key where (b + cbo_t2.q == 2) and (b > 0 or c_int >= 0)) R where  (q + 
1 = 2) and (R.b > 0 or c_int >= 0)
@@ -1262,27 +1262,27 @@ Stage-0
             <-Map 1 [SIMPLE_EDGE]
               SHUFFLE [RS_8]
                 PartitionCols:_col0
-                Select Operator [SEL_2] (rows=10 width=83)
+                Select Operator [SEL_2] (rows=10 width=93)
                   Output:["_col0","_col1","_col2"]
-                  Filter Operator [FIL_17] (rows=10 width=83)
+                  Filter Operator [FIL_17] (rows=10 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float 
>= 0)))
-                    TableScan [TS_0] (rows=20 width=83)
+                    TableScan [TS_0] (rows=20 width=88)
                       
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
             <-Map 3 [SIMPLE_EDGE]
               SHUFFLE [RS_9]
                 PartitionCols:_col0
-                Select Operator [SEL_5] (rows=10 width=80)
+                Select Operator [SEL_5] (rows=10 width=89)
                   Output:["_col0","_col1"]
-                  Filter Operator [FIL_18] (rows=10 width=83)
+                  Filter Operator [FIL_18] (rows=10 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float 
>= 0)))
-                    TableScan [TS_3] (rows=20 width=83)
+                    TableScan [TS_3] (rows=20 width=88)
                       
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
             <-Map 4 [SIMPLE_EDGE]
               SHUFFLE [RS_10]
                 PartitionCols:_col0
-                Select Operator [SEL_7] (rows=20 width=80)
+                Select Operator [SEL_7] (rows=20 width=84)
                   Output:["_col0","_col1"]
-                  TableScan [TS_6] (rows=20 width=80)
+                  TableScan [TS_6] (rows=20 width=84)
                     
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select key, (c_int+1)+2 as x, sum(c_int) from cbo_t1 
group by c_float, cbo_t1.c_int, key order by x limit 1
@@ -1303,22 +1303,22 @@ Stage-0
       File Output Operator [FS_10]
         Limit [LIM_9] (rows=1 width=97)
           Number of rows:1
-          Select Operator [SEL_8] (rows=10 width=88)
+          Select Operator [SEL_8] (rows=10 width=97)
             Output:["_col0","_col1","_col2"]
           <-Reducer 2 [SIMPLE_EDGE]
             SHUFFLE [RS_7]
-              Select Operator [SEL_5] (rows=10 width=88)
+              Select Operator [SEL_5] (rows=10 width=97)
                 Output:["_col0","_col1","_col2"]
-                Group By Operator [GBY_4] (rows=10 width=91)
+                Group By Operator [GBY_4] (rows=10 width=101)
                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                 <-Map 1 [SIMPLE_EDGE]
                   SHUFFLE [RS_3]
                     PartitionCols:_col0, _col1, _col2
-                    Group By Operator [GBY_2] (rows=10 width=91)
+                    Group By Operator [GBY_2] (rows=10 width=101)
                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                      Select Operator [SEL_1] (rows=20 width=83)
+                      Select Operator [SEL_1] (rows=20 width=88)
                         Output:["key","c_int","c_float"]
-                        TableScan [TS_0] (rows=20 width=83)
+                        TableScan [TS_0] (rows=20 width=88)
                           
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select x, y, count(*) from (select key, 
(c_int+c_float+1+2) as x, sum(c_int) as y from cbo_t1 group by c_float, 
cbo_t1.c_int, key) R group by y, x order by x,y limit 1
@@ -1351,18 +1351,18 @@ Stage-0
                   PartitionCols:_col0, _col1
                   Group By Operator [GBY_8] (rows=5 width=20)
                     
Output:["_col0","_col1","_col2"],aggregations:["count()"],keys:_col1, _col0
-                    Select Operator [SEL_5] (rows=10 width=91)
+                    Select Operator [SEL_5] (rows=10 width=101)
                       Output:["_col0","_col1"]
-                      Group By Operator [GBY_4] (rows=10 width=91)
+                      Group By Operator [GBY_4] (rows=10 width=101)
                         
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                       <-Map 1 [SIMPLE_EDGE]
                         SHUFFLE [RS_3]
                           PartitionCols:_col0, _col1, _col2
-                          Group By Operator [GBY_2] (rows=10 width=91)
+                          Group By Operator [GBY_2] (rows=10 width=101)
                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                            Select Operator [SEL_1] (rows=20 width=83)
+                            Select Operator [SEL_1] (rows=20 width=88)
                               Output:["key","c_int","c_float"]
-                              TableScan [TS_0] (rows=20 width=83)
+                              TableScan [TS_0] (rows=20 width=88)
                                 
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select key from(select key from (select key from 
cbo_t1 limit 5)cbo_t2  limit 5)cbo_t3  limit 5
@@ -1381,27 +1381,27 @@ Stage-0
     Stage-1
       Reducer 3
       File Output Operator [FS_13]
-        Limit [LIM_12] (rows=5 width=68)
+        Limit [LIM_12] (rows=5 width=85)
           Number of rows:5
-          Limit [LIM_10] (rows=5 width=68)
+          Limit [LIM_10] (rows=5 width=85)
             Number of rows:5
-            Select Operator [SEL_9] (rows=5 width=68)
+            Select Operator [SEL_9] (rows=5 width=85)
               Output:["_col0"]
             <-Reducer 2 [SIMPLE_EDGE]
               SHUFFLE [RS_8]
-                Limit [LIM_7] (rows=5 width=68)
+                Limit [LIM_7] (rows=5 width=85)
                   Number of rows:5
-                  Limit [LIM_5] (rows=5 width=68)
+                  Limit [LIM_5] (rows=5 width=85)
                     Number of rows:5
-                    Select Operator [SEL_4] (rows=5 width=68)
+                    Select Operator [SEL_4] (rows=5 width=85)
                       Output:["_col0"]
                     <-Map 1 [SIMPLE_EDGE]
                       SHUFFLE [RS_3]
-                        Limit [LIM_2] (rows=5 width=68)
+                        Limit [LIM_2] (rows=5 width=85)
                           Number of rows:5
-                          Select Operator [SEL_1] (rows=20 width=76)
+                          Select Operator [SEL_1] (rows=20 width=80)
                             Output:["_col0"]
-                            TableScan [TS_0] (rows=20 width=76)
+                            TableScan [TS_0] (rows=20 width=80)
                               
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select key, c_int from(select key, c_int from (select 
key, c_int from cbo_t1 order by c_int limit 5)cbo_t1  order by c_int limit 
5)cbo_t2  order by c_int limit 5
@@ -1421,27 +1421,27 @@ Stage-0
     Stage-1
       Reducer 4
       File Output Operator [FS_13]
-        Limit [LIM_12] (rows=5 width=71)
+        Limit [LIM_12] (rows=5 width=89)
           Number of rows:5
-          Select Operator [SEL_11] (rows=5 width=71)
+          Select Operator [SEL_11] (rows=5 width=89)
             Output:["_col0","_col1"]
           <-Reducer 3 [SIMPLE_EDGE]
             SHUFFLE [RS_10]
-              Limit [LIM_8] (rows=5 width=71)
+              Limit [LIM_8] (rows=5 width=89)
                 Number of rows:5
-                Select Operator [SEL_7] (rows=5 width=71)
+                Select Operator [SEL_7] (rows=5 width=89)
                   Output:["_col0","_col1"]
                 <-Reducer 2 [SIMPLE_EDGE]
                   SHUFFLE [RS_6]
-                    Limit [LIM_4] (rows=5 width=71)
+                    Limit [LIM_4] (rows=5 width=89)
                       Number of rows:5
-                      Select Operator [SEL_3] (rows=20 width=80)
+                      Select Operator [SEL_3] (rows=20 width=84)
                         Output:["_col0","_col1"]
                       <-Map 1 [SIMPLE_EDGE]
                         SHUFFLE [RS_2]
-                          Select Operator [SEL_1] (rows=20 width=80)
+                          Select Operator [SEL_1] (rows=20 width=84)
                             Output:["_col0","_col1"]
-                            TableScan [TS_0] (rows=20 width=80)
+                            TableScan [TS_0] (rows=20 width=84)
                               
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
 
 PREHOOK: query: explain select cbo_t3.c_int, c, count(*) from (select key as 
a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key 
order by a limit 5) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r 
from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or 
cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key order by q/10 desc, r 
asc limit 5) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + 
cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c order by 
cbo_t3.c_int+c desc, c limit 5
@@ -1490,11 +1490,11 @@ Stage-0
                           <-Map 11 [SIMPLE_EDGE]
                             SHUFFLE [RS_37]
                               PartitionCols:_col0
-                              Select Operator [SEL_35] (rows=18 width=79)
+                              Select Operator [SEL_35] (rows=18 width=84)
                                 Output:["_col0","_col1"]
-                                Filter Operator [FIL_59] (rows=18 width=79)
+                                Filter Operator [FIL_59] (rows=18 width=84)
                                   predicate:key is not null
-                                  TableScan [TS_33] (rows=20 width=80)
+                                  TableScan [TS_33] (rows=20 width=84)
                                     
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int"]
                           <-Reducer 4 [SIMPLE_EDGE]
                             SHUFFLE [RS_36]
@@ -1508,50 +1508,50 @@ Stage-0
                                   <-Reducer 10 [SIMPLE_EDGE]
                                     SHUFFLE [RS_29]
                                       PartitionCols:_col0
-                                      Filter Operator [FIL_26] (rows=2 
width=62)
+                                      Filter Operator [FIL_26] (rows=2 
width=105)
                                         predicate:_col0 is not null
-                                        Limit [LIM_24] (rows=3 width=76)
+                                        Limit [LIM_24] (rows=3 width=105)
                                           Number of rows:5
-                                          Select Operator [SEL_23] (rows=3 
width=76)
+                                          Select Operator [SEL_23] (rows=3 
width=105)
                                             Output:["_col0","_col1"]
                                           <-Reducer 9 [SIMPLE_EDGE]
                                             SHUFFLE [RS_22]
-                                              Select Operator [SEL_20] (rows=3 
width=76)
+                                              Select Operator [SEL_20] (rows=3 
width=105)
                                                 
Output:["_col0","_col1","_col2","_col3"]
-                                                Group By Operator [GBY_19] 
(rows=3 width=70)
+                                                Group By Operator [GBY_19] 
(rows=3 width=101)
                                                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                                 <-Map 8 [SIMPLE_EDGE]
                                                   SHUFFLE [RS_18]
                                                     PartitionCols:_col0, 
_col1, _col2
-                                                    Group By Operator [GBY_17] 
(rows=3 width=70)
+                                                    Group By Operator [GBY_17] 
(rows=3 width=101)
                                                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                                                      Filter Operator [FIL_58] 
(rows=6 width=77)
+                                                      Filter Operator [FIL_58] 
(rows=6 width=93)
                                                         predicate:(((c_int + 
1) >= 0) and ((c_int > 0) or (c_float >= 0)))
-                                                        TableScan [TS_14] 
(rows=20 width=83)
+                                                        TableScan [TS_14] 
(rows=20 width=88)
                                                           
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                                   <-Reducer 3 [SIMPLE_EDGE]
                                     SHUFFLE [RS_28]
                                       PartitionCols:_col0
-                                      Filter Operator [FIL_12] (rows=2 
width=54)
+                                      Filter Operator [FIL_12] (rows=2 
width=97)
                                         predicate:_col0 is not null
-                                        Limit [LIM_10] (rows=3 width=68)
+                                        Limit [LIM_10] (rows=3 width=97)
                                           Number of rows:5
-                                          Select Operator [SEL_9] (rows=3 
width=68)
+                                          Select Operator [SEL_9] (rows=3 
width=97)
                                             Output:["_col0","_col1","_col2"]
                                           <-Reducer 2 [SIMPLE_EDGE]
                                             SHUFFLE [RS_8]
-                                              Select Operator [SEL_6] (rows=3 
width=68)
+                                              Select Operator [SEL_6] (rows=3 
width=97)
                                                 
Output:["_col0","_col1","_col2"]
-                                                Group By Operator [GBY_5] 
(rows=3 width=70)
+                                                Group By Operator [GBY_5] 
(rows=3 width=101)
                                                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                                 <-Map 1 [SIMPLE_EDGE]
                                                   SHUFFLE [RS_4]
                                                     PartitionCols:_col0, 
_col1, _col2
-                                                    Group By Operator [GBY_3] 
(rows=3 width=70)
+                                                    Group By Operator [GBY_3] 
(rows=3 width=101)
                                                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
-                                                      Filter Operator [FIL_56] 
(rows=6 width=77)
+                                                      Filter Operator [FIL_56] 
(rows=6 width=93)
                                                         predicate:(((c_int + 
1) >= 0) and ((c_int > 0) or (c_float >= 0)))
-                                                        TableScan [TS_0] 
(rows=20 width=83)
+                                                        TableScan [TS_0] 
(rows=20 width=88)
                                                           
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t1.c_int           from cbo_t1 left semi 
join   cbo_t2 on cbo_t1.key=cbo_t2.key where (cbo_t1.c_int + 1 == 2) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)
@@ -1576,22 +1576,22 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_8]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=9 width=82)
+              Select Operator [SEL_2] (rows=9 width=93)
                 Output:["_col0","_col1"]
-                Filter Operator [FIL_15] (rows=9 width=82)
+                Filter Operator [FIL_15] (rows=9 width=93)
                   predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 
0)) and key is not null)
-                  TableScan [TS_0] (rows=20 width=83)
+                  TableScan [TS_0] (rows=20 width=88)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_9]
               PartitionCols:_col0
-              Group By Operator [GBY_7] (rows=5 width=68)
+              Group By Operator [GBY_7] (rows=5 width=85)
                 Output:["_col0"],keys:_col0
-                Select Operator [SEL_5] (rows=18 width=75)
+                Select Operator [SEL_5] (rows=18 width=80)
                   Output:["_col0"]
-                  Filter Operator [FIL_16] (rows=18 width=75)
+                  Filter Operator [FIL_16] (rows=18 width=80)
                     predicate:key is not null
-                    TableScan [TS_3] (rows=20 width=76)
+                    TableScan [TS_3] (rows=20 width=80)
                       
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select * from (select c, b, a from (select key as a, 
c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 == 2) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select 
cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where 
(cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 
on cbo_t1.a=p left semi join cbo_t3 on cbo_t1.a=key where (b + 1 == 2) and (b > 
0 or c >= 0)) R where  (b + 1 = 2) and (R.b > 0 or c >= 0)
@@ -1616,33 +1616,33 @@ Stage-0
           <-Map 1 [SIMPLE_EDGE]
             SHUFFLE [RS_13]
               PartitionCols:_col0
-              Select Operator [SEL_2] (rows=9 width=82)
+              Select Operator [SEL_2] (rows=9 width=93)
                 Output:["_col0","_col1","_col2"]
-                Filter Operator [FIL_25] (rows=9 width=82)
+                Filter Operator [FIL_25] (rows=9 width=93)
                   predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float >= 
0)) and key is not null)
-                  TableScan [TS_0] (rows=20 width=83)
+                  TableScan [TS_0] (rows=20 width=88)
                     
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 3 [SIMPLE_EDGE]
             SHUFFLE [RS_14]
               PartitionCols:_col0
               Group By Operator [GBY_10] (rows=3 width=85)
                 Output:["_col0"],keys:_col0
-                Select Operator [SEL_5] (rows=9 width=75)
+                Select Operator [SEL_5] (rows=9 width=85)
                   Output:["_col0"]
-                  Filter Operator [FIL_26] (rows=9 width=82)
+                  Filter Operator [FIL_26] (rows=9 width=93)
                     predicate:(((c_int + 1) = 2) and ((c_int > 0) or (c_float 
>= 0)) and key is not null)
-                    TableScan [TS_3] (rows=20 width=83)
+                    TableScan [TS_3] (rows=20 width=88)
                       
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
           <-Map 4 [SIMPLE_EDGE]
             SHUFFLE [RS_15]
               PartitionCols:_col0
-              Group By Operator [GBY_12] (rows=6 width=70)
+              Group By Operator [GBY_12] (rows=6 width=85)
                 Output:["_col0"],keys:_col0
-                Select Operator [SEL_8] (rows=18 width=75)
+                Select Operator [SEL_8] (rows=18 width=80)
                   Output:["_col0"]
-                  Filter Operator [FIL_27] (rows=18 width=75)
+                  Filter Operator [FIL_27] (rows=18 width=80)
                     predicate:key is not null
-                    TableScan [TS_6] (rows=20 width=76)
+                    TableScan [TS_6] (rows=20 width=80)
                       
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
 
 PREHOOK: query: explain select a, c, count(*) from (select key as a, c_int+1 
as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and 
(cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key 
having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by a+b desc, c asc) cbo_t1 left semi join (select key as p, c_int+1 
as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and 
(cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key 
having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) 
>= 0 order by q+r/10 desc, p) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on 
cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a 
> 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
@@ -1684,13 +1684,13 @@ Stage-0
                     <-Map 10 [SIMPLE_EDGE]
                       SHUFFLE [RS_32]
                         PartitionCols:_col0
-                        Group By Operator [GBY_29] (rows=3 width=56)
+                        Group By Operator [GBY_29] (rows=3 width=85)
                           Output:["_col0"],keys:_col0
-                          Select Operator [SEL_25] (rows=6 width=70)
+                          Select Operator [SEL_25] (rows=6 width=85)
                             Output:["_col0"]
-                            Filter Operator [FIL_50] (rows=6 width=70)
+                            Filter Operator [FIL_50] (rows=6 width=85)
                               predicate:(UDFToDouble(key) > 0.0)
-                              TableScan [TS_23] (rows=20 width=76)
+                              TableScan [TS_23] (rows=20 width=80)
                                 
default@cbo_t3,cbo_t3,Tbl:COMPLETE,Col:COMPLETE,Output:["key"]
                     <-Reducer 3 [SIMPLE_EDGE]
                       SHUFFLE [RS_30]
@@ -1714,7 +1714,7 @@ Stage-0
                                         
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                         Filter Operator [FIL_48] (rows=1 
width=93)
                                           predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (((c_int + 1) + 1) >= 0) 
and (((c_int + 1) > 0) or (UDFToDouble(key) >= 0.0)) and (UDFToDouble(key) > 
0.0))
-                                          TableScan [TS_0] (rows=20 width=83)
+                                          TableScan [TS_0] (rows=20 width=88)
                                             
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
                     <-Reducer 9 [SIMPLE_EDGE]
                       SHUFFLE [RS_31]
@@ -1736,7 +1736,7 @@ Stage-0
                                       
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(c_int)"],keys:key, 
c_int, c_float
                                       Filter Operator [FIL_49] (rows=1 
width=93)
                                         predicate:(((c_int + 1) >= 0) and 
((c_int > 0) or (c_float >= 0)) and (c_float > 0) and ((c_int >= 1) or (c_float 
>= 1)) and ((UDFToFloat(c_int) + c_float) >= 0.0) and (UDFToDouble(key) > 0.0))
-                                        TableScan [TS_12] (rows=20 width=83)
+                                        TableScan [TS_12] (rows=20 width=88)
                                           
default@cbo_t2,cbo_t2,Tbl:COMPLETE,Col:COMPLETE,Output:["key","c_int","c_float"]
 
 PREHOOK: query: explain select cbo_t1.key as x, c_int as c_int, 
(((c_int+c_float)*10)+5) as y from cbo_t1
@@ -2280,7 +2280,7 @@ Stage-0
               <-Map 1 [SIMPLE_EDGE]
                 SHUFFLE [RS_4]
                   PartitionCols:_col0, _col1
-                  Group By Operator [GBY_3] (rows=13 width=219)
+                  Group By Operator [GBY_3] (rows=13 width=295)
                     
Output:["_col0","_col1","_col2"],aggregations:["avg(p_size)"],keys:p_name, 
p_mfgr
                     Filter Operator [FIL_24] (rows=26 width=223)
                       predicate:p_name is not null
@@ -2518,7 +2518,7 @@ Stage-0
                                     
Output:["_col0"],aggregations:["avg(VALUE._col0)"]
                                   <-Map 5 [SIMPLE_EDGE]
                                     SHUFFLE [RS_6]
-                                      Group By Operator [GBY_5] (rows=1 
width=0)
+                                      Group By Operator [GBY_5] (rows=1 
width=76)
                                         
Output:["_col0"],aggregations:["avg(p_size)"]
                                         Filter Operator [FIL_37] (rows=8 
width=4)
                                           predicate:(p_size < 10)
@@ -2531,7 +2531,7 @@ Stage-0
                       Output:["_col0"],aggregations:["avg(VALUE._col0)"]
                     <-Map 7 [SIMPLE_EDGE]
                       SHUFFLE [RS_22]
-                        Group By Operator [GBY_21] (rows=1 width=0)
+                        Group By Operator [GBY_21] (rows=1 width=76)
                           Output:["_col0"],aggregations:["avg(p_size)"]
                           Filter Operator [FIL_39] (rows=8 width=4)
                             predicate:(p_size < 10)
@@ -2716,14 +2716,14 @@ Stage-0
       File Output Operator [FS_6]
         Select Operator [SEL_4] (rows=20 width=64)
           
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
-          PTF Operator [PTF_3] (rows=20 width=612)
+          PTF Operator [PTF_3] (rows=20 width=621)
             Function definitions:[{},{"name:":"windowingtablefunction","order 
by:":"_col1 ASC NULLS FIRST","partition by:":"_col0"}]
-            Select Operator [SEL_2] (rows=20 width=612)
+            Select Operator [SEL_2] (rows=20 width=621)
               Output:["_col0","_col1","_col2","_col3"]
             <-Map 1 [SIMPLE_EDGE]
               SHUFFLE [RS_1]
                 PartitionCols:key
-                TableScan [TS_0] (rows=20 width=160)
+                TableScan [TS_0] (rows=20 width=169)
                   
default@cbo_t1,cbo_t1,Tbl:COMPLETE,Col:COMPLETE,Output:["c_float","c_int","key","value"]
 
 PREHOOK: query: explain select *, rank() over(partition by key order by value) 
as rr from src1

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out 
b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
index 345d5f7..ff62691 100644
--- a/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
+++ b/ql/src/test/results/clientpositive/tez/explainuser_3.q.out
@@ -197,11 +197,11 @@ Stage-2
     Stage-0
       Reducer 2
       File Output Operator [FS_6]
-        Group By Operator [GBY_4] (rows=1 width=0)
+        Group By Operator [GBY_4] (rows=1 width=984)
           
Output:["_col0","_col1"],aggregations:["compute_stats(VALUE._col0)","compute_stats(VALUE._col1)"]
         <-Map 1 [SIMPLE_EDGE]
           SHUFFLE [RS_3]
-            Group By Operator [GBY_2] (rows=1 width=0)
+            Group By Operator [GBY_2] (rows=1 width=984)
               Output:["_col0","_col1"],aggregations:["compute_stats(key, 
16)","compute_stats(value, 16)"]
               Select Operator [SEL_1] (rows=500 width=10)
                 Output:["key","value"]

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/groupby3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/groupby3.q.out 
b/ql/src/test/results/clientpositive/tez/groupby3.q.out
index c46d1df..771a0ed 100644
--- a/ql/src/test/results/clientpositive/tez/groupby3.q.out
+++ b/ql/src/test/results/clientpositive/tez/groupby3.q.out
@@ -67,10 +67,10 @@ STAGE PLANS:
                 aggregations: sum(KEY._col0:0._col0), avg(KEY._col0:0._col0), 
avg(DISTINCT KEY._col0:0._col0), max(KEY._col0:0._col0), 
min(KEY._col0:0._col0), std(KEY._col0:0._col0), stddev_samp(KEY._col0:0._col0), 
variance(KEY._col0:0._col0), var_samp(KEY._col0:0._col0)
                 mode: partial1
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1208 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   sort order: 
-                  Statistics: Num rows: 1 Data size: 176 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 1208 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col0 (type: double), _col1 (type: 
struct<count:bigint,sum:double,input:string>), _col2 (type: 
struct<count:bigint,sum:double,input:string>), _col3 (type: string), _col4 
(type: string), _col5 (type: struct<count:bigint,sum:double,variance:double>), 
_col6 (type: struct<count:bigint,sum:double,variance:double>), _col7 (type: 
struct<count:bigint,sum:double,variance:double>), _col8 (type: 
struct<count:bigint,sum:double,variance:double>)
         Reducer 3 
             Reduce Operator Tree:
@@ -78,14 +78,14 @@ STAGE PLANS:
                 aggregations: sum(VALUE._col0), avg(VALUE._col1), 
avg(VALUE._col2), max(VALUE._col3), min(VALUE._col4), std(VALUE._col5), 
stddev_samp(VALUE._col6), variance(VALUE._col7), var_samp(VALUE._col8)
                 mode: final
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 1208 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: double), _col1 (type: double), 
_col2 (type: double), UDFToDouble(_col3) (type: double), UDFToDouble(_col4) 
(type: double), _col5 (type: double), _col6 (type: double), _col7 (type: 
double), _col8 (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                  Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 1208 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1 Data size: 224 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 1208 Basic stats: 
COMPLETE Column stats: NONE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out 
b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
index 4075b81..a399cce 100644
--- a/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
@@ -36,11 +36,11 @@ STAGE PLANS:
                       aggregations: max(ds)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         null sort order: 
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         tag: -1
                         value expressions: _col0 (type: string)
                         auto parallelism: false
@@ -51,13 +51,13 @@ STAGE PLANS:
                 aggregations: max(VALUE._col0)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
 #### A masked pattern was here ####
                   NumFilesPerFileSink: 1
-                  Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -127,11 +127,11 @@ STAGE PLANS:
                       aggregations: max(ds)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         null sort order: 
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         tag: -1
                         value expressions: _col0 (type: string)
                         auto parallelism: false
@@ -191,13 +191,13 @@ STAGE PLANS:
                 aggregations: max(VALUE._col0)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
 #### A masked pattern was here ####
                   NumFilesPerFileSink: 1
-                  Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
@@ -659,11 +659,11 @@ STAGE PLANS:
                       aggregations: max(ds)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         null sort order: 
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         tag: -1
                         value expressions: _col0 (type: string)
                         auto parallelism: false
@@ -823,33 +823,33 @@ STAGE PLANS:
                 aggregations: max(VALUE._col0)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   isSamplingPred: false
                   predicate: _col0 is not null (type: boolean)
-                  Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     null sort order: a
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                     tag: 1
                     auto parallelism: true
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                       Dynamic Partitioning Event Operator
                         Target column: ds (string)
                         Target Input: a2
                         Partition key expr: ds
-                        Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         Target Vertex: Map 1
 
   Stage: Stage-0
@@ -1405,11 +1405,11 @@ STAGE PLANS:
                       aggregations: max(ds)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         null sort order: 
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 84 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 184 Basic stats: 
COMPLETE Column stats: NONE
                         tag: -1
                         value expressions: _col0 (type: string)
                         auto parallelism: false
@@ -1515,13 +1515,13 @@ STAGE PLANS:
                 aggregations: max(VALUE._col0)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
                   GlobalTableId: 0
 #### A masked pattern was here ####
                   NumFilesPerFileSink: 1
-                  Statistics: Num rows: 1 Data size: 84 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE 
Column stats: NONE
 #### A masked pattern was here ####
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/subquery_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/subquery_in.q.out 
b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
index 627adfe..4351338 100644
--- a/ql/src/test/results/clientpositive/tez/subquery_in.q.out
+++ b/ql/src/test/results/clientpositive/tez/subquery_in.q.out
@@ -357,10 +357,10 @@ STAGE PLANS:
                         aggregations: avg(_col0)
                         mode: hash
                         outputColumnNames: _col0
-                        Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 76 Basic stats: 
COMPLETE Column stats: NONE
                         Reduce Output Operator
                           sort order: 
-                          Statistics: Num rows: 1 Data size: 0 Basic stats: 
PARTIAL Column stats: NONE
+                          Statistics: Num rows: 1 Data size: 76 Basic stats: 
COMPLETE Column stats: NONE
                           value expressions: _col0 (type: 
struct<count:bigint,sum:double,input:int>)
         Reducer 5 
             Reduce Operator Tree:
@@ -368,20 +368,20 @@ STAGE PLANS:
                 aggregations: avg(VALUE._col0)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 76 Basic stats: COMPLETE 
Column stats: NONE
                 Filter Operator
                   predicate: _col0 is not null (type: boolean)
-                  Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 76 Basic stats: COMPLETE 
Column stats: NONE
                   Group By Operator
                     keys: _col0 (type: double)
                     mode: hash
                     outputColumnNames: _col0
-                    Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 76 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: double)
                       sort order: +
                       Map-reduce partition columns: _col0 (type: double)
-                      Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 76 Basic stats: 
COMPLETE Column stats: NONE
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out 
b/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out
index 833d47e..aadf4a6 100644
--- a/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_aggregate_9.q.out
@@ -132,10 +132,10 @@ STAGE PLANS:
                       aggregations: min(dc), max(dc), sum(dc), avg(dc)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      Statistics: Num rows: 1 Data size: 336 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 1 Data size: 624 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         sort order: 
-                        Statistics: Num rows: 1 Data size: 336 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 1 Data size: 624 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col0 (type: decimal(38,18)), _col1 
(type: decimal(38,18)), _col2 (type: decimal(38,18)), _col3 (type: 
struct<count:bigint,sum:decimal(38,18),input:decimal(38,18)>)
             Execution mode: vectorized
         Reducer 2 
@@ -144,10 +144,10 @@ STAGE PLANS:
                 aggregations: min(VALUE._col0), max(VALUE._col1), 
sum(VALUE._col2), avg(VALUE._col3)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 1 Data size: 448 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 1 Data size: 624 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1 Data size: 448 Basic stats: COMPLETE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 624 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/8efe6f7f/ql/src/test/results/clientpositive/tez/vector_aggregate_without_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/vector_aggregate_without_gby.q.out 
b/ql/src/test/results/clientpositive/tez/vector_aggregate_without_gby.q.out
index 3bbbb46..dfac90b 100644
--- a/ql/src/test/results/clientpositive/tez/vector_aggregate_without_gby.q.out
+++ b/ql/src/test/results/clientpositive/tez/vector_aggregate_without_gby.q.out
@@ -48,11 +48,11 @@ Stage-0
     Stage-1
       Reducer 2 vectorized
       File Output Operator [FS_14]
-        Group By Operator [GBY_13] (rows=1 width=88)
+        Group By Operator [GBY_13] (rows=1 width=188)
           
Output:["_col0","_col1"],aggregations:["max(VALUE._col0)","max(VALUE._col1)"]
         <-Map 1 [SIMPLE_EDGE] vectorized
           SHUFFLE [RS_12]
-            Group By Operator [GBY_11] (rows=1 width=88)
+            Group By Operator [GBY_11] (rows=1 width=188)
               Output:["_col0","_col1"],aggregations:["max(dt)","max(greg_dt)"]
               Select Operator [SEL_10] (rows=3 width=102)
                 Output:["dt","greg_dt"]

Reply via email to