http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out
index 2504d78..b4410ff 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query58.q.out
@@ -141,10 +141,10 @@ POSTHOOK: Input: default@web_sales
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 CBO PLAN:
 HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], fetch=[100])
-  HiveProject(item_id=[$0], ss_item_rev=[$3], ss_dev=[*(/(/($3, +(+($3, $1), 
$5)), CAST(3):DECIMAL(10, 0)), CAST(100):DECIMAL(10, 0))], cs_item_rev=[$1], 
cs_dev=[*(/(/($1, +(+($3, $1), $5)), CAST(3):DECIMAL(10, 0)), 
CAST(100):DECIMAL(10, 0))], ws_item_rev=[$5], ws_dev=[*(/(/($5, +(+($3, $1), 
$5)), CAST(3):DECIMAL(10, 0)), CAST(100):DECIMAL(10, 0))], average=[/(+(+($3, 
$1), $5), CAST(3):DECIMAL(10, 0))])
-    HiveJoin(condition=[AND(AND(AND(AND(=($0, $4), BETWEEN(false, $3, *(0.9, 
$5), *(1.1, $5))), BETWEEN(false, $1, *(0.9, $5), *(1.1, $5))), BETWEEN(false, 
$5, *(0.9, $3), *(1.1, $3))), BETWEEN(false, $5, *(0.9, $1), *(1.1, $1)))], 
joinType=[inner], algorithm=[none], cost=[not available])
-      HiveJoin(condition=[AND(AND(=($2, $0), BETWEEN(false, $3, *(0.9, $1), 
*(1.1, $1))), BETWEEN(false, $1, *(0.9, $3), *(1.1, $3)))], joinType=[inner], 
algorithm=[none], cost=[not available])
-        HiveProject(i_item_id=[$0], $f1=[$1])
+  HiveProject(item_id=[$0], ss_item_rev=[$5], ss_dev=[*(/(/($5, +(+($5, $1), 
$9)), CAST(3):DECIMAL(10, 0)), CAST(100):DECIMAL(10, 0))], cs_item_rev=[$1], 
cs_dev=[*(/(/($1, +(+($5, $1), $9)), CAST(3):DECIMAL(10, 0)), 
CAST(100):DECIMAL(10, 0))], ws_item_rev=[$9], ws_dev=[*(/(/($9, +(+($5, $1), 
$9)), CAST(3):DECIMAL(10, 0)), CAST(100):DECIMAL(10, 0))], average=[/(+(+($5, 
$1), $9), CAST(3):DECIMAL(10, 0))])
+    HiveJoin(condition=[AND(AND(AND(AND(=($0, $8), BETWEEN(false, $5, $10, 
$11)), BETWEEN(false, $1, $10, $11)), BETWEEN(false, $9, $6, $7)), 
BETWEEN(false, $9, $2, $3))], joinType=[inner], algorithm=[none], cost=[not 
available])
+      HiveJoin(condition=[AND(AND(=($4, $0), BETWEEN(false, $5, $2, $3)), 
BETWEEN(false, $1, $6, $7))], joinType=[inner], algorithm=[none], cost=[not 
available])
+        HiveProject($f0=[$0], $f1=[$1], *=[*(0.9, $1)], *3=[*(1.1, $1)])
           HiveAggregate(group=[{4}], agg#0=[sum($2)])
             HiveJoin(condition=[=($0, $5)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveJoin(condition=[=($1, $3)], joinType=[inner], 
algorithm=[none], cost=[not available])
@@ -175,7 +175,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
                           HiveProject(d_week_seq=[$4])
                             HiveFilter(condition=[AND(=($2, 
_UTF-16LE'1998-02-19'), IS NOT NULL($4))])
                               HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-        HiveProject(i_item_id=[$0], $f1=[$1])
+        HiveProject($f0=[$0], $f1=[$1], *=[*(0.9, $1)], *3=[*(1.1, $1)])
           HiveAggregate(group=[{4}], agg#0=[sum($2)])
             HiveJoin(condition=[=($0, $5)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveJoin(condition=[=($1, $3)], joinType=[inner], 
algorithm=[none], cost=[not available])
@@ -206,7 +206,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
                           HiveProject(d_week_seq=[$4])
                             HiveFilter(condition=[AND(=($2, 
_UTF-16LE'1998-02-19'), IS NOT NULL($4))])
                               HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-      HiveProject(i_item_id=[$0], $f1=[$1])
+      HiveProject($f0=[$0], $f1=[$1], *=[*(0.9, $1)], *3=[*(1.1, $1)])
         HiveAggregate(group=[{4}], agg#0=[sum($2)])
           HiveJoin(condition=[=($0, $5)], joinType=[inner], algorithm=[none], 
cost=[not available])
             HiveJoin(condition=[=($1, $3)], joinType=[inner], 
algorithm=[none], cost=[not available])

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query59.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query59.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query59.q.out
index bb92a1f..8674a8a 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query59.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query59.q.out
@@ -94,24 +94,24 @@ POSTHOOK: Input: default@store_sales
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 CBO PLAN:
 HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], 
dir2=[ASC], fetch=[100])
-  HiveProject(s_store_name1=[$2], s_store_id1=[$1], d_week_seq1=[$3], 
_o__c3=[/($5, $16)], _o__c4=[/($6, $17)], _o__c5=[/($7, $7)], _o__c6=[/($8, 
$18)], _o__c7=[/($9, $19)], _o__c8=[/($10, $20)], _o__c9=[/($11, $21)])
-    HiveJoin(condition=[AND(=($1, $15), =($3, -($14, 52)))], joinType=[inner], 
algorithm=[none], cost=[not available])
+  HiveProject(s_store_name1=[$2], s_store_id1=[$1], d_week_seq1=[$3], 
_o__c3=[/($5, $15)], _o__c4=[/($6, $16)], _o__c5=[/($7, $7)], _o__c6=[/($8, 
$17)], _o__c7=[/($9, $18)], _o__c8=[/($10, $19)], _o__c9=[/($11, $20)])
+    HiveJoin(condition=[AND(=($1, $14), =($3, -($13, 52)))], joinType=[inner], 
algorithm=[none], cost=[not available])
       HiveJoin(condition=[=($4, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
         HiveProject(s_store_sk=[$0], s_store_id=[$1], s_store_name=[$5])
           HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
             HiveTableScan(table=[[default, store]], table:alias=[store])
-        HiveJoin(condition=[=($10, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
+        HiveJoin(condition=[=($9, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
           HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], 
$f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8])
             HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)], 
agg#2=[sum($4)], agg#3=[sum($5)], agg#4=[sum($6)], agg#5=[sum($7)], 
agg#6=[sum($8)])
-              HiveProject($f0=[$4], $f1=[$1], $f2=[CASE(=($5, 
_UTF-16LE'Sunday'), $2, null)], $f3=[CASE(=($5, _UTF-16LE'Monday'), $2, null)], 
$f4=[CASE(=($5, _UTF-16LE'Tuesday'), $2, null)], $f5=[CASE(=($5, 
_UTF-16LE'Wednesday'), $2, null)], $f6=[CASE(=($5, _UTF-16LE'Thursday'), $2, 
null)], $f7=[CASE(=($5, _UTF-16LE'Friday'), $2, null)], $f8=[CASE(=($5, 
_UTF-16LE'Saturday'), $2, null)])
+              HiveProject($f0=[$4], $f1=[$1], $f2=[CASE($5, $2, null)], 
$f3=[CASE($6, $2, null)], $f4=[CASE($7, $2, null)], $f5=[CASE($8, $2, null)], 
$f6=[CASE($9, $2, null)], $f7=[CASE($10, $2, null)], $f8=[CASE($11, $2, null)])
                 HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(ss_sold_date_sk=[$0], ss_store_sk=[$7], 
ss_sales_price=[$13])
                     HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($7))])
                       HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                  HiveProject(d_date_sk=[$0], d_week_seq=[$4], 
d_day_name=[$14])
+                  HiveProject(d_date_sk=[$0], d_week_seq=[$4], ==[=($14, 
_UTF-16LE'Sunday')], =3=[=($14, _UTF-16LE'Monday')], =4=[=($14, 
_UTF-16LE'Tuesday')], =5=[=($14, _UTF-16LE'Wednesday')], =6=[=($14, 
_UTF-16LE'Thursday')], =7=[=($14, _UTF-16LE'Friday')], =8=[=($14, 
_UTF-16LE'Saturday')])
                     HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($4))])
                       HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-          HiveProject(d_month_seq=[$3], d_week_seq=[$4])
+          HiveProject(d_week_seq=[$4])
             HiveFilter(condition=[AND(BETWEEN(false, $3, 1185, 1196), IS NOT 
NULL($4))])
               HiveTableScan(table=[[default, date_dim]], table:alias=[d])
       HiveProject(d_week_seq2=[$2], s_store_id2=[$1], sun_sales2=[$4], 
mon_sales2=[$5], wed_sales2=[$6], thu_sales2=[$7], fri_sales2=[$8], 
sat_sales2=[$9])
@@ -119,18 +119,18 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], 
dir0=[ASC], dir1=[ASC], dir2=[
           HiveProject(s_store_sk=[$0], s_store_id=[$1])
             HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($1))])
               HiveTableScan(table=[[default, store]], table:alias=[store])
-          HiveJoin(condition=[=($9, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
+          HiveJoin(condition=[=($8, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
             HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], 
$f5=[$5], $f6=[$6], $f7=[$7])
               HiveAggregate(group=[{0, 1}], agg#0=[sum($2)], agg#1=[sum($3)], 
agg#2=[sum($5)], agg#3=[sum($6)], agg#4=[sum($7)], agg#5=[sum($8)])
-                HiveProject($f0=[$4], $f1=[$1], $f2=[CASE(=($5, 
_UTF-16LE'Sunday'), $2, null)], $f3=[CASE(=($5, _UTF-16LE'Monday'), $2, null)], 
$f4=[CASE(=($5, _UTF-16LE'Tuesday'), $2, null)], $f5=[CASE(=($5, 
_UTF-16LE'Wednesday'), $2, null)], $f6=[CASE(=($5, _UTF-16LE'Thursday'), $2, 
null)], $f7=[CASE(=($5, _UTF-16LE'Friday'), $2, null)], $f8=[CASE(=($5, 
_UTF-16LE'Saturday'), $2, null)])
+                HiveProject($f0=[$4], $f1=[$1], $f2=[CASE($5, $2, null)], 
$f3=[CASE($6, $2, null)], $f4=[CASE($7, $2, null)], $f5=[CASE($8, $2, null)], 
$f6=[CASE($9, $2, null)], $f7=[CASE($10, $2, null)], $f8=[CASE($11, $2, null)])
                   HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                     HiveProject(ss_sold_date_sk=[$0], ss_store_sk=[$7], 
ss_sales_price=[$13])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($7))])
                         HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                    HiveProject(d_date_sk=[$0], d_week_seq=[$4], 
d_day_name=[$14])
+                    HiveProject(d_date_sk=[$0], d_week_seq=[$4], ==[=($14, 
_UTF-16LE'Sunday')], =3=[=($14, _UTF-16LE'Monday')], =4=[=($14, 
_UTF-16LE'Tuesday')], =5=[=($14, _UTF-16LE'Wednesday')], =6=[=($14, 
_UTF-16LE'Thursday')], =7=[=($14, _UTF-16LE'Friday')], =8=[=($14, 
_UTF-16LE'Saturday')])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($4))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-            HiveProject(d_month_seq=[$3], d_week_seq=[$4])
+            HiveProject(d_week_seq=[$4])
               HiveFilter(condition=[AND(BETWEEN(false, $3, 1197, 1208), IS NOT 
NULL($4))])
                 HiveTableScan(table=[[default, date_dim]], table:alias=[d])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out
index 02149e7..f502c00 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query6.q.out
@@ -88,13 +88,13 @@ HiveSortLimit(sort0=[$1], dir0=[ASC], fetch=[100])
                 HiveProject(ca_address_sk=[$0], ca_state=[$8])
                   HiveFilter(condition=[IS NOT NULL($0)])
                     HiveTableScan(table=[[default, customer_address]], 
table:alias=[a])
-          HiveProject(i_item_sk=[$0], i_current_price=[$1], i_category=[$2], 
_o__c0=[$3], i_category0=[$4], cnt=[$5])
-            HiveJoin(condition=[AND(=($4, $2), >($1, *(1.2, 
CAST($3):DECIMAL(16, 6))))], joinType=[inner], algorithm=[none], cost=[not 
available])
+          HiveProject(i_item_sk=[$0], i_current_price=[$1], i_category=[$2], 
i_category0=[$3], *=[$4], cnt=[$5])
+            HiveJoin(condition=[AND(=($3, $2), >($1, $4))], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveProject(i_item_sk=[$0], i_current_price=[$5], 
i_category=[$12])
                 HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($12))])
                   HiveTableScan(table=[[default, item]], table:alias=[i])
               HiveJoin(condition=[true], joinType=[inner], algorithm=[none], 
cost=[not available])
-                HiveProject(_o__c0=[/($1, $2)], i_category=[$0])
+                HiveProject(i_category=[$0], *=[*(1.2, CAST(/($1, 
$2)):DECIMAL(16, 6))])
                   HiveAggregate(group=[{12}], agg#0=[sum($5)], 
agg#1=[count($5)])
                     HiveFilter(condition=[IS NOT NULL($12)])
                       HiveTableScan(table=[[default, item]], table:alias=[j])

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query60.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query60.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query60.q.out
index 81dfec7..acda930 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query60.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query60.q.out
@@ -173,8 +173,8 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
       HiveProject(i_item_id=[$0], $f1=[$1])
         HiveUnion(all=[true])
           HiveProject(i_item_id=[$0], $f1=[$1])
-            HiveAggregate(group=[{1}], agg#0=[sum($8)])
-              HiveJoin(condition=[=($6, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveAggregate(group=[{1}], agg#0=[sum($7)])
+              HiveJoin(condition=[=($5, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(i_item_sk=[$0], i_item_id=[$1])
                     HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT 
NULL($0))])
@@ -183,21 +183,21 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
                     HiveAggregate(group=[{1}])
                       HiveFilter(condition=[AND(=($12, _UTF-16LE'Children'), 
IS NOT NULL($1))])
                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                HiveProject(ca_address_sk=[$0], ca_gmt_offset=[$1], 
ss_sold_date_sk=[$2], ss_item_sk=[$3], ss_addr_sk=[$4], 
ss_ext_sales_price=[$5], d_date_sk=[$6], d_year=[$7], d_moy=[$8])
-                  HiveJoin(condition=[=($4, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                    HiveProject(ca_address_sk=[$0], 
ca_gmt_offset=[CAST(-6):DECIMAL(5, 2)])
+                HiveProject(ca_address_sk=[$0], ss_sold_date_sk=[$1], 
ss_item_sk=[$2], ss_addr_sk=[$3], ss_ext_sales_price=[$4], d_date_sk=[$5])
+                  HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                    HiveProject(ca_address_sk=[$0])
                       HiveFilter(condition=[AND(=($11, -6), IS NOT NULL($0))])
                         HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
                     HiveJoin(condition=[=($0, $4)], joinType=[inner], 
algorithm=[none], cost=[not available])
                       HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_addr_sk=[$6], ss_ext_sales_price=[$15])
                         HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($6), IS NOT NULL($2))])
                           HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[CAST(9):INTEGER])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), =($8, 9), IS 
NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
           HiveProject(i_item_id=[$0], $f1=[$1])
-            HiveAggregate(group=[{1}], agg#0=[sum($8)])
-              HiveJoin(condition=[=($7, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveAggregate(group=[{1}], agg#0=[sum($7)])
+              HiveJoin(condition=[=($6, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(i_item_sk=[$0], i_item_id=[$1])
                     HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT 
NULL($0))])
@@ -206,21 +206,21 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
                     HiveAggregate(group=[{1}])
                       HiveFilter(condition=[AND(=($12, _UTF-16LE'Children'), 
IS NOT NULL($1))])
                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                HiveProject(ca_address_sk=[$0], ca_gmt_offset=[$1], 
cs_sold_date_sk=[$2], cs_bill_addr_sk=[$3], cs_item_sk=[$4], 
cs_ext_sales_price=[$5], d_date_sk=[$6], d_year=[$7], d_moy=[$8])
-                  HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                    HiveProject(ca_address_sk=[$0], 
ca_gmt_offset=[CAST(-6):DECIMAL(5, 2)])
+                HiveProject(ca_address_sk=[$0], cs_sold_date_sk=[$1], 
cs_bill_addr_sk=[$2], cs_item_sk=[$3], cs_ext_sales_price=[$4], d_date_sk=[$5])
+                  HiveJoin(condition=[=($2, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                    HiveProject(ca_address_sk=[$0])
                       HiveFilter(condition=[AND(=($11, -6), IS NOT NULL($0))])
                         HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
                     HiveJoin(condition=[=($0, $4)], joinType=[inner], 
algorithm=[none], cost=[not available])
                       HiveProject(cs_sold_date_sk=[$0], cs_bill_addr_sk=[$6], 
cs_item_sk=[$15], cs_ext_sales_price=[$23])
                         HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($6), IS NOT NULL($15))])
                           HiveTableScan(table=[[default, catalog_sales]], 
table:alias=[catalog_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[CAST(9):INTEGER])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), =($8, 9), IS 
NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
           HiveProject(i_item_id=[$0], $f1=[$1])
-            HiveAggregate(group=[{1}], agg#0=[sum($8)])
-              HiveJoin(condition=[=($6, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveAggregate(group=[{1}], agg#0=[sum($7)])
+              HiveJoin(condition=[=($5, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(i_item_sk=[$0], i_item_id=[$1])
                     HiveFilter(condition=[AND(IS NOT NULL($1), IS NOT 
NULL($0))])
@@ -229,16 +229,16 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
                     HiveAggregate(group=[{1}])
                       HiveFilter(condition=[AND(=($12, _UTF-16LE'Children'), 
IS NOT NULL($1))])
                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                HiveProject(ca_address_sk=[$0], ca_gmt_offset=[$1], 
ws_sold_date_sk=[$2], ws_item_sk=[$3], ws_bill_addr_sk=[$4], 
ws_ext_sales_price=[$5], d_date_sk=[$6], d_year=[$7], d_moy=[$8])
-                  HiveJoin(condition=[=($4, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                    HiveProject(ca_address_sk=[$0], 
ca_gmt_offset=[CAST(-6):DECIMAL(5, 2)])
+                HiveProject(ca_address_sk=[$0], ws_sold_date_sk=[$1], 
ws_item_sk=[$2], ws_bill_addr_sk=[$3], ws_ext_sales_price=[$4], d_date_sk=[$5])
+                  HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                    HiveProject(ca_address_sk=[$0])
                       HiveFilter(condition=[AND(=($11, -6), IS NOT NULL($0))])
                         HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
                     HiveJoin(condition=[=($0, $4)], joinType=[inner], 
algorithm=[none], cost=[not available])
                       HiveProject(ws_sold_date_sk=[$0], ws_item_sk=[$3], 
ws_bill_addr_sk=[$7], ws_ext_sales_price=[$23])
                         HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($7), IS NOT NULL($3))])
                           HiveTableScan(table=[[default, web_sales]], 
table:alias=[web_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[CAST(9):INTEGER])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), =($8, 9), IS 
NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out
index c5356df..8e8cf27 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query61.q.out
@@ -106,59 +106,59 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
   HiveProject(promotions=[$0], total=[$1], _o__c2=[*(/(CAST($0):DECIMAL(15, 
4), CAST($1):DECIMAL(15, 4)), CAST(100):DECIMAL(10, 0))])
     HiveJoin(condition=[true], joinType=[inner], algorithm=[none], cost=[not 
available])
       HiveProject($f0=[$0])
-        HiveAggregate(group=[{}], agg#0=[sum($9)])
-          HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
+        HiveAggregate(group=[{}], agg#0=[sum($8)])
+          HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
             HiveJoin(condition=[=($2, $1)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4])
                 HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))])
                   HiveTableScan(table=[[default, customer]], 
table:alias=[customer])
-              HiveProject(ca_address_sk=[$0], 
ca_gmt_offset=[CAST(-7):DECIMAL(5, 2)])
+              HiveProject(ca_address_sk=[$0])
                 HiveFilter(condition=[AND(=($11, -7), IS NOT NULL($0))])
                   HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
-            HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], 
ss_customer_sk=[$2], ss_store_sk=[$3], ss_promo_sk=[$4], 
ss_ext_sales_price=[$5], d_date_sk=[$6], d_year=[$7], d_moy=[$8], 
i_item_sk=[$9], i_category=[$10], s_store_sk=[$11], s_gmt_offset=[$12], 
p_promo_sk=[$13], p_channel_dmail=[$14], p_channel_email=[$15], 
p_channel_tv=[$16])
-              HiveJoin(condition=[=($4, $13)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                HiveJoin(condition=[=($3, $11)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                  HiveJoin(condition=[=($1, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], 
ss_customer_sk=[$2], ss_store_sk=[$3], ss_promo_sk=[$4], 
ss_ext_sales_price=[$5], d_date_sk=[$6], i_item_sk=[$7], s_store_sk=[$8], 
p_promo_sk=[$9])
+              HiveJoin(condition=[=($4, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                HiveJoin(condition=[=($3, $8)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                  HiveJoin(condition=[=($1, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
                     HiveJoin(condition=[=($0, $6)], joinType=[inner], 
algorithm=[none], cost=[not available])
                       HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_customer_sk=[$3], ss_store_sk=[$7], ss_promo_sk=[$8], 
ss_ext_sales_price=[$15])
                         HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT 
NULL($8), IS NOT NULL($0), IS NOT NULL($3), IS NOT NULL($2))])
                           HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[CAST(11):INTEGER])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS 
NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-                    HiveProject(i_item_sk=[$0], 
i_category=[CAST(_UTF-16LE'Electronics'):VARCHAR(2147483647) CHARACTER SET 
"UTF-16LE" COLLATE "ISO-8859-1$en_US$primary"])
+                    HiveProject(i_item_sk=[$0])
                       HiveFilter(condition=[AND(=($12, 
_UTF-16LE'Electronics'), IS NOT NULL($0))])
                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                  HiveProject(s_store_sk=[$0], 
s_gmt_offset=[CAST(-7):DECIMAL(5, 2)])
+                  HiveProject(s_store_sk=[$0])
                     HiveFilter(condition=[AND(=($27, -7), IS NOT NULL($0))])
                       HiveTableScan(table=[[default, store]], 
table:alias=[store])
-                HiveProject(p_promo_sk=[$0], p_channel_dmail=[$8], 
p_channel_email=[$9], p_channel_tv=[$11])
+                HiveProject(p_promo_sk=[$0])
                   HiveFilter(condition=[AND(OR(=($8, _UTF-16LE'Y'), =($9, 
_UTF-16LE'Y'), =($11, _UTF-16LE'Y')), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, promotion]], 
table:alias=[promotion])
       HiveProject($f0=[$0])
-        HiveAggregate(group=[{}], agg#0=[sum($8)])
-          HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
+        HiveAggregate(group=[{}], agg#0=[sum($7)])
+          HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
             HiveJoin(condition=[=($2, $1)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveProject(c_customer_sk=[$0], c_current_addr_sk=[$4])
                 HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($4))])
                   HiveTableScan(table=[[default, customer]], 
table:alias=[customer])
-              HiveProject(ca_address_sk=[$0], 
ca_gmt_offset=[CAST(-7):DECIMAL(5, 2)])
+              HiveProject(ca_address_sk=[$0])
                 HiveFilter(condition=[AND(=($11, -7), IS NOT NULL($0))])
                   HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
-            HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], 
ss_customer_sk=[$2], ss_store_sk=[$3], ss_ext_sales_price=[$4], d_date_sk=[$5], 
d_year=[$6], d_moy=[$7], i_item_sk=[$8], i_category=[$9], s_store_sk=[$10], 
s_gmt_offset=[$11])
-              HiveJoin(condition=[=($3, $10)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                HiveJoin(condition=[=($1, $8)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$1], 
ss_customer_sk=[$2], ss_store_sk=[$3], ss_ext_sales_price=[$4], d_date_sk=[$5], 
i_item_sk=[$6], s_store_sk=[$7])
+              HiveJoin(condition=[=($3, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                HiveJoin(condition=[=($1, $6)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveJoin(condition=[=($0, $5)], joinType=[inner], 
algorithm=[none], cost=[not available])
                     HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_customer_sk=[$3], ss_store_sk=[$7], ss_ext_sales_price=[$15])
                       HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT 
NULL($0), IS NOT NULL($3), IS NOT NULL($2))])
                         HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                    HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[CAST(11):INTEGER])
+                    HiveProject(d_date_sk=[$0])
                       HiveFilter(condition=[AND(=($6, 1999), =($8, 11), IS NOT 
NULL($0))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-                  HiveProject(i_item_sk=[$0], 
i_category=[CAST(_UTF-16LE'Electronics'):VARCHAR(2147483647) CHARACTER SET 
"UTF-16LE" COLLATE "ISO-8859-1$en_US$primary"])
+                  HiveProject(i_item_sk=[$0])
                     HiveFilter(condition=[AND(=($12, _UTF-16LE'Electronics'), 
IS NOT NULL($0))])
                       HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                HiveProject(s_store_sk=[$0], s_gmt_offset=[CAST(-7):DECIMAL(5, 
2)])
+                HiveProject(s_store_sk=[$0])
                   HiveFilter(condition=[AND(=($27, -7), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, store]], 
table:alias=[store])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out
index a080989..78c9b13 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query63.q.out
@@ -70,20 +70,20 @@ HiveSortLimit(sort0=[$0], sort1=[$2], sort2=[$1], 
dir0=[ASC], dir1=[ASC], dir2=[
     HiveFilter(condition=[CASE(>($2, 0), >(/(ABS(-($1, $2)), $2), 0.1), null)])
       HiveProject((tok_table_or_col i_manager_id)=[$0], (tok_function sum 
(tok_table_or_col ss_sales_price))=[$2], avg_window_0=[avg($2) OVER (PARTITION 
BY $0 ORDER BY $0 NULLS FIRST ROWS BETWEEN 2147483647 FOLLOWING AND 2147483647 
PRECEDING)])
         HiveProject(i_manager_id=[$0], d_moy=[$1], $f2=[$2])
-          HiveAggregate(group=[{9, 12}], agg#0=[sum($4)])
+          HiveAggregate(group=[{6, 8}], agg#0=[sum($4)])
             HiveJoin(condition=[=($3, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveProject(s_store_sk=[$0])
                 HiveFilter(condition=[IS NOT NULL($0)])
                   HiveTableScan(table=[[default, store]], table:alias=[store])
-              HiveJoin(condition=[=($0, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
+              HiveJoin(condition=[=($0, $6)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveJoin(condition=[=($1, $4)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_store_sk=[$7], ss_sales_price=[$13])
                     HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT 
NULL($0), IS NOT NULL($7))])
                       HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                  HiveProject(i_item_sk=[$0], i_brand=[$8], i_class=[$10], 
i_category=[$12], i_manager_id=[$20])
+                  HiveProject(i_item_sk=[$0], i_manager_id=[$20])
                     HiveFilter(condition=[AND(IN($10, _UTF-16LE'personal', 
_UTF-16LE'portable', _UTF-16LE'refernece', _UTF-16LE'self-help', 
_UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', 
_UTF-16LE'pants'), IN($8, _UTF-16LE'scholaramalgamalg #14', 
_UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', 
_UTF-16LE'scholaramalgamalg #9', _UTF-16LE'amalgimporto #1', _UTF-16LE'edu 
packscholar #1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'), 
IN($12, _UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics', 
_UTF-16LE'Women', _UTF-16LE'Music', _UTF-16LE'Men'), OR(AND(IN($12, 
_UTF-16LE'Books', _UTF-16LE'Children', _UTF-16LE'Electronics'), IN($10, 
_UTF-16LE'personal', _UTF-16LE'portable', _UTF-16LE'refernece', 
_UTF-16LE'self-help'), IN($8, _UTF-16LE'scholaramalgamalg #14', 
_UTF-16LE'scholaramalgamalg #7', _UTF-16LE'exportiunivamalg #9', 
_UTF-16LE'scholaramalgamalg #9')), AND(IN($12, _UTF-16LE'Women', 
_UTF-16LE'Music', _UTF-16LE'Men'), IN($10, 
 _UTF-16LE'accessories', _UTF-16LE'classical', _UTF-16LE'fragrances', 
_UTF-16LE'pants'), IN($8, _UTF-16LE'amalgimporto #1', _UTF-16LE'edu packscholar 
#1', _UTF-16LE'exportiimporto #1', _UTF-16LE'importoamalg #1'))), IS NOT 
NULL($0))])
                       HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                HiveProject(d_date_sk=[$0], d_month_seq=[$3], d_moy=[$8])
+                HiveProject(d_date_sk=[$0], d_moy=[$8])
                   HiveFilter(condition=[AND(IN($3, 1212, 1213, 1214, 1215, 
1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out
index 3b59bd8..5a5bb79 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query64.q.out
@@ -268,7 +268,7 @@ HiveProject(product_name=[$0], store_name=[$1], 
store_zip=[$2], b_street_number=
     HiveProject(product_name=[$0], store_name=[$2], store_zip=[$3], 
b_street_number=[$4], b_streen_name=[$5], b_city=[$6], b_zip=[$7], 
c_street_number=[$8], c_street_name=[$9], c_city=[$10], c_zip=[$11], cnt=[$12], 
s1=[$13], s2=[$14], s3=[$15], s11=[$20], s21=[$21], s31=[$22], cnt1=[$19])
       HiveJoin(condition=[AND(AND(AND(=($1, $16), <=($19, $12)), =($2, $17)), 
=($3, $18))], joinType=[inner], algorithm=[none], cost=[not available])
         HiveProject($f0=[$13], $f1=[$12], $f2=[$10], $f3=[$11], $f4=[$6], 
$f5=[$7], $f6=[$8], $f7=[$9], $f8=[$2], $f9=[$3], $f10=[$4], $f11=[$5], 
$f15=[$14], $f16=[$15], $f17=[$16], $f18=[$17])
-          HiveAggregate(group=[{9, 11, 16, 17, 18, 19, 25, 26, 27, 28, 30, 31, 
48, 51}], agg#0=[count()], agg#1=[sum($45)], agg#2=[sum($46)], agg#3=[sum($47)])
+          HiveAggregate(group=[{9, 11, 16, 17, 18, 19, 25, 26, 27, 28, 30, 31, 
48, 49}], agg#0=[count()], agg#1=[sum($45)], agg#2=[sum($46)], agg#3=[sum($47)])
             HiveJoin(condition=[AND(<>($1, $21), =($39, $0))], 
joinType=[inner], algorithm=[none], cost=[not available])
               HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2])
                 HiveFilter(condition=[IS NOT NULL($0)])
@@ -302,7 +302,7 @@ HiveProject(product_name=[$0], store_name=[$1], 
store_zip=[$2], b_street_number=
                   HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2])
                     HiveFilter(condition=[IS NOT NULL($0)])
                       HiveTableScan(table=[[default, customer_demographics]], 
table:alias=[cd2])
-                HiveProject(sr_item_sk=[$0], sr_ticket_number=[$1], 
ca_address_sk=[$2], ca_street_number=[$3], ca_street_name=[$4], ca_city=[$5], 
ca_zip=[$6], s_store_sk=[$7], s_store_name=[$8], s_zip=[$9], hd_demo_sk=[$10], 
hd_income_band_sk=[$11], ib_income_band_sk=[$12], p_promo_sk=[$13], 
ss_sold_date_sk=[$14], ss_item_sk=[$15], ss_customer_sk=[$16], 
ss_cdemo_sk=[$17], ss_hdemo_sk=[$18], ss_addr_sk=[$19], ss_store_sk=[$20], 
ss_promo_sk=[$21], ss_ticket_number=[$22], ss_wholesale_cost=[$23], 
ss_list_price=[$24], ss_coupon_amt=[$25], i_item_sk=[$26], 
i_current_price=[$27], i_color=[$28], i_product_name=[$29], d_date_sk=[$30], 
d_year=[$31], $f0=[$32], $f1=[$33], $f2=[$34])
+                HiveProject(sr_item_sk=[$0], sr_ticket_number=[$1], 
ca_address_sk=[$2], ca_street_number=[$3], ca_street_name=[$4], ca_city=[$5], 
ca_zip=[$6], s_store_sk=[$7], s_store_name=[$8], s_zip=[$9], hd_demo_sk=[$10], 
hd_income_band_sk=[$11], ib_income_band_sk=[$12], p_promo_sk=[$13], 
ss_sold_date_sk=[$14], ss_item_sk=[$15], ss_customer_sk=[$16], 
ss_cdemo_sk=[$17], ss_hdemo_sk=[$18], ss_addr_sk=[$19], ss_store_sk=[$20], 
ss_promo_sk=[$21], ss_ticket_number=[$22], ss_wholesale_cost=[$23], 
ss_list_price=[$24], ss_coupon_amt=[$25], i_item_sk=[$26], 
i_product_name=[$27], d_date_sk=[$28], $f0=[$29])
                   HiveJoin(condition=[AND(=($15, $0), =($22, $1))], 
joinType=[inner], algorithm=[none], cost=[not available])
                     HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9])
                       HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT 
NULL($9))])
@@ -315,44 +315,43 @@ HiveProject(product_name=[$0], store_name=[$1], 
store_zip=[$2], b_street_number=
                         HiveProject(s_store_sk=[$0], s_store_name=[$5], 
s_zip=[$25])
                           HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($5), IS NOT NULL($25))])
                             HiveTableScan(table=[[default, store]], 
table:alias=[store])
-                        HiveJoin(condition=[=($5, $22)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                          HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                            HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                              HiveProject(hd_demo_sk=[$0], 
hd_income_band_sk=[$1])
-                                HiveFilter(condition=[AND(IS NOT NULL($0), IS 
NOT NULL($1))])
-                                  HiveTableScan(table=[[default, 
household_demographics]], table:alias=[hd1])
-                              HiveProject(ib_income_band_sk=[$0])
+                        HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                          HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                            HiveProject(hd_demo_sk=[$0], 
hd_income_band_sk=[$1])
+                              HiveFilter(condition=[AND(IS NOT NULL($0), IS 
NOT NULL($1))])
+                                HiveTableScan(table=[[default, 
household_demographics]], table:alias=[hd1])
+                            HiveProject(ib_income_band_sk=[$0])
+                              HiveFilter(condition=[IS NOT NULL($0)])
+                                HiveTableScan(table=[[default, income_band]], 
table:alias=[ib1])
+                          HiveProject(p_promo_sk=[$0], ss_sold_date_sk=[$1], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$10], ss_list_price=[$11], ss_coupon_amt=[$12], 
i_item_sk=[$13], i_product_name=[$14], d_date_sk=[$15], $f0=[$16])
+                            HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                              HiveProject(p_promo_sk=[$0])
                                 HiveFilter(condition=[IS NOT NULL($0)])
-                                  HiveTableScan(table=[[default, 
income_band]], table:alias=[ib1])
-                            HiveProject(p_promo_sk=[$0], ss_sold_date_sk=[$1], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$10], ss_list_price=[$11], ss_coupon_amt=[$12], 
i_item_sk=[$13], i_current_price=[$14], i_color=[$15], i_product_name=[$16], 
d_date_sk=[$17], d_year=[$18])
-                              HiveJoin(condition=[=($8, $0)], 
joinType=[inner], algorithm=[none], cost=[not available])
-                                HiveProject(p_promo_sk=[$0])
-                                  HiveFilter(condition=[IS NOT NULL($0)])
-                                    HiveTableScan(table=[[default, 
promotion]], table:alias=[promotion])
-                                HiveJoin(condition=[=($0, $16)], 
joinType=[inner], algorithm=[none], cost=[not available])
+                                  HiveTableScan(table=[[default, promotion]], 
table:alias=[promotion])
+                              HiveJoin(condition=[=($1, $15)], 
joinType=[inner], algorithm=[none], cost=[not available])
+                                HiveJoin(condition=[=($0, $14)], 
joinType=[inner], algorithm=[none], cost=[not available])
                                   HiveJoin(condition=[=($1, $12)], 
joinType=[inner], algorithm=[none], cost=[not available])
                                     HiveProject(ss_sold_date_sk=[$0], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19])
                                       HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), 
IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))])
                                         HiveTableScan(table=[[default, 
store_sales]], table:alias=[store_sales])
-                                    HiveProject(i_item_sk=[$0], 
i_current_price=[$5], i_color=[$17], i_product_name=[$21])
+                                    HiveProject(i_item_sk=[$0], 
i_product_name=[$21])
                                       HiveFilter(condition=[AND(IN($17, 
_UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', 
_UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 35, 45), 
BETWEEN(false, $5, 36, 50), IS NOT NULL($0))])
                                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                                  HiveProject(d_date_sk=[$0], 
d_year=[CAST(2000):INTEGER])
+                                  HiveProject(d_date_sk=[$0])
                                     HiveFilter(condition=[AND(=($6, 2000), IS 
NOT NULL($0))])
                                       HiveTableScan(table=[[default, 
date_dim]], table:alias=[d1])
-                          HiveProject($f0=[$0], $f1=[$1], $f2=[$2])
-                            HiveFilter(condition=[>($1, *(2, $2))])
-                              HiveAggregate(group=[{0}], agg#0=[sum($1)], 
agg#1=[sum($2)])
-                                HiveProject($f0=[$0], $f1=[$2], $f2=[+(+($5, 
$6), $7)])
-                                  HiveJoin(condition=[AND(=($0, $3), =($1, 
$4))], joinType=[inner], algorithm=[none], cost=[not available])
-                                    HiveProject(cs_item_sk=[$15], 
cs_order_number=[$17], cs_ext_list_price=[$25])
-                                      HiveFilter(condition=[AND(IS NOT 
NULL($15), IS NOT NULL($17))])
-                                        HiveTableScan(table=[[default, 
catalog_sales]], table:alias=[catalog_sales])
-                                    HiveProject(cr_item_sk=[$2], 
cr_order_number=[$16], cr_refunded_cash=[$23], cr_reversed_charge=[$24], 
cr_store_credit=[$25])
-                                      HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($16))])
-                                        HiveTableScan(table=[[default, 
catalog_returns]], table:alias=[catalog_returns])
+                                HiveProject($f0=[$0])
+                                  HiveFilter(condition=[>($1, *(2, $2))])
+                                    HiveAggregate(group=[{0}], 
agg#0=[sum($2)], agg#1=[sum($5)])
+                                      HiveJoin(condition=[AND(=($0, $3), =($1, 
$4))], joinType=[inner], algorithm=[none], cost=[not available])
+                                        HiveProject(cs_item_sk=[$15], 
cs_order_number=[$17], cs_ext_list_price=[$25])
+                                          HiveFilter(condition=[AND(IS NOT 
NULL($15), IS NOT NULL($17))])
+                                            HiveTableScan(table=[[default, 
catalog_sales]], table:alias=[catalog_sales])
+                                        HiveProject(cr_item_sk=[$2], 
cr_order_number=[$16], +=[+(+($23, $24), $25)])
+                                          HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($16))])
+                                            HiveTableScan(table=[[default, 
catalog_returns]], table:alias=[catalog_returns])
         HiveProject($f1=[$12], $f2=[$10], $f3=[$11], $f15=[$14], $f16=[$15], 
$f17=[$16], $f18=[$17])
-          HiveAggregate(group=[{9, 11, 16, 17, 18, 19, 25, 26, 27, 28, 30, 31, 
48, 51}], agg#0=[count()], agg#1=[sum($45)], agg#2=[sum($46)], agg#3=[sum($47)])
+          HiveAggregate(group=[{9, 11, 16, 17, 18, 19, 25, 26, 27, 28, 30, 31, 
48, 49}], agg#0=[count()], agg#1=[sum($45)], agg#2=[sum($46)], agg#3=[sum($47)])
             HiveJoin(condition=[AND(<>($1, $21), =($39, $0))], 
joinType=[inner], algorithm=[none], cost=[not available])
               HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2])
                 HiveFilter(condition=[IS NOT NULL($0)])
@@ -386,7 +385,7 @@ HiveProject(product_name=[$0], store_name=[$1], 
store_zip=[$2], b_street_number=
                   HiveProject(cd_demo_sk=[$0], cd_marital_status=[$2])
                     HiveFilter(condition=[IS NOT NULL($0)])
                       HiveTableScan(table=[[default, customer_demographics]], 
table:alias=[cd2])
-                HiveProject(sr_item_sk=[$0], sr_ticket_number=[$1], 
ca_address_sk=[$2], ca_street_number=[$3], ca_street_name=[$4], ca_city=[$5], 
ca_zip=[$6], s_store_sk=[$7], s_store_name=[$8], s_zip=[$9], hd_demo_sk=[$10], 
hd_income_band_sk=[$11], ib_income_band_sk=[$12], p_promo_sk=[$13], 
ss_sold_date_sk=[$14], ss_item_sk=[$15], ss_customer_sk=[$16], 
ss_cdemo_sk=[$17], ss_hdemo_sk=[$18], ss_addr_sk=[$19], ss_store_sk=[$20], 
ss_promo_sk=[$21], ss_ticket_number=[$22], ss_wholesale_cost=[$23], 
ss_list_price=[$24], ss_coupon_amt=[$25], i_item_sk=[$26], 
i_current_price=[$27], i_color=[$28], i_product_name=[$29], d_date_sk=[$30], 
d_year=[$31], $f0=[$32], $f1=[$33], $f2=[$34])
+                HiveProject(sr_item_sk=[$0], sr_ticket_number=[$1], 
ca_address_sk=[$2], ca_street_number=[$3], ca_street_name=[$4], ca_city=[$5], 
ca_zip=[$6], s_store_sk=[$7], s_store_name=[$8], s_zip=[$9], hd_demo_sk=[$10], 
hd_income_band_sk=[$11], ib_income_band_sk=[$12], p_promo_sk=[$13], 
ss_sold_date_sk=[$14], ss_item_sk=[$15], ss_customer_sk=[$16], 
ss_cdemo_sk=[$17], ss_hdemo_sk=[$18], ss_addr_sk=[$19], ss_store_sk=[$20], 
ss_promo_sk=[$21], ss_ticket_number=[$22], ss_wholesale_cost=[$23], 
ss_list_price=[$24], ss_coupon_amt=[$25], i_item_sk=[$26], 
i_product_name=[$27], d_date_sk=[$28], $f0=[$29])
                   HiveJoin(condition=[AND(=($15, $0), =($22, $1))], 
joinType=[inner], algorithm=[none], cost=[not available])
                     HiveProject(sr_item_sk=[$2], sr_ticket_number=[$9])
                       HiveFilter(condition=[AND(IS NOT NULL($2), IS NOT 
NULL($9))])
@@ -399,40 +398,39 @@ HiveProject(product_name=[$0], store_name=[$1], 
store_zip=[$2], b_street_number=
                         HiveProject(s_store_sk=[$0], s_store_name=[$5], 
s_zip=[$25])
                           HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($5), IS NOT NULL($25))])
                             HiveTableScan(table=[[default, store]], 
table:alias=[store])
-                        HiveJoin(condition=[=($5, $22)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                          HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                            HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                              HiveProject(hd_demo_sk=[$0], 
hd_income_band_sk=[$1])
-                                HiveFilter(condition=[AND(IS NOT NULL($0), IS 
NOT NULL($1))])
-                                  HiveTableScan(table=[[default, 
household_demographics]], table:alias=[hd1])
-                              HiveProject(ib_income_band_sk=[$0])
+                        HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                          HiveJoin(condition=[=($1, $2)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                            HiveProject(hd_demo_sk=[$0], 
hd_income_band_sk=[$1])
+                              HiveFilter(condition=[AND(IS NOT NULL($0), IS 
NOT NULL($1))])
+                                HiveTableScan(table=[[default, 
household_demographics]], table:alias=[hd1])
+                            HiveProject(ib_income_band_sk=[$0])
+                              HiveFilter(condition=[IS NOT NULL($0)])
+                                HiveTableScan(table=[[default, income_band]], 
table:alias=[ib1])
+                          HiveProject(p_promo_sk=[$0], ss_sold_date_sk=[$1], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$10], ss_list_price=[$11], ss_coupon_amt=[$12], 
i_item_sk=[$13], i_product_name=[$14], d_date_sk=[$15], $f0=[$16])
+                            HiveJoin(condition=[=($8, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                              HiveProject(p_promo_sk=[$0])
                                 HiveFilter(condition=[IS NOT NULL($0)])
-                                  HiveTableScan(table=[[default, 
income_band]], table:alias=[ib1])
-                            HiveProject(p_promo_sk=[$0], ss_sold_date_sk=[$1], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$10], ss_list_price=[$11], ss_coupon_amt=[$12], 
i_item_sk=[$13], i_current_price=[$14], i_color=[$15], i_product_name=[$16], 
d_date_sk=[$17], d_year=[$18])
-                              HiveJoin(condition=[=($8, $0)], 
joinType=[inner], algorithm=[none], cost=[not available])
-                                HiveProject(p_promo_sk=[$0])
-                                  HiveFilter(condition=[IS NOT NULL($0)])
-                                    HiveTableScan(table=[[default, 
promotion]], table:alias=[promotion])
-                                HiveJoin(condition=[=($0, $16)], 
joinType=[inner], algorithm=[none], cost=[not available])
+                                  HiveTableScan(table=[[default, promotion]], 
table:alias=[promotion])
+                              HiveJoin(condition=[=($1, $15)], 
joinType=[inner], algorithm=[none], cost=[not available])
+                                HiveJoin(condition=[=($0, $14)], 
joinType=[inner], algorithm=[none], cost=[not available])
                                   HiveJoin(condition=[=($1, $12)], 
joinType=[inner], algorithm=[none], cost=[not available])
                                     HiveProject(ss_sold_date_sk=[$0], 
ss_item_sk=[$2], ss_customer_sk=[$3], ss_cdemo_sk=[$4], ss_hdemo_sk=[$5], 
ss_addr_sk=[$6], ss_store_sk=[$7], ss_promo_sk=[$8], ss_ticket_number=[$9], 
ss_wholesale_cost=[$11], ss_list_price=[$12], ss_coupon_amt=[$19])
                                       HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($9), IS NOT NULL($0), IS NOT NULL($7), IS NOT NULL($3), 
IS NOT NULL($4), IS NOT NULL($8), IS NOT NULL($5), IS NOT NULL($6))])
                                         HiveTableScan(table=[[default, 
store_sales]], table:alias=[store_sales])
-                                    HiveProject(i_item_sk=[$0], 
i_current_price=[$5], i_color=[$17], i_product_name=[$21])
+                                    HiveProject(i_item_sk=[$0], 
i_product_name=[$21])
                                       HiveFilter(condition=[AND(IN($17, 
_UTF-16LE'maroon', _UTF-16LE'burnished', _UTF-16LE'dim', _UTF-16LE'steel', 
_UTF-16LE'navajo', _UTF-16LE'chocolate'), BETWEEN(false, $5, 35, 45), 
BETWEEN(false, $5, 36, 50), IS NOT NULL($0))])
                                         HiveTableScan(table=[[default, item]], 
table:alias=[item])
-                                  HiveProject(d_date_sk=[$0], 
d_year=[CAST(2001):INTEGER])
+                                  HiveProject(d_date_sk=[$0])
                                     HiveFilter(condition=[AND(=($6, 2001), IS 
NOT NULL($0))])
                                       HiveTableScan(table=[[default, 
date_dim]], table:alias=[d1])
-                          HiveProject($f0=[$0], $f1=[$1], $f2=[$2])
-                            HiveFilter(condition=[>($1, *(2, $2))])
-                              HiveAggregate(group=[{0}], agg#0=[sum($1)], 
agg#1=[sum($2)])
-                                HiveProject($f0=[$0], $f1=[$2], $f2=[+(+($5, 
$6), $7)])
-                                  HiveJoin(condition=[AND(=($0, $3), =($1, 
$4))], joinType=[inner], algorithm=[none], cost=[not available])
-                                    HiveProject(cs_item_sk=[$15], 
cs_order_number=[$17], cs_ext_list_price=[$25])
-                                      HiveFilter(condition=[AND(IS NOT 
NULL($15), IS NOT NULL($17))])
-                                        HiveTableScan(table=[[default, 
catalog_sales]], table:alias=[catalog_sales])
-                                    HiveProject(cr_item_sk=[$2], 
cr_order_number=[$16], cr_refunded_cash=[$23], cr_reversed_charge=[$24], 
cr_store_credit=[$25])
-                                      HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($16))])
-                                        HiveTableScan(table=[[default, 
catalog_returns]], table:alias=[catalog_returns])
+                                HiveProject($f0=[$0])
+                                  HiveFilter(condition=[>($1, *(2, $2))])
+                                    HiveAggregate(group=[{0}], 
agg#0=[sum($2)], agg#1=[sum($5)])
+                                      HiveJoin(condition=[AND(=($0, $3), =($1, 
$4))], joinType=[inner], algorithm=[none], cost=[not available])
+                                        HiveProject(cs_item_sk=[$15], 
cs_order_number=[$17], cs_ext_list_price=[$25])
+                                          HiveFilter(condition=[AND(IS NOT 
NULL($15), IS NOT NULL($17))])
+                                            HiveTableScan(table=[[default, 
catalog_sales]], table:alias=[catalog_sales])
+                                        HiveProject(cr_item_sk=[$2], 
cr_order_number=[$16], +=[+(+($23, $24), $25)])
+                                          HiveFilter(condition=[AND(IS NOT 
NULL($2), IS NOT NULL($16))])
+                                            HiveTableScan(table=[[default, 
catalog_returns]], table:alias=[catalog_returns])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query65.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query65.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query65.q.out
index 1b154a4..25cb9cc 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query65.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query65.q.out
@@ -72,17 +72,17 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], 
dir1=[ASC], fetch=[100])
         HiveFilter(condition=[IS NOT NULL($0)])
           HiveTableScan(table=[[default, item]], table:alias=[item])
       HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
-        HiveJoin(condition=[AND(=($3, $0), <=($2, *(0.1, $4)))], 
joinType=[inner], algorithm=[none], cost=[not available])
+        HiveJoin(condition=[AND(=($3, $0), <=($2, $4))], joinType=[inner], 
algorithm=[none], cost=[not available])
           HiveProject(ss_store_sk=[$1], ss_item_sk=[$0], $f2=[$2])
             HiveAggregate(group=[{1, 2}], agg#0=[sum($3)])
               HiveJoin(condition=[=($0, $4)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_store_sk=[$7], ss_sales_price=[$13])
                   HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($7), 
IS NOT NULL($2))])
                     HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                HiveProject(d_date_sk=[$0], d_month_seq=[$3])
+                HiveProject(d_date_sk=[$0])
                   HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 1223), IS 
NOT NULL($0))])
                     HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-          HiveProject($f0=[$0], $f1=[/($1, $2)])
+          HiveProject($f0=[$0], *=[*(0.1, /($1, $2))])
             HiveAggregate(group=[{1}], agg#0=[sum($2)], agg#1=[count($2)])
               HiveProject(ss_item_sk=[$0], ss_store_sk=[$1], $f2=[$2])
                 HiveAggregate(group=[{1, 2}], agg#0=[sum($3)])
@@ -90,7 +90,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], dir0=[ASC], dir1=[ASC], 
fetch=[100])
                     HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_store_sk=[$7], ss_sales_price=[$13])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($7))])
                         HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                    HiveProject(d_date_sk=[$0], d_month_seq=[$3])
+                    HiveProject(d_date_sk=[$0])
                       HiveFilter(condition=[AND(BETWEEN(false, $3, 1212, 
1223), IS NOT NULL($0))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
         HiveProject(s_store_sk=[$0], s_store_name=[$5])

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out
index d97f351..e2409a9 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query66.q.out
@@ -463,43 +463,43 @@ HiveProject(w_warehouse_name=[$0], 
w_warehouse_sq_ft=[$1], w_city=[$2], w_county
           HiveUnion(all=[true])
             HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], 
$f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], 
$f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], 
$f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], 
$f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29])
               HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], 
agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], 
agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], 
agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], 
agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], 
agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], 
agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)])
-                HiveProject($f0=[$1], $f1=[$2], $f2=[$3], $f3=[$4], $f4=[$5], 
$f5=[$6], $f7=[CASE(=($18, 1), *($12, CAST($11):DECIMAL(10, 0)), 0)], 
$f8=[CASE(=($18, 2), *($12, CAST($11):DECIMAL(10, 0)), 0)], $f9=[CASE(=($18, 
3), *($12, CAST($11):DECIMAL(10, 0)), 0)], $f10=[CASE(=($18, 4), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f11=[CASE(=($18, 5), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f12=[CASE(=($18, 6), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f13=[CASE(=($18, 7), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f14=[CASE(=($18, 8), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f15=[CASE(=($18, 9), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f16=[CASE(=($18, 10), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f17=[CASE(=($18, 11), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f18=[CASE(=($18, 12), *($12, 
CAST($11):DECIMAL(10, 0)), 0)], $f19=[CASE(=($18, 1), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f20=[CASE(=($18, 2), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f21=[CASE(=($18, 3), *($13, 
CAST($11):DECIMAL(10, 0)),
  0)], $f22=[CASE(=($18, 4), *($13, CAST($11):DECIMAL(10, 0)), 0)], 
$f23=[CASE(=($18, 5), *($13, CAST($11):DECIMAL(10, 0)), 0)], $f24=[CASE(=($18, 
6), *($13, CAST($11):DECIMAL(10, 0)), 0)], $f25=[CASE(=($18, 7), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f26=[CASE(=($18, 8), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f27=[CASE(=($18, 9), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f28=[CASE(=($18, 10), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f29=[CASE(=($18, 11), *($13, 
CAST($11):DECIMAL(10, 0)), 0)], $f30=[CASE(=($18, 12), *($13, 
CAST($11):DECIMAL(10, 0)), 0)])
+                HiveProject($f0=[$1], $f1=[$2], $f2=[$3], $f3=[$4], $f4=[$5], 
$f5=[$6], $f7=[CASE($15, $11, 0)], $f8=[CASE($16, $11, 0)], $f9=[CASE($17, $11, 
0)], $f10=[CASE($18, $11, 0)], $f11=[CASE($19, $11, 0)], $f12=[CASE($20, $11, 
0)], $f13=[CASE($21, $11, 0)], $f14=[CASE($22, $11, 0)], $f15=[CASE($23, $11, 
0)], $f16=[CASE($24, $11, 0)], $f17=[CASE($25, $11, 0)], $f18=[CASE($26, $11, 
0)], $f19=[CASE($15, $12, 0)], $f20=[CASE($16, $12, 0)], $f21=[CASE($17, $12, 
0)], $f22=[CASE($18, $12, 0)], $f23=[CASE($19, $12, 0)], $f24=[CASE($20, $12, 
0)], $f25=[CASE($21, $12, 0)], $f26=[CASE($22, $12, 0)], $f27=[CASE($23, $12, 
0)], $f28=[CASE($24, $12, 0)], $f29=[CASE($25, $12, 0)], $f30=[CASE($26, $12, 
0)])
                   HiveJoin(condition=[=($10, $0)], joinType=[inner], 
algorithm=[none], cost=[not available])
                     HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], 
w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], 
w_country=[$12])
                       HiveFilter(condition=[IS NOT NULL($0)])
                         HiveTableScan(table=[[default, warehouse]], 
table:alias=[warehouse])
-                    HiveJoin(condition=[=($2, $12)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                      HiveJoin(condition=[=($0, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                        HiveJoin(condition=[=($1, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                          HiveProject(ws_sold_date_sk=[$0], 
ws_sold_time_sk=[$1], ws_ship_mode_sk=[$14], ws_warehouse_sk=[$15], 
ws_quantity=[$18], ws_sales_price=[$21], ws_net_paid_inc_tax=[$30])
+                    HiveJoin(condition=[=($2, $20)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                      HiveJoin(condition=[=($0, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                        HiveJoin(condition=[=($1, $6)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                          HiveProject(ws_sold_date_sk=[$0], 
ws_sold_time_sk=[$1], ws_ship_mode_sk=[$14], ws_warehouse_sk=[$15], *=[*($21, 
CAST($18):DECIMAL(10, 0))], *5=[*($30, CAST($18):DECIMAL(10, 0))])
                             HiveFilter(condition=[AND(IS NOT NULL($15), IS NOT 
NULL($0), IS NOT NULL($1), IS NOT NULL($14))])
                               HiveTableScan(table=[[default, web_sales]], 
table:alias=[web_sales])
-                          HiveProject(t_time_sk=[$0], t_time=[$2])
+                          HiveProject(t_time_sk=[$0])
                             HiveFilter(condition=[AND(BETWEEN(false, $2, 
49530, 78330), IS NOT NULL($0))])
                               HiveTableScan(table=[[default, time_dim]], 
table:alias=[time_dim])
-                        HiveProject(d_date_sk=[$0], 
d_year=[CAST(2002):INTEGER], d_moy=[$8])
+                        HiveProject(d_date_sk=[$0], ==[=($8, 1)], =2=[=($8, 
2)], =3=[=($8, 3)], =4=[=($8, 4)], =5=[=($8, 5)], =6=[=($8, 6)], =7=[=($8, 7)], 
=8=[=($8, 8)], =9=[=($8, 9)], =10=[=($8, 10)], =11=[=($8, 11)], =12=[=($8, 12)])
                           HiveFilter(condition=[AND(=($6, 2002), IS NOT 
NULL($0))])
                             HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-                      HiveProject(sm_ship_mode_sk=[$0], sm_carrier=[$4])
+                      HiveProject(sm_ship_mode_sk=[$0])
                         HiveFilter(condition=[AND(IN($4, _UTF-16LE'DIAMOND', 
_UTF-16LE'AIRBORNE'), IS NOT NULL($0))])
                           HiveTableScan(table=[[default, ship_mode]], 
table:alias=[ship_mode])
             HiveProject($f0=[$0], $f1=[$1], $f2=[$2], $f3=[$3], $f4=[$4], 
$f5=[$5], $f6=[$6], $f7=[$7], $f8=[$8], $f9=[$9], $f10=[$10], $f11=[$11], 
$f12=[$12], $f13=[$13], $f14=[$14], $f15=[$15], $f16=[$16], $f17=[$17], 
$f18=[$18], $f19=[$19], $f20=[$20], $f21=[$21], $f22=[$22], $f23=[$23], 
$f24=[$24], $f25=[$25], $f26=[$26], $f27=[$27], $f28=[$28], $f29=[$29])
               HiveAggregate(group=[{0, 1, 2, 3, 4, 5}], agg#0=[sum($6)], 
agg#1=[sum($7)], agg#2=[sum($8)], agg#3=[sum($9)], agg#4=[sum($10)], 
agg#5=[sum($11)], agg#6=[sum($12)], agg#7=[sum($13)], agg#8=[sum($14)], 
agg#9=[sum($15)], agg#10=[sum($16)], agg#11=[sum($17)], agg#12=[sum($18)], 
agg#13=[sum($19)], agg#14=[sum($20)], agg#15=[sum($21)], agg#16=[sum($22)], 
agg#17=[sum($23)], agg#18=[sum($24)], agg#19=[sum($25)], agg#20=[sum($26)], 
agg#21=[sum($27)], agg#22=[sum($28)], agg#23=[sum($29)])
-                HiveProject($f0=[$15], $f1=[$16], $f2=[$17], $f3=[$18], 
$f4=[$19], $f5=[$20], $f7=[CASE(=($11, 1), *($5, CAST($4):DECIMAL(10, 0)), 0)], 
$f8=[CASE(=($11, 2), *($5, CAST($4):DECIMAL(10, 0)), 0)], $f9=[CASE(=($11, 3), 
*($5, CAST($4):DECIMAL(10, 0)), 0)], $f10=[CASE(=($11, 4), *($5, 
CAST($4):DECIMAL(10, 0)), 0)], $f11=[CASE(=($11, 5), *($5, CAST($4):DECIMAL(10, 
0)), 0)], $f12=[CASE(=($11, 6), *($5, CAST($4):DECIMAL(10, 0)), 0)], 
$f13=[CASE(=($11, 7), *($5, CAST($4):DECIMAL(10, 0)), 0)], $f14=[CASE(=($11, 
8), *($5, CAST($4):DECIMAL(10, 0)), 0)], $f15=[CASE(=($11, 9), *($5, 
CAST($4):DECIMAL(10, 0)), 0)], $f16=[CASE(=($11, 10), *($5, 
CAST($4):DECIMAL(10, 0)), 0)], $f17=[CASE(=($11, 11), *($5, 
CAST($4):DECIMAL(10, 0)), 0)], $f18=[CASE(=($11, 12), *($5, 
CAST($4):DECIMAL(10, 0)), 0)], $f19=[CASE(=($11, 1), *($6, CAST($4):DECIMAL(10, 
0)), 0)], $f20=[CASE(=($11, 2), *($6, CAST($4):DECIMAL(10, 0)), 0)], 
$f21=[CASE(=($11, 3), *($6, CAST($4):DECIMAL(10, 0)), 0)], $f22=[CASE(=($11, 
 4), *($6, CAST($4):DECIMAL(10, 0)), 0)], $f23=[CASE(=($11, 5), *($6, 
CAST($4):DECIMAL(10, 0)), 0)], $f24=[CASE(=($11, 6), *($6, CAST($4):DECIMAL(10, 
0)), 0)], $f25=[CASE(=($11, 7), *($6, CAST($4):DECIMAL(10, 0)), 0)], 
$f26=[CASE(=($11, 8), *($6, CAST($4):DECIMAL(10, 0)), 0)], $f27=[CASE(=($11, 
9), *($6, CAST($4):DECIMAL(10, 0)), 0)], $f28=[CASE(=($11, 10), *($6, 
CAST($4):DECIMAL(10, 0)), 0)], $f29=[CASE(=($11, 11), *($6, 
CAST($4):DECIMAL(10, 0)), 0)], $f30=[CASE(=($11, 12), *($6, 
CAST($4):DECIMAL(10, 0)), 0)])
-                  HiveJoin(condition=[=($3, $14)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                    HiveJoin(condition=[=($2, $12)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                      HiveJoin(condition=[=($0, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                        HiveJoin(condition=[=($1, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
-                          HiveProject(cs_sold_date_sk=[$0], 
cs_sold_time_sk=[$1], cs_ship_mode_sk=[$13], cs_warehouse_sk=[$14], 
cs_quantity=[$18], cs_ext_sales_price=[$23], cs_net_paid_inc_ship_tax=[$32])
+                HiveProject($f0=[$22], $f1=[$23], $f2=[$24], $f3=[$25], 
$f4=[$26], $f5=[$27], $f7=[CASE($8, $4, 0)], $f8=[CASE($9, $4, 0)], 
$f9=[CASE($10, $4, 0)], $f10=[CASE($11, $4, 0)], $f11=[CASE($12, $4, 0)], 
$f12=[CASE($13, $4, 0)], $f13=[CASE($14, $4, 0)], $f14=[CASE($15, $4, 0)], 
$f15=[CASE($16, $4, 0)], $f16=[CASE($17, $4, 0)], $f17=[CASE($18, $4, 0)], 
$f18=[CASE($19, $4, 0)], $f19=[CASE($8, $5, 0)], $f20=[CASE($9, $5, 0)], 
$f21=[CASE($10, $5, 0)], $f22=[CASE($11, $5, 0)], $f23=[CASE($12, $5, 0)], 
$f24=[CASE($13, $5, 0)], $f25=[CASE($14, $5, 0)], $f26=[CASE($15, $5, 0)], 
$f27=[CASE($16, $5, 0)], $f28=[CASE($17, $5, 0)], $f29=[CASE($18, $5, 0)], 
$f30=[CASE($19, $5, 0)])
+                  HiveJoin(condition=[=($3, $21)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                    HiveJoin(condition=[=($2, $20)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                      HiveJoin(condition=[=($0, $7)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                        HiveJoin(condition=[=($1, $6)], joinType=[inner], 
algorithm=[none], cost=[not available])
+                          HiveProject(cs_sold_date_sk=[$0], 
cs_sold_time_sk=[$1], cs_ship_mode_sk=[$13], cs_warehouse_sk=[$14], *=[*($23, 
CAST($18):DECIMAL(10, 0))], *5=[*($32, CAST($18):DECIMAL(10, 0))])
                             HiveFilter(condition=[AND(IS NOT NULL($14), IS NOT 
NULL($0), IS NOT NULL($1), IS NOT NULL($13))])
                               HiveTableScan(table=[[default, catalog_sales]], 
table:alias=[catalog_sales])
-                          HiveProject(t_time_sk=[$0], t_time=[$2])
+                          HiveProject(t_time_sk=[$0])
                             HiveFilter(condition=[AND(BETWEEN(false, $2, 
49530, 78330), IS NOT NULL($0))])
                               HiveTableScan(table=[[default, time_dim]], 
table:alias=[time_dim])
-                        HiveProject(d_date_sk=[$0], 
d_year=[CAST(2002):INTEGER], d_moy=[$8])
+                        HiveProject(d_date_sk=[$0], ==[=($8, 1)], =2=[=($8, 
2)], =3=[=($8, 3)], =4=[=($8, 4)], =5=[=($8, 5)], =6=[=($8, 6)], =7=[=($8, 7)], 
=8=[=($8, 8)], =9=[=($8, 9)], =10=[=($8, 10)], =11=[=($8, 11)], =12=[=($8, 12)])
                           HiveFilter(condition=[AND(=($6, 2002), IS NOT 
NULL($0))])
                             HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-                      HiveProject(sm_ship_mode_sk=[$0], sm_carrier=[$4])
+                      HiveProject(sm_ship_mode_sk=[$0])
                         HiveFilter(condition=[AND(IN($4, _UTF-16LE'DIAMOND', 
_UTF-16LE'AIRBORNE'), IS NOT NULL($0))])
                           HiveTableScan(table=[[default, ship_mode]], 
table:alias=[ship_mode])
                     HiveProject(w_warehouse_sk=[$0], w_warehouse_name=[$2], 
w_warehouse_sq_ft=[$3], w_city=[$8], w_county=[$9], w_state=[$10], 
w_country=[$12])

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out
index cd71cda..f14338c 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query68.q.out
@@ -111,19 +111,19 @@ HiveSortLimit(sort0=[$0], sort1=[$4], dir0=[ASC], 
dir1=[ASC], fetch=[100])
             HiveProject(ca_address_sk=[$0], ca_city=[$6])
               HiveFilter(condition=[IS NOT NULL($0)])
                 HiveTableScan(table=[[default, customer_address]], 
table:alias=[customer_address])
-            HiveJoin(condition=[=($2, $14)], joinType=[inner], 
algorithm=[none], cost=[not available])
-              HiveJoin(condition=[=($4, $12)], joinType=[inner], 
algorithm=[none], cost=[not available])
+            HiveJoin(condition=[=($2, $11)], joinType=[inner], 
algorithm=[none], cost=[not available])
+              HiveJoin(condition=[=($4, $10)], joinType=[inner], 
algorithm=[none], cost=[not available])
                 HiveJoin(condition=[=($0, $9)], joinType=[inner], 
algorithm=[none], cost=[not available])
                   HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3], 
ss_hdemo_sk=[$5], ss_addr_sk=[$6], ss_store_sk=[$7], ss_ticket_number=[$9], 
ss_ext_sales_price=[$15], ss_ext_list_price=[$17], ss_ext_tax=[$18])
                     HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($7), IS NOT NULL($5), IS NOT NULL($6), IS NOT NULL($3))])
                       HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                  HiveProject(d_date_sk=[$0], d_year=[$6], d_dom=[$9])
+                  HiveProject(d_date_sk=[$0])
                     HiveFilter(condition=[AND(IN($6, 1998, 1999, 2000), 
BETWEEN(false, $9, 1, 2), IS NOT NULL($0))])
                       HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-                HiveProject(s_store_sk=[$0], s_city=[$22])
+                HiveProject(s_store_sk=[$0])
                   HiveFilter(condition=[AND(IN($22, _UTF-16LE'Cedar Grove', 
_UTF-16LE'Wildwood'), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, store]], 
table:alias=[store])
-              HiveProject(hd_demo_sk=[$0], hd_dep_count=[$3], 
hd_vehicle_count=[$4])
+              HiveProject(hd_demo_sk=[$0])
                 HiveFilter(condition=[AND(OR(=($3, 2), =($4, 1)), IS NOT 
NULL($0))])
                   HiveTableScan(table=[[default, household_demographics]], 
table:alias=[household_demographics])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out
index 9089fc8..0cc24d3 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query69.q.out
@@ -132,7 +132,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], 
sort3=[$4], sort4=[$6], dir0=[
                       HiveProject(ss_sold_date_sk=[$0], ss_customer_sk=[$3])
                         HiveFilter(condition=[AND(IS NOT NULL($3), IS NOT 
NULL($0))])
                           HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[$8])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, 
$8, 1, 3), IS NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
                 HiveProject(ws_bill_customer_sk0=[$0], $f1=[true])
@@ -141,7 +141,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], 
sort3=[$4], sort4=[$6], dir0=[
                       HiveProject(ws_sold_date_sk=[$0], 
ws_bill_customer_sk=[$4])
                         HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT 
NULL($0))])
                           HiveTableScan(table=[[default, web_sales]], 
table:alias=[web_sales])
-                      HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[$8])
+                      HiveProject(d_date_sk=[$0])
                         HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, 
$8, 1, 3), IS NOT NULL($0))])
                           HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
           HiveProject(cs_ship_customer_sk0=[$0], $f1=[true])
@@ -150,7 +150,7 @@ HiveSortLimit(sort0=[$0], sort1=[$1], sort2=[$2], 
sort3=[$4], sort4=[$6], dir0=[
                 HiveProject(cs_sold_date_sk=[$0], cs_ship_customer_sk=[$7])
                   HiveFilter(condition=[AND(IS NOT NULL($7), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, catalog_sales]], 
table:alias=[catalog_sales])
-                HiveProject(d_date_sk=[$0], d_year=[CAST(1999):INTEGER], 
d_moy=[$8])
+                HiveProject(d_date_sk=[$0])
                   HiveFilter(condition=[AND(=($6, 1999), BETWEEN(false, $8, 1, 
3), IS NOT NULL($0))])
                     HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out
index 29415ca..d4c3ac6 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query7.q.out
@@ -58,19 +58,19 @@ HiveSortLimit(sort0=[$0], dir0=[ASC], fetch=[100])
         HiveProject(i_item_sk=[$0], i_item_id=[$1])
           HiveFilter(condition=[IS NOT NULL($0)])
             HiveTableScan(table=[[default, item]], table:alias=[item])
-        HiveJoin(condition=[=($3, $14)], joinType=[inner], algorithm=[none], 
cost=[not available])
-          HiveJoin(condition=[=($0, $12)], joinType=[inner], algorithm=[none], 
cost=[not available])
+        HiveJoin(condition=[=($3, $10)], joinType=[inner], algorithm=[none], 
cost=[not available])
+          HiveJoin(condition=[=($0, $9)], joinType=[inner], algorithm=[none], 
cost=[not available])
             HiveJoin(condition=[=($2, $8)], joinType=[inner], 
algorithm=[none], cost=[not available])
               HiveProject(ss_sold_date_sk=[$0], ss_item_sk=[$2], 
ss_cdemo_sk=[$4], ss_promo_sk=[$8], ss_quantity=[$10], ss_list_price=[$12], 
ss_sales_price=[$13], ss_coupon_amt=[$19])
                 HiveFilter(condition=[AND(IS NOT NULL($4), IS NOT NULL($0), IS 
NOT NULL($2), IS NOT NULL($8))])
                   HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-              HiveProject(cd_demo_sk=[$0], 
cd_gender=[CAST(_UTF-16LE'F'):VARCHAR(2147483647) CHARACTER SET "UTF-16LE" 
COLLATE "ISO-8859-1$en_US$primary"], 
cd_marital_status=[CAST(_UTF-16LE'W'):VARCHAR(2147483647) CHARACTER SET 
"UTF-16LE" COLLATE "ISO-8859-1$en_US$primary"], 
cd_education_status=[CAST(_UTF-16LE'Primary'):VARCHAR(2147483647) CHARACTER SET 
"UTF-16LE" COLLATE "ISO-8859-1$en_US$primary"])
+              HiveProject(cd_demo_sk=[$0])
                 HiveFilter(condition=[AND(=($1, _UTF-16LE'F'), =($2, 
_UTF-16LE'W'), =($3, _UTF-16LE'Primary'), IS NOT NULL($0))])
                   HiveTableScan(table=[[default, customer_demographics]], 
table:alias=[customer_demographics])
-            HiveProject(d_date_sk=[$0], d_year=[CAST(1998):INTEGER])
+            HiveProject(d_date_sk=[$0])
               HiveFilter(condition=[AND(=($6, 1998), IS NOT NULL($0))])
                 HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-          HiveProject(p_promo_sk=[$0], p_channel_email=[$9], 
p_channel_event=[$14])
+          HiveProject(p_promo_sk=[$0])
             HiveFilter(condition=[AND(OR(=($9, _UTF-16LE'N'), =($14, 
_UTF-16LE'N')), IS NOT NULL($0))])
               HiveTableScan(table=[[default, promotion]], 
table:alias=[promotion])
 

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out 
b/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out
index 4e52893..20444c6 100644
--- a/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/cbo_query71.q.out
@@ -92,9 +92,9 @@ CBO PLAN:
 HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], t_minute=[$3], 
ext_price=[$4])
   HiveSortLimit(sort0=[$4], sort1=[$5], dir0=[DESC-nulls-last], dir1=[ASC])
     HiveProject(brand_id=[$2], brand=[$3], t_hour=[$0], t_minute=[$1], 
ext_price=[$4], (tok_table_or_col i_brand_id)=[$2])
-      HiveAggregate(group=[{1, 2, 8, 9}], agg#0=[sum($4)])
-        HiveJoin(condition=[=($6, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
-          HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4], 
t_meal_time=[$9])
+      HiveAggregate(group=[{1, 2, 7, 8}], agg#0=[sum($3)])
+        HiveJoin(condition=[=($5, $0)], joinType=[inner], algorithm=[none], 
cost=[not available])
+          HiveProject(t_time_sk=[$0], t_hour=[$3], t_minute=[$4])
             HiveFilter(condition=[AND(IN($9, _UTF-16LE'breakfast', 
_UTF-16LE'dinner'), IS NOT NULL($0))])
               HiveTableScan(table=[[default, time_dim]], 
table:alias=[time_dim])
           HiveJoin(condition=[=($1, $3)], joinType=[inner], algorithm=[none], 
cost=[not available])
@@ -105,7 +105,7 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], 
t_minute=[$3], ext_price=[$4
                     HiveProject(ws_sold_date_sk=[$0], ws_sold_time_sk=[$1], 
ws_item_sk=[$3], ws_ext_sales_price=[$23])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($3), IS NOT NULL($1))])
                         HiveTableScan(table=[[default, web_sales]], 
table:alias=[web_sales])
-                    HiveProject(d_date_sk=[$0], d_year=[CAST(2001):INTEGER], 
d_moy=[CAST(12):INTEGER])
+                    HiveProject(d_date_sk=[$0])
                       HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT 
NULL($0))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
                 HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1])
@@ -113,7 +113,7 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], 
t_minute=[$3], ext_price=[$4
                     HiveProject(cs_sold_date_sk=[$0], cs_sold_time_sk=[$1], 
cs_item_sk=[$15], cs_ext_sales_price=[$23])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($15), IS NOT NULL($1))])
                         HiveTableScan(table=[[default, catalog_sales]], 
table:alias=[catalog_sales])
-                    HiveProject(d_date_sk=[$0], d_year=[CAST(2001):INTEGER], 
d_moy=[CAST(12):INTEGER])
+                    HiveProject(d_date_sk=[$0])
                       HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT 
NULL($0))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
                 HiveProject(ext_price=[$3], sold_item_sk=[$2], time_sk=[$1])
@@ -121,10 +121,10 @@ HiveProject(brand_id=[$0], brand=[$1], t_hour=[$2], 
t_minute=[$3], ext_price=[$4
                     HiveProject(ss_sold_date_sk=[$0], ss_sold_time_sk=[$1], 
ss_item_sk=[$2], ss_ext_sales_price=[$15])
                       HiveFilter(condition=[AND(IS NOT NULL($0), IS NOT 
NULL($2), IS NOT NULL($1))])
                         HiveTableScan(table=[[default, store_sales]], 
table:alias=[store_sales])
-                    HiveProject(d_date_sk=[$0], d_year=[CAST(2001):INTEGER], 
d_moy=[CAST(12):INTEGER])
+                    HiveProject(d_date_sk=[$0])
                       HiveFilter(condition=[AND(=($8, 12), =($6, 2001), IS NOT 
NULL($0))])
                         HiveTableScan(table=[[default, date_dim]], 
table:alias=[date_dim])
-            HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8], 
i_manager_id=[CAST(1):INTEGER])
+            HiveProject(i_item_sk=[$0], i_brand_id=[$7], i_brand=[$8])
               HiveFilter(condition=[AND(=($20, 1), IS NOT NULL($0))])
                 HiveTableScan(table=[[default, item]], table:alias=[item])
 

Reply via email to