http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query67.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query67.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query67.q.out
index b0fc41c..26f6775 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query67.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query67.q.out
@@ -221,7 +221,7 @@ STAGE PLANS:
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col8)
-                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), 
_col6 (type: int), _col7 (type: string), 0 (type: bigint)
+                    keys: _col0 (type: string), _col1 (type: string), _col2 
(type: string), _col3 (type: string), _col4 (type: int), _col5 (type: int), 
_col6 (type: int), _col7 (type: string), 0L (type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9
                     Statistics: Num rows: 6899852151 Data size: 608706960084 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query70.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query70.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query70.q.out
index 7ebb776..df07790 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query70.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query70.q.out
@@ -339,7 +339,7 @@ STAGE PLANS:
                   Statistics: Num rows: 766650239 Data size: 67634106676 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 2299950717 Data size: 202902320028 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query72.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query72.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query72.q.out
index ea43033..d204803 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query72.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query72.q.out
@@ -358,7 +358,7 @@ STAGE PLANS:
                 outputColumnNames: _col4, _col6, _col7, _col9, _col10, _col16, 
_col18, _col20
                 Statistics: Num rows: 510191624 Data size: 69090195216 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (UDFToDouble(_col20) > (UDFToDouble(_col9) + 
5.0)) (type: boolean)
+                  predicate: (UDFToDouble(_col20) > (UDFToDouble(_col9) + 
5.0D)) (type: boolean)
                   Statistics: Num rows: 170063874 Data size: 23030064981 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col18 (type: string), _col4 (type: int), 
_col6 (type: int), _col7 (type: int), _col10 (type: int), _col16 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query73.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query73.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query73.q.out
index b25a16e..7fec0e1 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query73.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query73.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
                   alias: household_demographics
                   Statistics: Num rows: 7200 Data size: 770400 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((hd_buy_potential = '>10000') or 
(hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and CASE WHEN 
((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.0)) ELSE (null) END and hd_demo_sk is not 
null) (type: boolean)
+                    predicate: (((hd_buy_potential = '>10000') or 
(hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and CASE WHEN 
((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (null) END and hd_demo_sk is not 
null) (type: boolean)
                     Statistics: Num rows: 1200 Data size: 128400 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: hd_demo_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query77.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query77.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query77.q.out
index 9a77a7b..638bbd9 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query77.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query77.q.out
@@ -279,7 +279,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -355,7 +355,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -456,7 +456,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -545,7 +545,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -562,7 +562,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -665,7 +665,7 @@ STAGE PLANS:
                     Statistics: Num rows: 158394413 Data size: 57088528313 
Basic stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: sum(_col2), sum(_col3), sum(_col4)
-                      keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
+                      keys: _col0 (type: string), _col1 (type: int), 0L (type: 
bigint)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5
                       Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
@@ -771,7 +771,7 @@ STAGE PLANS:
                   Statistics: Num rows: 95833780 Data size: 13030622681 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: int), 0L (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE
@@ -857,7 +857,7 @@ STAGE PLANS:
                   Statistics: Num rows: 383325119 Data size: 33817053337 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: int), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: int), 0L (type: 
bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 1912659936 Data size: 311808612993 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query8.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query8.q.out
index 13cd0f4..583abbc 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query8.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query8.q.out
@@ -319,7 +319,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 22000000 Data size: 22327357890 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 > 10) (type: boolean)
+                  predicate: (_col1 > 10L) (type: boolean)
                   Statistics: Num rows: 7333333 Data size: 7442452291 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: substr(_col0, 1, 5) (type: string)
@@ -388,7 +388,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 6833333 Data size: 6935012229 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (_col1 = 2) (type: boolean)
+                  predicate: (_col1 = 2L) (type: boolean)
                   Statistics: Num rows: 1 Data size: 1014 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query80.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query80.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query80.q.out
index ee769f9..9b008eb 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query80.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query80.q.out
@@ -250,7 +250,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -296,7 +296,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -360,7 +360,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-08-04 
00:00:00.0 AND 1998-09-03 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -646,7 +646,7 @@ STAGE PLANS:
                   Statistics: Num rows: 231905279 Data size: 31404633508 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
@@ -775,7 +775,7 @@ STAGE PLANS:
                   Statistics: Num rows: 115958879 Data size: 15767054151 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE
@@ -848,7 +848,7 @@ STAGE PLANS:
                   Statistics: Num rows: 463823414 Data size: 40918636268 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2), sum(_col3), sum(_col4)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                     Statistics: Num rows: 2435062716 Data size: 264270971781 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query82.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query82.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query82.q.out
index b45f8d0..fb30019 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query82.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query82.q.out
@@ -46,7 +46,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 2002-05-30 
00:00:00.0 AND 2002-07-29 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'2002-05-30 00:00:00.0' AND TIMESTAMP'2002-07-29 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query83.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query83.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query83.q.out
index dc04bca..614ae49 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query83.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query83.q.out
@@ -737,7 +737,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col3, _col5
                 Statistics: Num rows: 76653825 Data size: 5939181706 Basic 
stats: COMPLETE Column stats: NONE
                 Select Operator
-                  expressions: _col0 (type: string), _col3 (type: bigint), 
(((UDFToDouble(_col3) / UDFToDouble(((_col3 + _col1) + _col5))) / 3.0) * 100.0) 
(type: double), _col1 (type: bigint), (((UDFToDouble(_col1) / 
UDFToDouble(((_col3 + _col1) + _col5))) / 3.0) * 100.0) (type: double), _col5 
(type: bigint), (((UDFToDouble(_col5) / UDFToDouble(((_col3 + _col1) + _col5))) 
/ 3.0) * 100.0) (type: double), (CAST( ((_col3 + _col1) + _col5) AS 
decimal(19,0)) / 3) (type: decimal(25,6))
+                  expressions: _col0 (type: string), _col3 (type: bigint), 
(((UDFToDouble(_col3) / UDFToDouble(((_col3 + _col1) + _col5))) / 3.0D) * 
100.0D) (type: double), _col1 (type: bigint), (((UDFToDouble(_col1) / 
UDFToDouble(((_col3 + _col1) + _col5))) / 3.0D) * 100.0D) (type: double), _col5 
(type: bigint), (((UDFToDouble(_col5) / UDFToDouble(((_col3 + _col1) + _col5))) 
/ 3.0D) * 100.0D) (type: double), (CAST( ((_col3 + _col1) + _col5) AS 
decimal(19,0)) / 3) (type: decimal(25,6))
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
                   Statistics: Num rows: 76653825 Data size: 5939181706 Basic 
stats: COMPLETE Column stats: NONE
                   Reduce Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query86.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query86.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query86.q.out
index 80a24d3..ddd9771 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query86.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query86.q.out
@@ -150,7 +150,7 @@ STAGE PLANS:
                   Statistics: Num rows: 174243235 Data size: 23692040863 Basic 
stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: sum(_col2)
-                    keys: _col0 (type: string), _col1 (type: string), 0 (type: 
bigint)
+                    keys: _col0 (type: string), _col1 (type: string), 0L 
(type: bigint)
                     mode: hash
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 522729705 Data size: 71076122589 
Basic stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query87.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query87.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query87.q.out
index 5fe3e48..7977a62 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query87.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query87.q.out
@@ -277,7 +277,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 87116929 Data size: 11797382219 
Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 1 (type: bigint), _col3 (type: bigint)
+                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 1L (type: bigint), _col3 (type: bigint)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 87116929 Data size: 11797382219 
Basic stats: COMPLETE Column stats: NONE
                       Select Operator
@@ -334,7 +334,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 43560808 Data size: 5923010113 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 1 (type: bigint), _col3 (type: bigint)
+                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 1L (type: bigint), _col3 (type: bigint)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 43560808 Data size: 5923010113 
Basic stats: COMPLETE Column stats: NONE
                       Select Operator
@@ -391,7 +391,7 @@ STAGE PLANS:
                     outputColumnNames: _col0, _col1, _col2, _col3
                     Statistics: Num rows: 174238687 Data size: 15371387547 
Basic stats: COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 2 (type: bigint), _col3 (type: bigint)
+                      expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string), 2L (type: bigint), _col3 (type: bigint)
                       outputColumnNames: _col0, _col1, _col2, _col3, _col4
                       Statistics: Num rows: 174238687 Data size: 15371387547 
Basic stats: COMPLETE Column stats: NONE
                       Select Operator
@@ -419,7 +419,7 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 130677808 Data size: 13584384883 Basic 
stats: COMPLETE Column stats: NONE
                 Filter Operator
-                  predicate: (((_col3 * 2) = _col4) and (_col3 > 0)) (type: 
boolean)
+                  predicate: (((_col3 * 2) = _col4) and (_col3 > 0L)) (type: 
boolean)
                   Statistics: Num rows: 21779634 Data size: 2264064077 Basic 
stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: string)
@@ -432,7 +432,7 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 10889817 Data size: 1132032038 
Basic stats: COMPLETE Column stats: NONE
                       Select Operator
-                        expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), 2 (type: bigint), _col3 (type: bigint)
+                        expressions: _col0 (type: string), _col1 (type: 
string), _col2 (type: string), 2L (type: bigint), _col3 (type: bigint)
                         outputColumnNames: _col0, _col1, _col2, _col3, _col4
                         Statistics: Num rows: 10889817 Data size: 1132032038 
Basic stats: COMPLETE Column stats: NONE
                         Select Operator
@@ -464,7 +464,7 @@ STAGE PLANS:
                   outputColumnNames: _col3, _col4
                   Statistics: Num rows: 27225312 Data size: 3527521010 Basic 
stats: COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((_col3 * 2) = _col4) and (_col3 > 0)) (type: 
boolean)
+                    predicate: (((_col3 * 2) = _col4) and (_col3 > 0L)) (type: 
boolean)
                     Statistics: Num rows: 4537552 Data size: 587920168 Basic 
stats: COMPLETE Column stats: NONE
                     Select Operator
                       Statistics: Num rows: 4537552 Data size: 587920168 Basic 
stats: COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query9.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query9.q.out
index 4ec2007..49c6b7f 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query9.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query9.q.out
@@ -803,7 +803,7 @@ STAGE PLANS:
                                                       1 Reducer 31
                                                     Statistics: Num rows: 36 
Data size: 112860 Basic stats: COMPLETE Column stats: NONE
                                                     Select Operator
-                                                      expressions: CASE WHEN 
((_col1 > 409437)) THEN (_col2) ELSE (_col3) END (type: decimal(11,6)), CASE 
WHEN ((_col4 > 4595804)) THEN (_col5) ELSE (_col6) END (type: decimal(11,6)), 
CASE WHEN ((_col7 > 7887297)) THEN (_col8) ELSE (_col9) END (type: 
decimal(11,6)), CASE WHEN ((_col10 > 10872978)) THEN (_col11) ELSE (_col12) END 
(type: decimal(11,6)), CASE WHEN ((_col13 > 43571537)) THEN (_col14) ELSE 
(_col15) END (type: decimal(11,6))
+                                                      expressions: CASE WHEN 
((_col1 > 409437L)) THEN (_col2) ELSE (_col3) END (type: decimal(11,6)), CASE 
WHEN ((_col4 > 4595804L)) THEN (_col5) ELSE (_col6) END (type: decimal(11,6)), 
CASE WHEN ((_col7 > 7887297L)) THEN (_col8) ELSE (_col9) END (type: 
decimal(11,6)), CASE WHEN ((_col10 > 10872978L)) THEN (_col11) ELSE (_col12) 
END (type: decimal(11,6)), CASE WHEN ((_col13 > 43571537L)) THEN (_col14) ELSE 
(_col15) END (type: decimal(11,6))
                                                       outputColumnNames: 
_col0, _col1, _col2, _col3, _col4
                                                       Statistics: Num rows: 36 
Data size: 112860 Basic stats: COMPLETE Column stats: NONE
                                                       File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query92.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query92.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query92.q.out
index 677a85c..1b73ab5 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query92.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query92.q.out
@@ -73,7 +73,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-03-18 
00:00:00.0 AND 1998-06-16 01:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-03-18 00:00:00.0' AND TIMESTAMP'1998-06-16 01:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)
@@ -96,7 +96,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1998-03-18 
00:00:00.0 AND 1998-06-16 01:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-03-18 00:00:00.0' AND TIMESTAMP'1998-06-16 01:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query94.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query94.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query94.q.out
index 39c4476a..2af8280 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query94.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query94.q.out
@@ -94,7 +94,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1999-05-01 
00:00:00.0 AND 1999-06-30 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1999-05-01 00:00:00.0' AND TIMESTAMP'1999-06-30 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query95.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query95.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query95.q.out
index 0d136b6..72bb8af 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query95.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query95.q.out
@@ -100,7 +100,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 1999-05-01 
00:00:00.0 AND 1999-06-30 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1999-05-01 00:00:00.0' AND TIMESTAMP'1999-06-30 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/spark/query98.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/spark/query98.q.out 
b/ql/src/test/results/clientpositive/perf/spark/query98.q.out
index 24d7de8..5264bc0 100644
--- a/ql/src/test/results/clientpositive/perf/spark/query98.q.out
+++ b/ql/src/test/results/clientpositive/perf/spark/query98.q.out
@@ -76,7 +76,7 @@ STAGE PLANS:
                   alias: date_dim
                   Statistics: Num rows: 73049 Data size: 81741831 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 2001-01-12 
00:00:00.0 AND 2001-02-11 00:00:00.0 and d_date_sk is not null) (type: boolean)
+                    predicate: (CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'2001-01-12 00:00:00.0' AND TIMESTAMP'2001-02-11 00:00:00.0' and 
d_date_sk is not null) (type: boolean)
                     Statistics: Num rows: 8116 Data size: 9081804 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: d_date_sk (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query12.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query12.q.out
index 0506eca..fe18e03 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query12.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query12.q.out
@@ -132,7 +132,7 @@ Stage-0
                                       Select Operator [SEL_5] (rows=8116 
width=1119)
                                         Output:["_col0"]
                                         Filter Operator [FIL_36] (rows=8116 
width=1119)
-                                          predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 2001-01-12 00:00:00.0 AND 2001-02-11 00:00:00.0 and 
d_date_sk is not null)
+                                          predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00.0' AND TIMESTAMP'2001-02-11 
00:00:00.0' and d_date_sk is not null)
                                           TableScan [TS_3] (rows=73049 
width=1119)
                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query14.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query14.q.out
index ef44cdb..1cffcb0 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query14.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query14.q.out
@@ -297,7 +297,7 @@ Stage-0
                     Reduce Output Operator [RS_568]
                       PartitionCols:_col0, _col1, _col2, _col3, _col4
                       Group By Operator [GBY_567] (rows=2032776160 width=405)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0L
                         Select Operator [SEL_375] (rows=116155905 width=432)
                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                           Filter Operator [FIL_374] (rows=116155905 width=432)
@@ -544,7 +544,7 @@ Stage-0
                                                       Select Operator 
[SEL_348] (rows=1 width=108)
                                                         
Output:["_col0","_col1","_col2"]
                                                         Filter Operator 
[FIL_347] (rows=1 width=108)
-                                                          predicate:(_col3 = 3)
+                                                          predicate:(_col3 = 
3L)
                                                           Group By Operator 
[GBY_346] (rows=304916424 width=108)
                                                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                                           <-Union 71 
[SIMPLE_EDGE]
@@ -672,7 +672,7 @@ Stage-0
                     Reduce Output Operator [RS_568]
                       PartitionCols:_col0, _col1, _col2, _col3, _col4
                       Group By Operator [GBY_567] (rows=2032776160 width=405)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0L
                         Select Operator [SEL_564] (rows=58081078 width=432)
                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                           Filter Operator [FIL_563] (rows=58081078 width=432)
@@ -868,7 +868,7 @@ Stage-0
                                                       Select Operator 
[SEL_537] (rows=1 width=108)
                                                         
Output:["_col0","_col1","_col2"]
                                                         Filter Operator 
[FIL_536] (rows=1 width=108)
-                                                          predicate:(_col3 = 3)
+                                                          predicate:(_col3 = 
3L)
                                                           Group By Operator 
[GBY_535] (rows=304916424 width=108)
                                                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                                           <-Union 74 
[SIMPLE_EDGE]
@@ -909,7 +909,7 @@ Stage-0
                     Reduce Output Operator [RS_568]
                       PartitionCols:_col0, _col1, _col2, _col3, _col4
                       Group By Operator [GBY_567] (rows=2032776160 width=405)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["sum(_col4)","sum(_col5)"],keys:_col0,
 _col1, _col2, _col3, 0L
                         Select Operator [SEL_187] (rows=232318249 width=385)
                           
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                           Filter Operator [FIL_186] (rows=232318249 width=385)
@@ -1105,7 +1105,7 @@ Stage-0
                                                       Select Operator 
[SEL_160] (rows=1 width=108)
                                                         
Output:["_col0","_col1","_col2"]
                                                         Filter Operator 
[FIL_159] (rows=1 width=108)
-                                                          predicate:(_col3 = 3)
+                                                          predicate:(_col3 = 
3L)
                                                           Group By Operator 
[GBY_158] (rows=304916424 width=108)
                                                             
Output:["_col0","_col1","_col2","_col3"],aggregations:["count(VALUE._col0)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                                           <-Union 61 
[SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query16.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query16.q.out
index 1c05391..45c70fc 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query16.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query16.q.out
@@ -186,7 +186,7 @@ Stage-0
                                                       Select Operator [SEL_5] 
(rows=8116 width=1119)
                                                         Output:["_col0"]
                                                         Filter Operator 
[FIL_68] (rows=8116 width=1119)
-                                                          predicate:(CAST( 
d_date AS TIMESTAMP) BETWEEN 2001-04-01 00:00:00.0 AND 2001-05-31 01:00:00.0 
and d_date_sk is not null)
+                                                          predicate:(CAST( 
d_date AS TIMESTAMP) BETWEEN TIMESTAMP'2001-04-01 00:00:00.0' AND 
TIMESTAMP'2001-05-31 01:00:00.0' and d_date_sk is not null)
                                                           TableScan [TS_3] 
(rows=73049 width=1119)
                                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query18.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query18.q.out
index 1f0ec90..adb9682 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query18.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query18.q.out
@@ -96,7 +96,7 @@ Stage-0
                   SHUFFLE [RS_43]
                     PartitionCols:_col0, _col1, _col2, _col3, _col4
                     Group By Operator [GBY_42] (rows=2108229765 width=135)
-                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["avg(_col4)","avg(_col5)","avg(_col6)","avg(_col7)","avg(_col8)","avg(_col9)","avg(_col10)"],keys:_col0,
 _col1, _col2, _col3, 0
+                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["avg(_col4)","avg(_col5)","avg(_col6)","avg(_col7)","avg(_col8)","avg(_col9)","avg(_col10)"],keys:_col0,
 _col1, _col2, _col3, 0L
                       Select Operator [SEL_40] (rows=421645953 width=135)
                         
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10"]
                         Merge Join Operator [MERGEJOIN_83] (rows=421645953 
width=135)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query20.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query20.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query20.q.out
index c07141b..7aee675 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query20.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query20.q.out
@@ -124,7 +124,7 @@ Stage-0
                                       Select Operator [SEL_5] (rows=8116 
width=1119)
                                         Output:["_col0"]
                                         Filter Operator [FIL_36] (rows=8116 
width=1119)
-                                          predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 2001-01-12 00:00:00.0 AND 2001-02-11 00:00:00.0 and 
d_date_sk is not null)
+                                          predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN TIMESTAMP'2001-01-12 00:00:00.0' AND TIMESTAMP'2001-02-11 
00:00:00.0' and d_date_sk is not null)
                                           TableScan [TS_3] (rows=73049 
width=1119)
                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query21.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query21.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query21.q.out
index aed0990..87f4d74 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query21.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query21.q.out
@@ -78,7 +78,7 @@ Stage-0
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_28]
               Filter Operator [FIL_26] (rows=12506076 width=15)
-                predicate:CASE WHEN ((_col2 > 0)) THEN ((UDFToDouble(_col3) / 
UDFToDouble(_col2)) BETWEEN 0.666667 AND 1.5) ELSE (null) END
+                predicate:CASE WHEN ((_col2 > 0L)) THEN ((UDFToDouble(_col3) / 
UDFToDouble(_col2)) BETWEEN 0.666667D AND 1.5D) ELSE (null) END
                 Group By Operator [GBY_25] (rows=25012152 width=15)
                   
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0,
 KEY._col1
                 <-Reducer 4 [SIMPLE_EDGE]
@@ -133,7 +133,7 @@ Stage-0
                                     Select Operator [SEL_5] (rows=8116 
width=1119)
                                       Output:["_col0","_col1"]
                                       Filter Operator [FIL_42] (rows=8116 
width=1119)
-                                        predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN 1998-03-08 23:00:00.0 AND 1998-05-08 00:00:00.0 and d_date_sk is not 
null)
+                                        predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN TIMESTAMP'1998-03-08 23:00:00.0' AND TIMESTAMP'1998-05-08 00:00:00.0' 
and d_date_sk is not null)
                                         TableScan [TS_3] (rows=73049 
width=1119)
                                           
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query22.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query22.q.out
index d13169c..efc87ed 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query22.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query22.q.out
@@ -69,7 +69,7 @@ Stage-0
                   SHUFFLE [RS_23]
                     PartitionCols:_col0, _col1, _col2, _col3, _col4
                     Group By Operator [GBY_22] (rows=250121525 width=15)
-                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col3)"],keys:_col8,
 _col9, _col10, _col11, 0
+                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["avg(_col3)"],keys:_col8,
 _col9, _col10, _col11, 0L
                       Merge Join Operator [MERGEJOIN_45] (rows=50024305 
width=15)
                         
Conds:RS_18._col1=RS_19._col0(Inner),Output:["_col3","_col8","_col9","_col10","_col11"]
                       <-Map 9 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query23.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query23.q.out
index c7a5041..14d3c40 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query23.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query23.q.out
@@ -293,7 +293,7 @@ Stage-0
                               Select Operator [SEL_27] (rows=116159124 
width=88)
                                 Output:["_col1"]
                                 Filter Operator [FIL_26] (rows=116159124 
width=88)
-                                  predicate:(_col3 > 4)
+                                  predicate:(_col3 > 4L)
                                   Select Operator [SEL_347] (rows=348477374 
width=88)
                                     Output:["_col0","_col3"]
                                     Group By Operator [GBY_25] (rows=348477374 
width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query27.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query27.q.out
index c6a1905..adb1bb7 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query27.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query27.q.out
@@ -72,7 +72,7 @@ Stage-0
                   SHUFFLE [RS_30]
                     PartitionCols:_col0, _col1, _col2
                     Group By Operator [GBY_29] (rows=2529945843 width=88)
-                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["avg(_col2)","avg(_col3)","avg(_col4)","avg(_col5)"],keys:_col0,
 _col1, 0
+                      
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"],aggregations:["avg(_col2)","avg(_col3)","avg(_col4)","avg(_col5)"],keys:_col0,
 _col1, 0L
                       Select Operator [SEL_27] (rows=843315281 width=88)
                         
Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                         Merge Join Operator [MERGEJOIN_59] (rows=843315281 
width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query32.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query32.q.out
index 3ad9595..adb4377 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query32.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query32.q.out
@@ -101,7 +101,7 @@ Stage-0
                             Select Operator [SEL_5] (rows=8116 width=1119)
                               Output:["_col0"]
                               Filter Operator [FIL_54] (rows=8116 width=1119)
-                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
1998-03-18 00:00:00.0 AND 1998-06-16 01:00:00.0 and d_date_sk is not null)
+                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'1998-03-18 00:00:00.0' AND TIMESTAMP'1998-06-16 01:00:00.0' and 
d_date_sk is not null)
                                 TableScan [TS_3] (rows=73049 width=1119)
                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                     <-Reducer 6 [ONE_TO_ONE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query34.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query34.q.out
index c85b4d0..54b8e5a 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query34.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query34.q.out
@@ -127,7 +127,7 @@ Stage-0
                                     Select Operator [SEL_11] (rows=1200 
width=107)
                                       Output:["_col0"]
                                       Filter Operator [FIL_55] (rows=1200 
width=107)
-                                        predicate:(((hd_buy_potential = 
'>10000') or (hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and 
CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.2)) ELSE (null) END and hd_demo_sk is not 
null)
+                                        predicate:(((hd_buy_potential = 
'>10000') or (hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and 
CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.2D)) ELSE (null) END and hd_demo_sk is not 
null)
                                         TableScan [TS_9] (rows=7200 width=107)
                                           
default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"]
                                 <-Reducer 5 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query36.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query36.q.out
index a30ac2e..41bcba6 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query36.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query36.q.out
@@ -95,7 +95,7 @@ Stage-0
                           SHUFFLE [RS_24]
                             PartitionCols:_col0, _col1, _col2
                             Group By Operator [GBY_23] (rows=2299950717 
width=88)
-                              
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col2)","sum(_col3)"],keys:_col0,
 _col1, 0
+                              
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(_col2)","sum(_col3)"],keys:_col0,
 _col1, 0L
                               Select Operator [SEL_21] (rows=766650239 
width=88)
                                 Output:["_col0","_col1","_col2","_col3"]
                                 Merge Join Operator [MERGEJOIN_52] 
(rows=766650239 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query37.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query37.q.out
index d5af964..8284990 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query37.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query37.q.out
@@ -97,7 +97,7 @@ Stage-0
                             Select Operator [SEL_11] (rows=8116 width=1119)
                               Output:["_col0"]
                               Filter Operator [FIL_42] (rows=8116 width=1119)
-                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
2001-06-02 00:00:00.0 AND 2001-08-01 00:00:00.0 and d_date_sk is not null)
+                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'2001-06-02 00:00:00.0' AND TIMESTAMP'2001-08-01 00:00:00.0' and 
d_date_sk is not null)
                                 TableScan [TS_9] (rows=73049 width=1119)
                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query38.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query38.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query38.q.out
index 199bed7..e0aebc9 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query38.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query38.q.out
@@ -73,7 +73,7 @@ Stage-0
                 Output:["_col0"],aggregations:["count()"]
                 Select Operator [SEL_82] (rows=1 width=108)
                   Filter Operator [FIL_81] (rows=1 width=108)
-                    predicate:(_col3 = 3)
+                    predicate:(_col3 = 3L)
                     Select Operator [SEL_114] (rows=152458212 width=108)
                       Output:["_col3"]
                       Group By Operator [GBY_80] (rows=152458212 width=108)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query39.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query39.q.out
index 793e375..fdcd651 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query39.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query39.q.out
@@ -82,7 +82,7 @@ Stage-0
                 Select Operator [SEL_55] (rows=12506076 width=15)
                   Output:["_col0","_col1","_col2","_col3"]
                   Filter Operator [FIL_54] (rows=12506076 width=15)
-                    predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0)) END
+                    predicate:CASE WHEN ((_col4 = 0.0D)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0D)) END
                     Select Operator [SEL_53] (rows=25012152 width=15)
                       Output:["_col1","_col2","_col3","_col4"]
                       Group By Operator [GBY_52] (rows=25012152 width=15)
@@ -146,7 +146,7 @@ Stage-0
                 Select Operator [SEL_27] (rows=12506076 width=15)
                   Output:["_col0","_col1","_col2","_col3"]
                   Filter Operator [FIL_26] (rows=12506076 width=15)
-                    predicate:CASE WHEN ((_col4 = 0.0)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0)) END
+                    predicate:CASE WHEN ((_col4 = 0.0D)) THEN (false) ELSE 
(((_col3 / _col4) > 1.0D)) END
                     Select Operator [SEL_25] (rows=25012152 width=15)
                       Output:["_col1","_col2","_col3","_col4"]
                       Group By Operator [GBY_24] (rows=25012152 width=15)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query40.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query40.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query40.q.out
index 604f741..b49668f 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query40.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query40.q.out
@@ -119,7 +119,7 @@ Stage-0
                                   Select Operator [SEL_8] (rows=8116 
width=1119)
                                     Output:["_col0","_col1"]
                                     Filter Operator [FIL_52] (rows=8116 
width=1119)
-                                      predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN 1998-03-08 23:00:00.0 AND 1998-05-08 00:00:00.0 and d_date_sk is not 
null)
+                                      predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN TIMESTAMP'1998-03-08 23:00:00.0' AND TIMESTAMP'1998-05-08 00:00:00.0' 
and d_date_sk is not null)
                                       TableScan [TS_6] (rows=73049 width=1119)
                                         
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                               <-Reducer 2 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query45.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query45.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query45.q.out
index 3efed2e..eee388f 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query45.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query45.q.out
@@ -73,7 +73,7 @@ Stage-0
                     Select Operator [SEL_51] (rows=191667562 width=152)
                       Output:["_col3","_col7","_col8"]
                       Filter Operator [FIL_50] (rows=191667562 width=152)
-                        predicate:((substr(_col8, 1, 5)) IN ('85669', '86197', 
'88274', '83405', '86475', '85392', '85460', '80348', '81792') or CASE WHEN 
((_col14 = 0)) THEN (false) WHEN (_col17 is not null) THEN (true) WHEN (_col13 
is null) THEN (null) WHEN ((_col15 < _col14)) THEN (null) ELSE (false) END)
+                        predicate:((substr(_col8, 1, 5)) IN ('85669', '86197', 
'88274', '83405', '86475', '85392', '85460', '80348', '81792') or CASE WHEN 
((_col14 = 0L)) THEN (false) WHEN (_col17 is not null) THEN (true) WHEN (_col13 
is null) THEN (null) WHEN ((_col15 < _col14)) THEN (null) ELSE (false) END)
                         Select Operator [SEL_49] (rows=191667562 width=152)
                           
Output:["_col3","_col7","_col8","_col13","_col14","_col15","_col17"]
                           Merge Join Operator [MERGEJOIN_87] (rows=191667562 
width=152)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query5.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query5.q.out
index ff197d2..eb4a8cf 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query5.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query5.q.out
@@ -294,7 +294,7 @@ Stage-0
                     Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_85] (rows=2273797803 width=110)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_49] (rows=191657181 width=132)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_48] (rows=191657181 width=132)
@@ -326,7 +326,7 @@ Stage-0
                                         Select Operator [SEL_10] (rows=8116 
width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_120] (rows=8116 
width=1119)
-                                            predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-08-18 00:00:00.0 and 
d_date_sk is not null)
+                                            predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-08-18 
00:00:00.0' and d_date_sk is not null)
                                             TableScan [TS_8] (rows=73049 
width=1119)
                                               
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                     <-Union 19 [SIMPLE_EDGE]
@@ -352,7 +352,7 @@ Stage-0
                     Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_85] (rows=2273797803 width=110)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_82] (rows=182955399 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_81] (rows=182955399 width=135)
@@ -421,7 +421,7 @@ Stage-0
                     Reduce Output Operator [RS_86]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_85] (rows=2273797803 width=110)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_24] (rows=383320021 width=87)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_23] (rows=383320021 width=87)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query6.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query6.q.out
index f1e4758..1cd69f7 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query6.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query6.q.out
@@ -79,7 +79,7 @@ Stage-0
           <-Reducer 6 [SIMPLE_EDGE]
             SHUFFLE [RS_73]
               Filter Operator [FIL_71] (rows=127775039 width=88)
-                predicate:(_col1 >= 10)
+                predicate:(_col1 >= 10L)
                 Group By Operator [GBY_70] (rows=383325119 width=88)
                   
Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                 <-Reducer 5 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query67.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query67.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query67.q.out
index 86c4d7c..113a443 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query67.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query67.q.out
@@ -125,7 +125,7 @@ Stage-0
                             SHUFFLE [RS_24]
                               PartitionCols:_col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8
                               Group By Operator [GBY_23] (rows=6899852151 
width=88)
-                                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"],aggregations:["sum(_col8)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6, _col7, 0
+                                
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"],aggregations:["sum(_col8)"],keys:_col0,
 _col1, _col2, _col3, _col4, _col5, _col6, _col7, 0L
                                 Select Operator [SEL_21] (rows=766650239 
width=88)
                                   
Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8"]
                                   Merge Join Operator [MERGEJOIN_54] 
(rows=766650239 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query70.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query70.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query70.q.out
index d5ad6e5..2b98ee8 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query70.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query70.q.out
@@ -114,7 +114,7 @@ Stage-0
                           SHUFFLE [RS_49]
                             PartitionCols:_col0, _col1, _col2
                             Group By Operator [GBY_48] (rows=2299950717 
width=88)
-                              
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col0,
 _col1, 0
+                              
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col0,
 _col1, 0L
                               Select Operator [SEL_46] (rows=766650239 
width=88)
                                 Output:["_col0","_col1","_col2"]
                                 Merge Join Operator [MERGEJOIN_89] 
(rows=766650239 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query72.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query72.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query72.q.out
index acab54f..0f953f3 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query72.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query72.q.out
@@ -135,7 +135,7 @@ Stage-0
                                       Select Operator [SEL_45] (rows=170063874 
width=135)
                                         
Output:["_col3","_col8","_col10","_col11","_col14","_col20"]
                                         Filter Operator [FIL_44] 
(rows=170063874 width=135)
-                                          predicate:(UDFToDouble(_col20) > 
(UDFToDouble(_col9) + 5.0))
+                                          predicate:(UDFToDouble(_col20) > 
(UDFToDouble(_col9) + 5.0D))
                                           Merge Join Operator [MERGEJOIN_138] 
(rows=510191624 width=135)
                                             
Conds:RS_41._col1=RS_42._col0(Inner),Output:["_col4","_col6","_col7","_col9","_col10","_col16","_col18","_col20"]
                                           <-Map 21 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query73.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query73.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query73.q.out
index f666e29..9d6312f 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query73.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query73.q.out
@@ -121,7 +121,7 @@ Stage-0
                                     Select Operator [SEL_11] (rows=1200 
width=107)
                                       Output:["_col0"]
                                       Filter Operator [FIL_55] (rows=1200 
width=107)
-                                        predicate:(((hd_buy_potential = 
'>10000') or (hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and 
CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.0)) ELSE (null) END and hd_demo_sk is not 
null)
+                                        predicate:(((hd_buy_potential = 
'>10000') or (hd_buy_potential = 'unknown')) and (hd_vehicle_count > 0) and 
CASE WHEN ((hd_vehicle_count > 0)) THEN (((UDFToDouble(hd_dep_count) / 
UDFToDouble(hd_vehicle_count)) > 1.0D)) ELSE (null) END and hd_demo_sk is not 
null)
                                         TableScan [TS_9] (rows=7200 width=107)
                                           
default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_buy_potential","hd_dep_count","hd_vehicle_count"]
                                 <-Reducer 5 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query77.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query77.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query77.q.out
index d10e226..8f64a29 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query77.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query77.q.out
@@ -257,7 +257,7 @@ Stage-0
                     Reduce Output Operator [RS_124]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_123] (rows=1912659936 width=163)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_75] (rows=158394413 width=360)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Merge Join Operator [MERGEJOIN_188] (rows=158394413 
width=360)
@@ -279,7 +279,7 @@ Stage-0
                                         Select Operator [SEL_5] (rows=8116 
width=1119)
                                           Output:["_col0"]
                                           Filter Operator [FIL_162] (rows=8116 
width=1119)
-                                            predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-09-03 00:00:00.0 and 
d_date_sk is not null)
+                                            predicate:(CAST( d_date AS 
TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 
00:00:00.0' and d_date_sk is not null)
                                             TableScan [TS_3] (rows=73049 
width=1119)
                                               
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                     <-Map 27 [SIMPLE_EDGE]
@@ -318,7 +318,7 @@ Stage-0
                     Reduce Output Operator [RS_124]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_123] (rows=1912659936 width=163)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_120] (rows=95833780 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Merge Join Operator [MERGEJOIN_189] (rows=95833780 
width=135)
@@ -400,7 +400,7 @@ Stage-0
                     Reduce Output Operator [RS_124]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_123] (rows=1912659936 width=163)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_43] (rows=383325119 width=88)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Merge Join Operator [MERGEJOIN_187] (rows=383325119 
width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query8.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query8.q.out
index 8660fc9..cc38f7f 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query8.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query8.q.out
@@ -267,7 +267,7 @@ Stage-0
                             Select Operator [SEL_41] (rows=1 width=1014)
                               Output:["_col0"]
                               Filter Operator [FIL_40] (rows=1 width=1014)
-                                predicate:(_col1 = 2)
+                                predicate:(_col1 = 2L)
                                 Group By Operator [GBY_39] (rows=6833333 
width=1014)
                                   
Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                 <-Union 9 [SIMPLE_EDGE]
@@ -286,7 +286,7 @@ Stage-0
                                               Select Operator [SEL_28] 
(rows=7333333 width=1014)
                                                 Output:["_col0"]
                                                 Filter Operator [FIL_27] 
(rows=7333333 width=1014)
-                                                  predicate:(_col1 > 10)
+                                                  predicate:(_col1 > 10L)
                                                   Group By Operator [GBY_26] 
(rows=22000000 width=1014)
                                                     
Output:["_col0","_col1"],aggregations:["count(VALUE._col0)"],keys:KEY._col0
                                                   <-Reducer 13 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query80.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query80.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query80.q.out
index a64cad7..7c46ef3 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query80.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query80.q.out
@@ -233,7 +233,7 @@ Stage-0
                     Reduce Output Operator [RS_121]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_120] (rows=2435062716 width=108)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_77] (rows=231905279 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_76] (rows=231905279 width=135)
@@ -295,7 +295,7 @@ Stage-0
                                                   Select Operator [SEL_8] 
(rows=8116 width=1119)
                                                     Output:["_col0"]
                                                     Filter Operator [FIL_187] 
(rows=8116 width=1119)
-                                                      predicate:(CAST( d_date 
AS TIMESTAMP) BETWEEN 1998-08-04 00:00:00.0 AND 1998-09-03 00:00:00.0 and 
d_date_sk is not null)
+                                                      predicate:(CAST( d_date 
AS TIMESTAMP) BETWEEN TIMESTAMP'1998-08-04 00:00:00.0' AND TIMESTAMP'1998-09-03 
00:00:00.0' and d_date_sk is not null)
                                                       TableScan [TS_6] 
(rows=73049 width=1119)
                                                         
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                                               <-Reducer 27 [SIMPLE_EDGE]
@@ -325,7 +325,7 @@ Stage-0
                     Reduce Output Operator [RS_121]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_120] (rows=2435062716 width=108)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_117] (rows=115958879 width=135)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_116] (rows=115958879 
width=135)
@@ -402,7 +402,7 @@ Stage-0
                     Reduce Output Operator [RS_121]
                       PartitionCols:_col0, _col1, _col2
                       Group By Operator [GBY_120] (rows=2435062716 width=108)
-                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0
+                        
Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col2)","sum(_col3)","sum(_col4)"],keys:_col0,
 _col1, 0L
                         Select Operator [SEL_38] (rows=463823414 width=88)
                           Output:["_col0","_col1","_col2","_col3","_col4"]
                           Group By Operator [GBY_37] (rows=463823414 width=88)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query82.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query82.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query82.q.out
index 037c2ff..abd8ca5 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query82.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query82.q.out
@@ -97,7 +97,7 @@ Stage-0
                             Select Operator [SEL_11] (rows=8116 width=1119)
                               Output:["_col0"]
                               Filter Operator [FIL_42] (rows=8116 width=1119)
-                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
2002-05-30 00:00:00.0 AND 2002-07-29 00:00:00.0 and d_date_sk is not null)
+                                predicate:(CAST( d_date AS TIMESTAMP) BETWEEN 
TIMESTAMP'2002-05-30 00:00:00.0' AND TIMESTAMP'2002-07-29 00:00:00.0' and 
d_date_sk is not null)
                                 TableScan [TS_9] (rows=73049 width=1119)
                                   
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query86.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query86.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query86.q.out
index be7e858..cd0d413 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query86.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query86.q.out
@@ -86,7 +86,7 @@ Stage-0
                           SHUFFLE [RS_18]
                             PartitionCols:_col0, _col1, _col2
                             Group By Operator [GBY_17] (rows=522729705 
width=135)
-                              
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col0,
 _col1, 0
+                              
Output:["_col0","_col1","_col2","_col3"],aggregations:["sum(_col2)"],keys:_col0,
 _col1, 0L
                               Select Operator [SEL_15] (rows=174243235 
width=135)
                                 Output:["_col0","_col1","_col2"]
                                 Merge Join Operator [MERGEJOIN_40] 
(rows=174243235 width=135)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query87.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query87.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query87.q.out
index 8430e8a..19f0e00 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query87.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query87.q.out
@@ -70,7 +70,7 @@ Stage-0
               Output:["_col0"],aggregations:["count()"]
               Select Operator [SEL_98] (rows=4537552 width=129)
                 Filter Operator [FIL_97] (rows=4537552 width=129)
-                  predicate:(((_col3 * 2) = _col4) and (_col3 > 0))
+                  predicate:(((_col3 * 2) = _col4) and (_col3 > 0L))
                   Select Operator [SEL_129] (rows=27225312 width=129)
                     Output:["_col3","_col4"]
                     Group By Operator [GBY_96] (rows=27225312 width=129)
@@ -144,7 +144,7 @@ Stage-0
                                   Select Operator [SEL_59] (rows=21779634 
width=103)
                                     Output:["_col0","_col1","_col2"]
                                     Filter Operator [FIL_58] (rows=21779634 
width=103)
-                                      predicate:(((_col3 * 2) = _col4) and 
(_col3 > 0))
+                                      predicate:(((_col3 * 2) = _col4) and 
(_col3 > 0L))
                                       Group By Operator [GBY_57] 
(rows=130677808 width=103)
                                         
Output:["_col0","_col1","_col2","_col3","_col4"],aggregations:["sum(VALUE._col0)","sum(VALUE._col1)"],keys:KEY._col0,
 KEY._col1, KEY._col2
                                       <-Union 5 [SIMPLE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query92.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query92.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query92.q.out
index fbb4eb3..6009fdf 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query92.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query92.q.out
@@ -112,7 +112,7 @@ Stage-0
                                   Select Operator [SEL_5] (rows=8116 
width=1119)
                                     Output:["_col0"]
                                     Filter Operator [FIL_57] (rows=8116 
width=1119)
-                                      predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN 1998-03-18 00:00:00.0 AND 1998-06-16 01:00:00.0 and d_date_sk is not 
null)
+                                      predicate:(CAST( d_date AS TIMESTAMP) 
BETWEEN TIMESTAMP'1998-03-18 00:00:00.0' AND TIMESTAMP'1998-06-16 01:00:00.0' 
and d_date_sk is not null)
                                       TableScan [TS_3] (rows=73049 width=1119)
                                         
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
                           <-Reducer 7 [ONE_TO_ONE_EDGE]

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/perf/tez/query94.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/tez/query94.q.out 
b/ql/src/test/results/clientpositive/perf/tez/query94.q.out
index e18d45b..ed7d42b 100644
--- a/ql/src/test/results/clientpositive/perf/tez/query94.q.out
+++ b/ql/src/test/results/clientpositive/perf/tez/query94.q.out
@@ -182,7 +182,7 @@ Stage-0
                                                       Select Operator [SEL_5] 
(rows=8116 width=1119)
                                                         Output:["_col0"]
                                                         Filter Operator 
[FIL_68] (rows=8116 width=1119)
-                                                          predicate:(CAST( 
d_date AS TIMESTAMP) BETWEEN 1999-05-01 00:00:00.0 AND 1999-06-30 00:00:00.0 
and d_date_sk is not null)
+                                                          predicate:(CAST( 
d_date AS TIMESTAMP) BETWEEN TIMESTAMP'1999-05-01 00:00:00.0' AND 
TIMESTAMP'1999-06-30 00:00:00.0' and d_date_sk is not null)
                                                           TableScan [TS_3] 
(rows=73049 width=1119)
                                                             
default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
 

Reply via email to