http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query49.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query49.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query49.q.out
index 07d14b5..354c178 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query49.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query49.q.out
@@ -304,7 +304,7 @@ STAGE PLANS:
                     predicate: ((ws_net_paid > 0) and (ws_net_profit > 1) and 
(ws_quantity > 0) and ws_item_sk is not null and ws_order_number is not null 
and ws_sold_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 5333432 Data size: 725192506 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: ws_sold_date_sk (type: int), ws_item_sk 
(type: int), ws_order_number (type: int), ws_quantity (type: int), ws_net_paid 
(type: decimal(7,2))
+                      expressions: ws_sold_date_sk (type: int), ws_item_sk 
(type: int), ws_order_number (type: int), CASE WHEN (ws_quantity is not null) 
THEN (ws_quantity) ELSE (0) END (type: int), CASE WHEN (ws_net_paid is not 
null) THEN (ws_net_paid) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 5333432 Data size: 725192506 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -312,7 +312,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 5333432 Data size: 725192506 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(7,2))
+                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(12,2))
             Execution mode: vectorized
         Map 10 
             Map Operator Tree:
@@ -343,7 +343,7 @@ STAGE PLANS:
                     predicate: ((wr_return_amt > 10000) and wr_item_sk is not 
null and wr_order_number is not null) (type: boolean)
                     Statistics: Num rows: 4799489 Data size: 441731394 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: wr_item_sk (type: int), wr_order_number 
(type: int), wr_return_quantity (type: int), wr_return_amt (type: decimal(7,2))
+                      expressions: wr_item_sk (type: int), wr_order_number 
(type: int), CASE WHEN (wr_return_quantity is not null) THEN 
(wr_return_quantity) ELSE (0) END (type: int), CASE WHEN (wr_return_amt is not 
null) THEN (wr_return_amt) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 4799489 Data size: 441731394 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -351,7 +351,7 @@ STAGE PLANS:
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: int)
                         Statistics: Num rows: 4799489 Data size: 441731394 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2))
+                        value expressions: _col2 (type: int), _col3 (type: 
decimal(12,2))
             Execution mode: vectorized
         Map 12 
             Map Operator Tree:
@@ -363,7 +363,7 @@ STAGE PLANS:
                     predicate: ((cs_net_paid > 0) and (cs_net_profit > 1) and 
(cs_quantity > 0) and cs_item_sk is not null and cs_order_number is not null 
and cs_sold_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 10666290 Data size: 1444429931 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: cs_sold_date_sk (type: int), cs_item_sk 
(type: int), cs_order_number (type: int), cs_quantity (type: int), cs_net_paid 
(type: decimal(7,2))
+                      expressions: cs_sold_date_sk (type: int), cs_item_sk 
(type: int), cs_order_number (type: int), CASE WHEN (cs_quantity is not null) 
THEN (cs_quantity) ELSE (0) END (type: int), CASE WHEN (cs_net_paid is not 
null) THEN (cs_net_paid) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 10666290 Data size: 1444429931 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -371,7 +371,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 10666290 Data size: 1444429931 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(7,2))
+                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(12,2))
             Execution mode: vectorized
         Map 19 
             Map Operator Tree:
@@ -383,7 +383,7 @@ STAGE PLANS:
                     predicate: ((cr_return_amount > 10000) and cr_item_sk is 
not null and cr_order_number is not null) (type: boolean)
                     Statistics: Num rows: 9599627 Data size: 1019078226 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: cr_item_sk (type: int), cr_order_number 
(type: int), cr_return_quantity (type: int), cr_return_amount (type: 
decimal(7,2))
+                      expressions: cr_item_sk (type: int), cr_order_number 
(type: int), CASE WHEN (cr_return_quantity is not null) THEN 
(cr_return_quantity) ELSE (0) END (type: int), CASE WHEN (cr_return_amount is 
not null) THEN (cr_return_amount) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 9599627 Data size: 1019078226 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -391,7 +391,7 @@ STAGE PLANS:
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: int)
                         Statistics: Num rows: 9599627 Data size: 1019078226 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2))
+                        value expressions: _col2 (type: int), _col3 (type: 
decimal(12,2))
             Execution mode: vectorized
         Map 20 
             Map Operator Tree:
@@ -403,7 +403,7 @@ STAGE PLANS:
                     predicate: ((ss_net_paid > 0) and (ss_net_profit > 1) and 
(ss_quantity > 0) and ss_item_sk is not null and ss_sold_date_sk is not null 
and ss_ticket_number is not null) (type: boolean)
                     Statistics: Num rows: 21333171 Data size: 1882018537 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: ss_sold_date_sk (type: int), ss_item_sk 
(type: int), ss_ticket_number (type: int), ss_quantity (type: int), ss_net_paid 
(type: decimal(7,2))
+                      expressions: ss_sold_date_sk (type: int), ss_item_sk 
(type: int), ss_ticket_number (type: int), CASE WHEN (ss_quantity is not null) 
THEN (ss_quantity) ELSE (0) END (type: int), CASE WHEN (ss_net_paid is not 
null) THEN (ss_net_paid) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 21333171 Data size: 1882018537 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -411,7 +411,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 21333171 Data size: 1882018537 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(7,2))
+                        value expressions: _col1 (type: int), _col2 (type: 
int), _col3 (type: int), _col4 (type: decimal(12,2))
             Execution mode: vectorized
         Map 27 
             Map Operator Tree:
@@ -423,7 +423,7 @@ STAGE PLANS:
                     predicate: ((sr_return_amt > 10000) and sr_item_sk is not 
null and sr_ticket_number is not null) (type: boolean)
                     Statistics: Num rows: 19197050 Data size: 1487398277 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: sr_item_sk (type: int), sr_ticket_number 
(type: int), sr_return_quantity (type: int), sr_return_amt (type: decimal(7,2))
+                      expressions: sr_item_sk (type: int), sr_ticket_number 
(type: int), CASE WHEN (sr_return_quantity is not null) THEN 
(sr_return_quantity) ELSE (0) END (type: int), CASE WHEN (sr_return_amt is not 
null) THEN (sr_return_amt) ELSE (0) END (type: decimal(12,2))
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 19197050 Data size: 1487398277 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -431,7 +431,7 @@ STAGE PLANS:
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: int)
                         Statistics: Num rows: 19197050 Data size: 1487398277 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2))
+                        value expressions: _col2 (type: int), _col3 (type: 
decimal(12,2))
             Execution mode: vectorized
         Reducer 13 
             Reduce Operator Tree:
@@ -448,7 +448,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col1 (type: int), _col2 
(type: int)
                   Statistics: Num rows: 11732919 Data size: 1588872958 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col3 (type: int), _col4 (type: 
decimal(7,2))
+                  value expressions: _col3 (type: int), _col4 (type: 
decimal(12,2))
         Reducer 14 
             Reduce Operator Tree:
               Join Operator
@@ -457,24 +457,20 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int), _col2 (type: int)
                   1 _col0 (type: int), _col1 (type: int)
-                outputColumnNames: _col1, _col3, _col4, _col11, _col12
+                outputColumnNames: _col1, _col3, _col4, _col8, _col9
                 Statistics: Num rows: 12906211 Data size: 1747760291 Basic 
stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: int), CASE WHEN (_col11 is not 
null) THEN (_col11) ELSE (0) END (type: int), CASE WHEN (_col3 is not null) 
THEN (_col3) ELSE (0) END (type: int), CASE WHEN (_col12 is not null) THEN 
(_col12) ELSE (0) END (type: decimal(12,2)), CASE WHEN (_col4 is not null) THEN 
(_col4) ELSE (0) END (type: decimal(12,2))
+                Group By Operator
+                  aggregations: sum(_col8), sum(_col3), sum(_col9), sum(_col4)
+                  keys: _col1 (type: int)
+                  mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 12906211 Data size: 1747760291 Basic 
stats: COMPLETE Column stats: NONE
-                  Group By Operator
-                    aggregations: sum(_col1), sum(_col2), sum(_col3), 
sum(_col4)
-                    keys: _col0 (type: int)
-                    mode: hash
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                  Reduce Output Operator
+                    key expressions: _col0 (type: int)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: int)
                     Statistics: Num rows: 12906211 Data size: 1747760291 Basic 
stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col0 (type: int)
-                      sort order: +
-                      Map-reduce partition columns: _col0 (type: int)
-                      Statistics: Num rows: 12906211 Data size: 1747760291 
Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
+                    value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
         Reducer 15 
             Execution mode: vectorized
             Reduce Operator Tree:
@@ -587,7 +583,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col1 (type: int), _col2 
(type: int)
                   Statistics: Num rows: 5866775 Data size: 797711773 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col3 (type: int), _col4 (type: 
decimal(7,2))
+                  value expressions: _col3 (type: int), _col4 (type: 
decimal(12,2))
         Reducer 21 
             Reduce Operator Tree:
               Join Operator
@@ -603,7 +599,7 @@ STAGE PLANS:
                   sort order: ++
                   Map-reduce partition columns: _col1 (type: int), _col2 
(type: int)
                   Statistics: Num rows: 23466488 Data size: 2070220435 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col3 (type: int), _col4 (type: 
decimal(7,2))
+                  value expressions: _col3 (type: int), _col4 (type: 
decimal(12,2))
         Reducer 22 
             Reduce Operator Tree:
               Join Operator
@@ -612,24 +608,20 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int), _col2 (type: int)
                   1 _col0 (type: int), _col1 (type: int)
-                outputColumnNames: _col1, _col3, _col4, _col11, _col12
+                outputColumnNames: _col1, _col3, _col4, _col8, _col9
                 Statistics: Num rows: 25813137 Data size: 2277242527 Basic 
stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: int), CASE WHEN (_col11 is not 
null) THEN (_col11) ELSE (0) END (type: int), CASE WHEN (_col3 is not null) 
THEN (_col3) ELSE (0) END (type: int), CASE WHEN (_col12 is not null) THEN 
(_col12) ELSE (0) END (type: decimal(12,2)), CASE WHEN (_col4 is not null) THEN 
(_col4) ELSE (0) END (type: decimal(12,2))
+                Group By Operator
+                  aggregations: sum(_col8), sum(_col3), sum(_col9), sum(_col4)
+                  keys: _col1 (type: int)
+                  mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 25813137 Data size: 2277242527 Basic 
stats: COMPLETE Column stats: NONE
-                  Group By Operator
-                    aggregations: sum(_col1), sum(_col2), sum(_col3), 
sum(_col4)
-                    keys: _col0 (type: int)
-                    mode: hash
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                  Reduce Output Operator
+                    key expressions: _col0 (type: int)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: int)
                     Statistics: Num rows: 25813137 Data size: 2277242527 Basic 
stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col0 (type: int)
-                      sort order: +
-                      Map-reduce partition columns: _col0 (type: int)
-                      Statistics: Num rows: 25813137 Data size: 2277242527 
Basic stats: COMPLETE Column stats: NONE
-                      value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
+                    value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
         Reducer 23 
             Execution mode: vectorized
             Reduce Operator Tree:
@@ -736,24 +728,20 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int), _col2 (type: int)
                   1 _col0 (type: int), _col1 (type: int)
-                outputColumnNames: _col1, _col3, _col4, _col11, _col12
+                outputColumnNames: _col1, _col3, _col4, _col8, _col9
                 Statistics: Num rows: 6453452 Data size: 877482969 Basic 
stats: COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: int), CASE WHEN (_col11 is not 
null) THEN (_col11) ELSE (0) END (type: int), CASE WHEN (_col3 is not null) 
THEN (_col3) ELSE (0) END (type: int), CASE WHEN (_col12 is not null) THEN 
(_col12) ELSE (0) END (type: decimal(12,2)), CASE WHEN (_col4 is not null) THEN 
(_col4) ELSE (0) END (type: decimal(12,2))
+                Group By Operator
+                  aggregations: sum(_col8), sum(_col3), sum(_col9), sum(_col4)
+                  keys: _col1 (type: int)
+                  mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 6453452 Data size: 877482969 Basic 
stats: COMPLETE Column stats: NONE
-                  Group By Operator
-                    aggregations: sum(_col1), sum(_col2), sum(_col3), 
sum(_col4)
-                    keys: _col0 (type: int)
-                    mode: hash
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4
+                  Reduce Output Operator
+                    key expressions: _col0 (type: int)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: int)
                     Statistics: Num rows: 6453452 Data size: 877482969 Basic 
stats: COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col0 (type: int)
-                      sort order: +
-                      Map-reduce partition columns: _col0 (type: int)
-                      Statistics: Num rows: 6453452 Data size: 877482969 Basic 
stats: COMPLETE Column stats: NONE
-                      value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
+                    value expressions: _col1 (type: bigint), _col2 (type: 
bigint), _col3 (type: decimal(22,2)), _col4 (type: decimal(22,2))
         Reducer 4 
             Execution mode: vectorized
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query5.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query5.q.out
index 6e5743b..f9959a2 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query5.q.out
@@ -568,11 +568,11 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col2, _col3, _col4, _col5, _col9
+                outputColumnNames: _col2, _col3, _col4, _col5, _col8
                 Statistics: Num rows: 383314363 Data size: 50888782999 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col2), sum(_col4), sum(_col3), sum(_col5)
-                  keys: _col9 (type: string)
+                  keys: _col8 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4
                   Statistics: Num rows: 383314363 Data size: 50888782999 Basic 
stats: COMPLETE Column stats: NONE
@@ -626,13 +626,13 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col2, _col3, _col4, _col5, _col9
+                  outputColumnNames: _col2, _col3, _col4, _col5, _col8
                   input vertices:
                     1 Map 23
                   Statistics: Num rows: 365910798 Data size: 49753286377 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col4), sum(_col3), 
sum(_col5)
-                    keys: _col9 (type: string)
+                    keys: _col8 (type: string)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
                     Statistics: Num rows: 365910798 Data size: 49753286377 
Basic stats: COMPLETE Column stats: NONE
@@ -686,13 +686,13 @@ STAGE PLANS:
                   keys:
                     0 _col0 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col2, _col3, _col4, _col5, _col9
+                  outputColumnNames: _col2, _col3, _col4, _col5, _col8
                   input vertices:
                     1 Map 8
                   Statistics: Num rows: 766640042 Data size: 66884806171 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col4), sum(_col3), 
sum(_col5)
-                    keys: _col9 (type: string)
+                    keys: _col8 (type: string)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
                     Statistics: Num rows: 766640042 Data size: 66884806171 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query50.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query50.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query50.q.out
index 2a84a92..6a59f7d 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query50.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query50.q.out
@@ -149,7 +149,7 @@ STAGE PLANS:
                       Statistics: Num rows: 1704 Data size: 3256276 Basic 
stats: COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
                         keys:
-                          0 _col10 (type: int)
+                          0 _col8 (type: int)
                           1 _col0 (type: int)
             Execution mode: vectorized
             Local Work:
@@ -267,14 +267,14 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int), _col2 (type: int), _col3 (type: int)
                   1 _col1 (type: int), _col2 (type: int), _col4 (type: int)
-                outputColumnNames: _col0, _col7, _col10
+                outputColumnNames: _col0, _col5, _col8
                 Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col7 (type: int)
+                  key expressions: _col5 (type: int)
                   sort order: +
-                  Map-reduce partition columns: _col7 (type: int)
+                  Map-reduce partition columns: _col5 (type: int)
                   Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col0 (type: int), _col10 (type: int)
+                  value expressions: _col0 (type: int), _col8 (type: int)
         Reducer 4 
             Local Work:
               Map Reduce Local Work
@@ -283,22 +283,22 @@ STAGE PLANS:
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 _col7 (type: int)
+                  0 _col5 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col0, _col7, _col10
+                outputColumnNames: _col0, _col5, _col8
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 _col10 (type: int)
+                    0 _col8 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col0, _col7, _col14, _col15, _col16, 
_col17, _col18, _col19, _col20, _col21, _col22, _col23
+                  outputColumnNames: _col0, _col5, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21
                   input vertices:
                     1 Map 10
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col14 (type: string), _col15 (type: int), 
_col16 (type: string), _col17 (type: string), _col18 (type: string), _col19 
(type: string), _col20 (type: string), _col21 (type: string), _col22 (type: 
string), _col23 (type: string), CASE WHEN (((_col0 - _col7) <= 30)) THEN (1) 
ELSE (0) END (type: int), CASE WHEN ((((_col0 - _col7) > 30) and ((_col0 - 
_col7) <= 60))) THEN (1) ELSE (0) END (type: int), CASE WHEN ((((_col0 - _col7) 
> 60) and ((_col0 - _col7) <= 90))) THEN (1) ELSE (0) END (type: int), CASE 
WHEN ((((_col0 - _col7) > 90) and ((_col0 - _col7) <= 120))) THEN (1) ELSE (0) 
END (type: int), CASE WHEN (((_col0 - _col7) > 120)) THEN (1) ELSE (0) END 
(type: int)
+                    expressions: _col12 (type: string), _col13 (type: int), 
_col14 (type: string), _col15 (type: string), _col16 (type: string), _col17 
(type: string), _col18 (type: string), _col19 (type: string), _col20 (type: 
string), _col21 (type: string), CASE WHEN (((_col0 - _col5) <= 30)) THEN (1) 
ELSE (0) END (type: int), CASE WHEN ((((_col0 - _col5) > 30) and ((_col0 - 
_col5) <= 60))) THEN (1) ELSE (0) END (type: int), CASE WHEN ((((_col0 - _col5) 
> 60) and ((_col0 - _col5) <= 90))) THEN (1) ELSE (0) END (type: int), CASE 
WHEN ((((_col0 - _col5) > 90) and ((_col0 - _col5) <= 120))) THEN (1) ELSE (0) 
END (type: int), CASE WHEN (((_col0 - _col5) > 120)) THEN (1) ELSE (0) END 
(type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14
                     Statistics: Num rows: 766650239 Data size: 67634106676 
Basic stats: COMPLETE Column stats: NONE
                     Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query52.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query52.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query52.q.out
index 5de7ee7..45c9237 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query52.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query52.q.out
@@ -145,11 +145,11 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col2, _col7, _col8
+                outputColumnNames: _col2, _col5, _col6
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col2)
-                  keys: _col7 (type: int), _col8 (type: string)
+                  keys: _col5 (type: int), _col6 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query53.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query53.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query53.q.out
index 3479cb5..ea5dde1 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query53.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query53.q.out
@@ -133,14 +133,14 @@ STAGE PLANS:
                     Statistics: Num rows: 462000 Data size: 663560457 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: i_item_sk (type: int), i_manufact_id (type: 
int)
-                      outputColumnNames: _col0, _col4
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 462000 Data size: 663560457 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 462000 Data size: 663560457 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col4 (type: int)
+                        value expressions: _col1 (type: int)
             Execution mode: vectorized
         Map 7 
             Map Operator Tree:
@@ -153,14 +153,14 @@ STAGE PLANS:
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int), d_qoy (type: int)
-                      outputColumnNames: _col0, _col2
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: int)
+                        value expressions: _col1 (type: int)
             Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
@@ -170,14 +170,14 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col0, _col2, _col3, _col8
+                outputColumnNames: _col0, _col2, _col3, _col5
                 Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2)), _col8 (type: int)
+                  value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2)), _col5 (type: int)
         Reducer 3 
             Local Work:
               Map Reduce Local Work
@@ -188,7 +188,7 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col2, _col3, _col8, _col11
+                outputColumnNames: _col2, _col3, _col5, _col7
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
@@ -196,13 +196,13 @@ STAGE PLANS:
                   keys:
                     0 _col2 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col3, _col8, _col11
+                  outputColumnNames: _col3, _col5, _col7
                   input vertices:
                     1 Map 8
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col3)
-                    keys: _col8 (type: int), _col11 (type: int)
+                    keys: _col5 (type: int), _col7 (type: int)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 766650239 Data size: 67634106676 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query54.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query54.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query54.q.out
index 7d488f9..690f1d4 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query54.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query54.q.out
@@ -613,10 +613,10 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col9, _col10
+                outputColumnNames: _col5, _col6
                 Statistics: Num rows: 574982058 Data size: 77969728405 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  keys: _col10 (type: int), _col9 (type: int)
+                  keys: _col6 (type: int), _col5 (type: int)
                   mode: hash
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 574982058 Data size: 77969728405 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query55.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query55.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query55.q.out
index 2d5ce9f..1ae7bf4 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query55.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query55.q.out
@@ -129,11 +129,11 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col2, _col7, _col8
+                outputColumnNames: _col2, _col5, _col6
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col2)
-                  keys: _col7 (type: int), _col8 (type: string)
+                  keys: _col5 (type: int), _col6 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1, _col2
                   Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query56.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query56.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query56.q.out
index 51b2222..1395c16 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query56.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query56.q.out
@@ -402,14 +402,14 @@ STAGE PLANS:
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col1 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col3, _col5
+                  outputColumnNames: _col2, _col4
                   Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col3 (type: int)
+                    key expressions: _col2 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col3 (type: int)
+                    Map-reduce partition columns: _col2 (type: int)
                     Statistics: Num rows: 696954748 Data size: 61485550191 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 15 
             Reduce Operator Tree:
               Join Operator
@@ -433,11 +433,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col4 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col3 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 383314495 Data size: 51908482889 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -510,14 +510,14 @@ STAGE PLANS:
                 Statistics: Num rows: 348467716 Data size: 47189528877 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col2 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col4, _col5
+                  outputColumnNames: _col3, _col4
                   Statistics: Num rows: 348467716 Data size: 47189528877 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col4 (type: int)
+                    key expressions: _col3 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col4 (type: int)
+                    Map-reduce partition columns: _col3 (type: int)
                     Statistics: Num rows: 348467716 Data size: 47189528877 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 26 
             Reduce Operator Tree:
               Join Operator
@@ -541,11 +541,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col3 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col2 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 191667562 Data size: 26061245514 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -584,11 +584,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col3 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col2 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -640,14 +640,14 @@ STAGE PLANS:
                 Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col1 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col3, _col5
+                  outputColumnNames: _col2, _col4
                   Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col3 (type: int)
+                    key expressions: _col2 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col3 (type: int)
+                    Map-reduce partition columns: _col2 (type: int)
                     Statistics: Num rows: 174243235 Data size: 23692040863 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 4 
             Execution mode: vectorized
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query57.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query57.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query57.q.out
index 5976141..9d54fb2 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query57.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query57.q.out
@@ -530,9 +530,9 @@ STAGE PLANS:
                           outputColumnNames: _col0, _col1, _col2, _col3, 
_col4, _col5, _col6, _col7
                           Statistics: Num rows: 15971437 Data size: 2162853414 
Basic stats: COMPLETE Column stats: NONE
                           Reduce Output Operator
-                            key expressions: _col0 (type: string), _col1 
(type: string), _col2 (type: string), _col7 (type: int)
+                            key expressions: _col0 (type: string), _col1 
(type: string), _col7 (type: int), _col2 (type: string)
                             sort order: ++++
-                            Map-reduce partition columns: _col0 (type: 
string), _col1 (type: string), _col2 (type: string), _col7 (type: int)
+                            Map-reduce partition columns: _col0 (type: 
string), _col1 (type: string), _col7 (type: int), _col2 (type: string)
                             Statistics: Num rows: 15971437 Data size: 
2162853414 Basic stats: COMPLETE Column stats: NONE
                             value expressions: _col3 (type: int), _col4 (type: 
int), _col5 (type: decimal(17,2)), _col6 (type: decimal(21,6))
         Reducer 2 
@@ -660,13 +660,13 @@ STAGE PLANS:
                     predicate: rank_window_0 is not null (type: boolean)
                     Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: string), _col0 (type: string), 
_col4 (type: string), _col5 (type: decimal(17,2)), rank_window_0 (type: int)
+                      expressions: _col1 (type: string), _col0 (type: string), 
_col4 (type: string), _col5 (type: decimal(17,2)), (rank_window_0 - 1) (type: 
int)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), (_col4 - 1) (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col4 (type: int), _col2 (type: string)
                         sort order: ++++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), (_col4 - 1) (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col4 (type: int), _col2 (type: string)
                         Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col3 (type: decimal(17,2))
         Reducer 3 
@@ -738,13 +738,13 @@ STAGE PLANS:
                     predicate: rank_window_0 is not null (type: boolean)
                     Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col1 (type: string), _col0 (type: string), 
_col4 (type: string), _col5 (type: decimal(17,2)), rank_window_0 (type: int)
+                      expressions: _col1 (type: string), _col0 (type: string), 
_col4 (type: string), _col5 (type: decimal(17,2)), (rank_window_0 + 1) (type: 
int)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), (_col4 + 1) (type: int)
+                        key expressions: _col0 (type: string), _col1 (type: 
string), _col4 (type: int), _col2 (type: string)
                         sort order: ++++
-                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col2 (type: string), (_col4 + 1) (type: int)
+                        Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string), _col4 (type: int), _col2 (type: string)
                         Statistics: Num rows: 191657247 Data size: 25954241376 
Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col3 (type: decimal(17,2))
         Reducer 6 
@@ -754,9 +754,9 @@ STAGE PLANS:
                      Inner Join 0 to 1
                      Inner Join 1 to 2
                 keys:
-                  0 _col0 (type: string), _col1 (type: string), _col2 (type: 
string), (_col4 + 1) (type: int)
-                  1 _col0 (type: string), _col1 (type: string), _col2 (type: 
string), _col7 (type: int)
-                  2 _col0 (type: string), _col1 (type: string), _col2 (type: 
string), (_col4 - 1) (type: int)
+                  0 _col0 (type: string), _col1 (type: string), _col4 (type: 
int), _col2 (type: string)
+                  1 _col0 (type: string), _col1 (type: string), _col7 (type: 
int), _col2 (type: string)
+                  2 _col0 (type: string), _col1 (type: string), _col4 (type: 
int), _col2 (type: string)
                 outputColumnNames: _col3, _col5, _col6, _col8, _col9, _col10, 
_col11, _col16
                 Statistics: Num rows: 421645952 Data size: 57099332264 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query58.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query58.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query58.q.out
index c7d4039..d3c7e0b 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query58.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query58.q.out
@@ -728,12 +728,16 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 348477374 Data size: 30742775095 Basic 
stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
+                Select Operator
+                  expressions: _col0 (type: string), _col1 (type: 
decimal(17,2)), (0.9 * _col1) (type: decimal(19,3)), (1.1 * _col1) (type: 
decimal(20,3))
+                  outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 348477374 Data size: 30742775095 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: decimal(17,2))
+                  Reduce Output Operator
+                    key expressions: _col0 (type: string)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: string)
+                    Statistics: Num rows: 348477374 Data size: 30742775095 
Basic stats: COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: decimal(17,2)), _col2 
(type: decimal(19,3)), _col3 (type: decimal(20,3))
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -867,12 +871,16 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 87121617 Data size: 11846020363 Basic 
stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
+                Select Operator
+                  expressions: _col0 (type: string), _col1 (type: 
decimal(17,2)), (0.9 * _col1) (type: decimal(19,3)), (1.1 * _col1) (type: 
decimal(20,3))
+                  outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 87121617 Data size: 11846020363 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: decimal(17,2))
+                  Reduce Output Operator
+                    key expressions: _col0 (type: string)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: string)
+                    Statistics: Num rows: 87121617 Data size: 11846020363 
Basic stats: COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: decimal(17,2)), _col2 
(type: decimal(19,3)), _col3 (type: decimal(20,3))
         Reducer 35 
             Reduce Operator Tree:
               Join Operator
@@ -917,12 +925,16 @@ STAGE PLANS:
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 174233858 Data size: 23594764438 Basic 
stats: COMPLETE Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
+                Select Operator
+                  expressions: _col0 (type: string), _col1 (type: 
decimal(17,2)), (0.9 * _col1) (type: decimal(19,3)), (1.1 * _col1) (type: 
decimal(20,3))
+                  outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 174233858 Data size: 23594764438 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: decimal(17,2))
+                  Reduce Output Operator
+                    key expressions: _col0 (type: string)
+                    sort order: +
+                    Map-reduce partition columns: _col0 (type: string)
+                    Statistics: Num rows: 174233858 Data size: 23594764438 
Basic stats: COMPLETE Column stats: NONE
+                    value expressions: _col1 (type: decimal(17,2)), _col2 
(type: decimal(19,3)), _col3 (type: decimal(20,3))
         Reducer 40 
             Execution mode: vectorized
             Reduce Operator Tree:
@@ -946,13 +958,13 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                   2 _col0 (type: string)
-                outputColumnNames: _col0, _col1, _col3, _col5
+                outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, 
_col7, _col9, _col10, _col11
                 Statistics: Num rows: 766650239 Data size: 67634106674 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 BETWEEN (0.9 * _col3) AND (1.1 * _col3) 
and _col1 BETWEEN (0.9 * _col5) AND (1.1 * _col5) and _col3 BETWEEN (0.9 * 
_col1) AND (1.1 * _col1) and _col3 BETWEEN (0.9 * _col5) AND (1.1 * _col5) and 
_col5 BETWEEN (0.9 * _col1) AND (1.1 * _col1) and _col5 BETWEEN (0.9 * _col3) 
AND (1.1 * _col3)) (type: boolean)
+                  predicate: (_col1 BETWEEN _col10 AND _col11 and _col1 
BETWEEN _col6 AND _col7 and _col5 BETWEEN _col10 AND _col11 and _col5 BETWEEN 
_col2 AND _col3 and _col9 BETWEEN _col2 AND _col3 and _col9 BETWEEN _col6 AND 
_col7) (type: boolean)
                   Statistics: Num rows: 1442 Data size: 127213 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: string), _col3 (type: 
decimal(17,2)), (((_col3 / ((_col3 + _col1) + _col5)) / 3) * 100) (type: 
decimal(38,17)), _col1 (type: decimal(17,2)), (((_col1 / ((_col3 + _col1) + 
_col5)) / 3) * 100) (type: decimal(38,17)), _col5 (type: decimal(17,2)), 
(((_col5 / ((_col3 + _col1) + _col5)) / 3) * 100) (type: decimal(38,17)), 
(((_col3 + _col1) + _col5) / 3) (type: decimal(23,6))
+                    expressions: _col0 (type: string), _col5 (type: 
decimal(17,2)), (((_col5 / ((_col5 + _col1) + _col9)) / 3) * 100) (type: 
decimal(38,17)), _col1 (type: decimal(17,2)), (((_col1 / ((_col5 + _col1) + 
_col9)) / 3) * 100) (type: decimal(38,17)), _col9 (type: decimal(17,2)), 
(((_col9 / ((_col5 + _col1) + _col9)) / 3) * 100) (type: decimal(38,17)), 
(((_col5 + _col1) + _col9) / 3) (type: decimal(23,6))
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7
                     Statistics: Num rows: 1442 Data size: 127213 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query59.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query59.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query59.q.out
index aef93d3..c66c814 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query59.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query59.q.out
@@ -212,15 +212,15 @@ STAGE PLANS:
                     predicate: (d_date_sk is not null and d_week_seq is not 
null) (type: boolean)
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: d_date_sk (type: int), d_week_seq (type: 
int), d_day_name (type: string)
-                      outputColumnNames: _col0, _col1, _col2
+                      expressions: d_date_sk (type: int), d_week_seq (type: 
int), (d_day_name = 'Sunday') (type: boolean), (d_day_name = 'Monday') (type: 
boolean), (d_day_name = 'Wednesday') (type: boolean), (d_day_name = 'Thursday') 
(type: boolean), (d_day_name = 'Friday') (type: boolean), (d_day_name = 
'Saturday') (type: boolean)
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col5, 
_col6, _col7, _col8
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: int), _col2 (type: 
string)
+                        value expressions: _col1 (type: int), _col2 (type: 
boolean), _col3 (type: boolean), _col5 (type: boolean), _col6 (type: boolean), 
_col7 (type: boolean), _col8 (type: boolean)
             Execution mode: vectorized
         Map 15 
             Map Operator Tree:
@@ -233,12 +233,12 @@ STAGE PLANS:
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_week_seq (type: int)
-                      outputColumnNames: _col1
+                      outputColumnNames: _col0
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col1 (type: int)
+                        key expressions: _col0 (type: int)
                         sort order: +
-                        Map-reduce partition columns: _col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Map 7 
@@ -251,15 +251,15 @@ STAGE PLANS:
                     predicate: (d_date_sk is not null and d_week_seq is not 
null) (type: boolean)
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: d_date_sk (type: int), d_week_seq (type: 
int), d_day_name (type: string)
-                      outputColumnNames: _col0, _col1, _col2
+                      expressions: d_date_sk (type: int), d_week_seq (type: 
int), (d_day_name = 'Sunday') (type: boolean), (d_day_name = 'Monday') (type: 
boolean), (d_day_name = 'Tuesday') (type: boolean), (d_day_name = 'Wednesday') 
(type: boolean), (d_day_name = 'Thursday') (type: boolean), (d_day_name = 
'Friday') (type: boolean), (d_day_name = 'Saturday') (type: boolean)
+                      outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: int), _col2 (type: 
string)
+                        value expressions: _col1 (type: int), _col2 (type: 
boolean), _col3 (type: boolean), _col4 (type: boolean), _col5 (type: boolean), 
_col6 (type: boolean), _col7 (type: boolean), _col8 (type: boolean)
             Execution mode: vectorized
         Map 8 
             Map Operator Tree:
@@ -272,12 +272,12 @@ STAGE PLANS:
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_week_seq (type: int)
-                      outputColumnNames: _col1
+                      outputColumnNames: _col0
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
-                        key expressions: _col1 (type: int)
+                        key expressions: _col0 (type: int)
                         sort order: +
-                        Map-reduce partition columns: _col1 (type: int)
+                        Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 11 
@@ -288,10 +288,10 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col1, _col2, _col4, _col5
+                outputColumnNames: _col1, _col2, _col4, _col5, _col6, _col8, 
_col9, _col10, _col11
                 Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col4 (type: int), _col1 (type: int), CASE WHEN 
((_col5 = 'Sunday')) THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE 
WHEN ((_col5 = 'Monday')) THEN (_col2) ELSE (null) END (type: decimal(7,2)), 
CASE WHEN ((_col5 = 'Wednesday')) THEN (_col2) ELSE (null) END (type: 
decimal(7,2)), CASE WHEN ((_col5 = 'Thursday')) THEN (_col2) ELSE (null) END 
(type: decimal(7,2)), CASE WHEN ((_col5 = 'Friday')) THEN (_col2) ELSE (null) 
END (type: decimal(7,2)), CASE WHEN ((_col5 = 'Saturday')) THEN (_col2) ELSE 
(null) END (type: decimal(7,2))
+                  expressions: _col4 (type: int), _col1 (type: int), CASE WHEN 
(_col5) THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col6) 
THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col8) THEN 
(_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col9) THEN (_col2) 
ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col10) THEN (_col2) ELSE 
(null) END (type: decimal(7,2)), CASE WHEN (_col11) THEN (_col2) ELSE (null) 
END (type: decimal(7,2))
                   outputColumnNames: _col0, _col1, _col2, _col3, _col5, _col6, 
_col7, _col8
                   Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
@@ -330,7 +330,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col1 (type: int)
+                  1 _col0 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
                 Statistics: Num rows: 348477374 Data size: 30742775095 Basic 
stats: COMPLETE Column stats: NONE
                 Map Join Operator
@@ -339,12 +339,12 @@ STAGE PLANS:
                   keys:
                     0 _col1 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col11
+                  outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col10
                   input vertices:
                     1 Map 16
                   Statistics: Num rows: 383325119 Data size: 33817053337 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
-                    expressions: _col0 (type: int), _col11 (type: string), 
_col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: 
decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 
(type: decimal(17,2))
+                    expressions: _col0 (type: int), _col10 (type: string), 
_col2 (type: decimal(17,2)), _col3 (type: decimal(17,2)), _col4 (type: 
decimal(17,2)), _col5 (type: decimal(17,2)), _col6 (type: decimal(17,2)), _col7 
(type: decimal(17,2))
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7
                     Statistics: Num rows: 383325119 Data size: 33817053337 
Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
@@ -361,10 +361,10 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col1, _col2, _col4, _col5
+                outputColumnNames: _col1, _col2, _col4, _col5, _col6, _col7, 
_col8, _col9, _col10, _col11
                 Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col4 (type: int), _col1 (type: int), CASE WHEN 
((_col5 = 'Sunday')) THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE 
WHEN ((_col5 = 'Monday')) THEN (_col2) ELSE (null) END (type: decimal(7,2)), 
CASE WHEN ((_col5 = 'Tuesday')) THEN (_col2) ELSE (null) END (type: 
decimal(7,2)), CASE WHEN ((_col5 = 'Wednesday')) THEN (_col2) ELSE (null) END 
(type: decimal(7,2)), CASE WHEN ((_col5 = 'Thursday')) THEN (_col2) ELSE (null) 
END (type: decimal(7,2)), CASE WHEN ((_col5 = 'Friday')) THEN (_col2) ELSE 
(null) END (type: decimal(7,2)), CASE WHEN ((_col5 = 'Saturday')) THEN (_col2) 
ELSE (null) END (type: decimal(7,2))
+                  expressions: _col4 (type: int), _col1 (type: int), CASE WHEN 
(_col5) THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col6) 
THEN (_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col7) THEN 
(_col2) ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col8) THEN (_col2) 
ELSE (null) END (type: decimal(7,2)), CASE WHEN (_col9) THEN (_col2) ELSE 
(null) END (type: decimal(7,2)), CASE WHEN (_col10) THEN (_col2) ELSE (null) 
END (type: decimal(7,2)), CASE WHEN (_col11) THEN (_col2) ELSE (null) END 
(type: decimal(7,2))
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
                   Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
@@ -403,7 +403,7 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col1 (type: int)
+                  1 _col0 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
                 Statistics: Num rows: 348477374 Data size: 30742775095 Basic 
stats: COMPLETE Column stats: NONE
                 Map Join Operator
@@ -412,28 +412,28 @@ STAGE PLANS:
                   keys:
                     0 _col1 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col12, _col13
+                  outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col11, _col12
                   input vertices:
                     1 Map 9
                   Statistics: Num rows: 383325119 Data size: 33817053337 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col12 (type: string), _col0 (type: int)
+                    key expressions: _col11 (type: string), _col0 (type: int)
                     sort order: ++
-                    Map-reduce partition columns: _col12 (type: string), _col0 
(type: int)
+                    Map-reduce partition columns: _col11 (type: string), _col0 
(type: int)
                     Statistics: Num rows: 383325119 Data size: 33817053337 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col2 (type: decimal(17,2)), _col3 
(type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: 
decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: decimal(17,2)), _col8 
(type: decimal(17,2)), _col13 (type: string)
+                    value expressions: _col2 (type: decimal(17,2)), _col3 
(type: decimal(17,2)), _col4 (type: decimal(17,2)), _col5 (type: 
decimal(17,2)), _col6 (type: decimal(17,2)), _col7 (type: decimal(17,2)), _col8 
(type: decimal(17,2)), _col12 (type: string)
         Reducer 5 
             Reduce Operator Tree:
               Join Operator
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 _col12 (type: string), _col0 (type: int)
+                  0 _col11 (type: string), _col0 (type: int)
                   1 _col1 (type: string), (_col0 - 52) (type: int)
-                outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col12, _col13, _col16, _col17, _col18, _col19, _col20, _col21
+                outputColumnNames: _col0, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col11, _col12, _col15, _col16, _col17, _col18, _col19, _col20
                 Statistics: Num rows: 421657640 Data size: 37198759476 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col13 (type: string), _col12 (type: string), 
_col0 (type: int), (_col2 / _col16) (type: decimal(37,20)), (_col3 / _col17) 
(type: decimal(37,20)), (_col4 / _col4) (type: decimal(37,20)), (_col5 / 
_col18) (type: decimal(37,20)), (_col6 / _col19) (type: decimal(37,20)), (_col7 
/ _col20) (type: decimal(37,20)), (_col8 / _col21) (type: decimal(37,20))
+                  expressions: _col12 (type: string), _col11 (type: string), 
_col0 (type: int), (_col2 / _col15) (type: decimal(37,20)), (_col3 / _col16) 
(type: decimal(37,20)), (_col4 / _col4) (type: decimal(37,20)), (_col5 / 
_col17) (type: decimal(37,20)), (_col6 / _col18) (type: decimal(37,20)), (_col7 
/ _col19) (type: decimal(37,20)), (_col8 / _col20) (type: decimal(37,20))
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
                   Statistics: Num rows: 421657640 Data size: 37198759476 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query6.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query6.q.out
index 454d5d6..2702aef 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query6.q.out
@@ -326,7 +326,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 231000 Data size: 331780228 Basic stats: 
COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: (_col1 / _col2) (type: decimal(37,22)), _col0 
(type: string)
+                  expressions: _col0 (type: string), (1.2 * CAST( (_col1 / 
_col2) AS decimal(16,6))) (type: decimal(19,7))
                   outputColumnNames: _col0, _col1
                   Statistics: Num rows: 231000 Data size: 331780228 Basic 
stats: COMPLETE Column stats: NONE
                   Map Join Operator
@@ -340,23 +340,23 @@ STAGE PLANS:
                       1 Reducer 19
                     Statistics: Num rows: 231000 Data size: 333859228 Basic 
stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
-                      key expressions: _col1 (type: string)
+                      key expressions: _col0 (type: string)
                       sort order: +
-                      Map-reduce partition columns: _col1 (type: string)
+                      Map-reduce partition columns: _col0 (type: string)
                       Statistics: Num rows: 231000 Data size: 333859228 Basic 
stats: COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: decimal(37,22))
+                      value expressions: _col1 (type: decimal(19,7))
         Reducer 16 
             Reduce Operator Tree:
               Join Operator
                 condition map:
                      Inner Join 0 to 1
                 keys:
-                  0 _col1 (type: string)
+                  0 _col0 (type: string)
                   1 _col2 (type: string)
-                outputColumnNames: _col0, _col3, _col4
+                outputColumnNames: _col1, _col3, _col4
                 Statistics: Num rows: 508200 Data size: 729916518 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col4 > (1.2 * CAST( _col0 AS decimal(16,6)))) 
(type: boolean)
+                  predicate: (_col4 > _col1) (type: boolean)
                   Statistics: Num rows: 169400 Data size: 243305506 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col3 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query60.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query60.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query60.q.out
index 919393d..61e2e86 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query60.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query60.q.out
@@ -422,14 +422,14 @@ STAGE PLANS:
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col1 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col3, _col5
+                  outputColumnNames: _col2, _col4
                   Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col3 (type: int)
+                    key expressions: _col2 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col3 (type: int)
+                    Map-reduce partition columns: _col2 (type: int)
                     Statistics: Num rows: 696954748 Data size: 61485550191 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 15 
             Reduce Operator Tree:
               Join Operator
@@ -453,11 +453,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col4 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col3 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 383314495 Data size: 51908482889 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -531,14 +531,14 @@ STAGE PLANS:
                 Statistics: Num rows: 348467716 Data size: 47189528877 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col2 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col4, _col5
+                  outputColumnNames: _col3, _col4
                   Statistics: Num rows: 348467716 Data size: 47189528877 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col4 (type: int)
+                    key expressions: _col3 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col4 (type: int)
+                    Map-reduce partition columns: _col3 (type: int)
                     Statistics: Num rows: 348467716 Data size: 47189528877 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 26 
             Reduce Operator Tree:
               Join Operator
@@ -562,11 +562,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col3 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col2 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 191667562 Data size: 26061245514 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -606,11 +606,11 @@ STAGE PLANS:
                      Inner Join 0 to 1
                 keys:
                   0 _col0 (type: int)
-                  1 _col3 (type: int)
-                outputColumnNames: _col1, _col8
+                  1 _col2 (type: int)
+                outputColumnNames: _col1, _col7
                 Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   keys: _col1 (type: string)
                   mode: hash
                   outputColumnNames: _col0, _col1
@@ -662,14 +662,14 @@ STAGE PLANS:
                 Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col1 (type: int), _col3 (type: decimal(7,2))
-                  outputColumnNames: _col3, _col5
+                  outputColumnNames: _col2, _col4
                   Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
-                    key expressions: _col3 (type: int)
+                    key expressions: _col2 (type: int)
                     sort order: +
-                    Map-reduce partition columns: _col3 (type: int)
+                    Map-reduce partition columns: _col2 (type: int)
                     Statistics: Num rows: 174243235 Data size: 23692040863 
Basic stats: COMPLETE Column stats: NONE
-                    value expressions: _col5 (type: decimal(7,2))
+                    value expressions: _col4 (type: decimal(7,2))
         Reducer 4 
             Execution mode: vectorized
             Reduce Operator Tree:

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query61.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query61.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query61.q.out
index 66e2c14..5aad596 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query61.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query61.q.out
@@ -264,10 +264,10 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col2 (type: int)
-                outputColumnNames: _col8
+                outputColumnNames: _col7
                 Statistics: Num rows: 843315281 Data size: 74397518956 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col8)
+                  aggregations: sum(_col7)
                   mode: hash
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE 
Column stats: NONE
@@ -510,10 +510,10 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col2 (type: int)
-                outputColumnNames: _col9
+                outputColumnNames: _col8
                 Statistics: Num rows: 927646829 Data size: 81837272625 Basic 
stats: COMPLETE Column stats: NONE
                 Group By Operator
-                  aggregations: sum(_col9)
+                  aggregations: sum(_col8)
                   mode: hash
                   outputColumnNames: _col0
                   Statistics: Num rows: 1 Data size: 112 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query63.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query63.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query63.q.out
index 1288b30..2d905d3 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query63.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query63.q.out
@@ -135,14 +135,14 @@ STAGE PLANS:
                     Statistics: Num rows: 462000 Data size: 663560457 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: i_item_sk (type: int), i_manager_id (type: 
int)
-                      outputColumnNames: _col0, _col4
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 462000 Data size: 663560457 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 462000 Data size: 663560457 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col4 (type: int)
+                        value expressions: _col1 (type: int)
             Execution mode: vectorized
         Map 7 
             Map Operator Tree:
@@ -155,14 +155,14 @@ STAGE PLANS:
                     Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int), d_moy (type: int)
-                      outputColumnNames: _col0, _col2
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 73049 Data size: 81741831 Basic 
stats: COMPLETE Column stats: NONE
-                        value expressions: _col2 (type: int)
+                        value expressions: _col1 (type: int)
             Execution mode: vectorized
         Reducer 2 
             Reduce Operator Tree:
@@ -172,14 +172,14 @@ STAGE PLANS:
                 keys:
                   0 _col1 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col0, _col2, _col3, _col8
+                outputColumnNames: _col0, _col2, _col3, _col5
                 Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: int)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: int)
                   Statistics: Num rows: 633595212 Data size: 55895953508 Basic 
stats: COMPLETE Column stats: NONE
-                  value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2)), _col8 (type: int)
+                  value expressions: _col2 (type: int), _col3 (type: 
decimal(7,2)), _col5 (type: int)
         Reducer 3 
             Local Work:
               Map Reduce Local Work
@@ -190,7 +190,7 @@ STAGE PLANS:
                 keys:
                   0 _col0 (type: int)
                   1 _col0 (type: int)
-                outputColumnNames: _col2, _col3, _col8, _col11
+                outputColumnNames: _col2, _col3, _col5, _col7
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Map Join Operator
                   condition map:
@@ -198,13 +198,13 @@ STAGE PLANS:
                   keys:
                     0 _col2 (type: int)
                     1 _col0 (type: int)
-                  outputColumnNames: _col3, _col8, _col11
+                  outputColumnNames: _col3, _col5, _col7
                   input vertices:
                     1 Map 8
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col3)
-                    keys: _col8 (type: int), _col11 (type: int)
+                    keys: _col5 (type: int), _col7 (type: int)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 766650239 Data size: 67634106676 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/55887646/ql/src/test/results/clientpositive/perf/spark/query65.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query65.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query65.q.out
index ca18202..7b68044 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query65.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query65.q.out
@@ -219,7 +219,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2
                     Statistics: Num rows: 158398803 Data size: 13973988377 
Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: int), (_col1 / _col2) (type: 
decimal(38,13))
+                      expressions: _col0 (type: int), (0.1 * (_col1 / _col2)) 
(type: decimal(38,12))
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 158398803 Data size: 13973988377 
Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
@@ -227,7 +227,7 @@ STAGE PLANS:
                         sort order: +
                         Map-reduce partition columns: _col0 (type: int)
                         Statistics: Num rows: 158398803 Data size: 13973988377 
Basic stats: COMPLETE Column stats: NONE
-                        value expressions: _col1 (type: decimal(38,13))
+                        value expressions: _col1 (type: decimal(38,12))
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -278,7 +278,7 @@ STAGE PLANS:
                 outputColumnNames: _col1, _col2, _col4, _col6
                 Statistics: Num rows: 696954748 Data size: 61485550191 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col2 <= (0.1 * _col4)) (type: boolean)
+                  predicate: (_col2 <= _col4) (type: boolean)
                   Statistics: Num rows: 232318249 Data size: 20495183367 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col1 (type: int)

Reply via email to