http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
index 2f7ce31..8244871 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
@@ -127,7 +127,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9
           Statistics: Num rows: 6144 Data size: 1082441 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col9 > 1) (type: boolean)
+            predicate: (_col9 > 1L) (type: boolean)
             Statistics: Num rows: 2048 Data size: 360813 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), _col1 (type: bigint), _col2 
(type: decimal(20,10)), _col3 (type: decimal(20,10)), _col4 (type: 
decimal(30,10)), _col5 (type: bigint), _col6 (type: decimal(23,14)), _col7 
(type: decimal(23,14)), _col8 (type: decimal(33,14))
@@ -268,7 +268,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
           Statistics: Num rows: 6144 Data size: 1082441 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col15 > 1) (type: boolean)
+            predicate: (_col15 > 1L) (type: boolean)
             Statistics: Num rows: 2048 Data size: 360813 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), _col1 (type: bigint), _col2 
(type: decimal(20,10)), _col3 (type: decimal(20,10)), _col4 (type: 
decimal(30,10)), _col5 (type: decimal(24,14)), _col6 (type: double), _col7 
(type: double), _col8 (type: bigint), _col9 (type: decimal(23,14)), _col10 
(type: decimal(23,14)), _col11 (type: decimal(33,14)), _col12 (type: 
decimal(27,18)), _col13 (type: double), _col14 (type: double)
@@ -443,7 +443,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9
           Statistics: Num rows: 6144 Data size: 173221 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col9 > 1) (type: boolean)
+            predicate: (_col9 > 1L) (type: boolean)
             Statistics: Num rows: 2048 Data size: 57740 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), _col1 (type: bigint), _col2 
(type: decimal(11,5)), _col3 (type: decimal(11,5)), _col4 (type: 
decimal(21,5)), _col5 (type: bigint), _col6 (type: decimal(16,0)), _col7 (type: 
decimal(16,0)), _col8 (type: decimal(26,0))
@@ -603,7 +603,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
           Statistics: Num rows: 6144 Data size: 173221 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (_col15 > 1) (type: boolean)
+            predicate: (_col15 > 1L) (type: boolean)
             Statistics: Num rows: 2048 Data size: 57740 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int), _col1 (type: bigint), _col2 
(type: decimal(11,5)), _col3 (type: decimal(11,5)), _col4 (type: 
decimal(21,5)), _col5 (type: decimal(15,9)), _col6 (type: double), _col7 (type: 
double), _col8 (type: bigint), _col9 (type: decimal(16,0)), _col10 (type: 
decimal(16,0)), _col11 (type: decimal(26,0)), _col12 (type: decimal(20,4)), 
_col13 (type: double), _col14 (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out
index 0ee65eb..b8581e4 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_math_funcs.q.out
@@ -121,10 +121,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterLongColEqualLongScalar(col 5:bigint, val 0)(children: 
LongColModuloLongScalar(col 0:bigint, val 500) -> 5:bigint), 
FilterDoubleColGreaterEqualDoubleScalar(col 7:double, val -1.0)(children: 
FuncSinDoubleToDouble(col 6:double)(children: CastDecimalToDouble(col 
2:decimal(20,10)) -> 6:double) -> 7:double))
-              predicate: (((cbigint % 500) = 0) and (sin(cdecimal1) >= -1.0)) 
(type: boolean)
+              predicate: (((cbigint % 500) = 0) and (sin(cdecimal1) >= -1.0D)) 
(type: boolean)
               Statistics: Num rows: 2048 Data size: 366928 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cdecimal1 (type: decimal(20,10)), 
round(cdecimal1, 2) (type: decimal(13,2)), round(cdecimal1) (type: 
decimal(11,0)), floor(cdecimal1) (type: decimal(11,0)), ceil(cdecimal1) (type: 
decimal(11,0)), round(exp(cdecimal1), 58) (type: double), ln(cdecimal1) (type: 
double), log10(cdecimal1) (type: double), log2(cdecimal1) (type: double), 
log2((cdecimal1 - 15601)) (type: double), log(2, cdecimal1) (type: double), 
power(log2(cdecimal1), 2) (type: double), power(log2(cdecimal1), 2) (type: 
double), sqrt(cdecimal1) (type: double), abs(cdecimal1) (type: decimal(20,10)), 
sin(cdecimal1) (type: double), asin(cdecimal1) (type: double), cos(cdecimal1) 
(type: double), acos(cdecimal1) (type: double), atan(cdecimal1) (type: double), 
degrees(cdecimal1) (type: double), radians(cdecimal1) (type: double), cdecimal1 
(type: decimal(20,10)), (- cdecimal1) (type: decimal(20,10)), sign(cdecimal1) 
(type: int), cos(((- sin(log(cdecimal1))) + 3.14159)) (type: double)
+                expressions: cdecimal1 (type: decimal(20,10)), 
round(cdecimal1, 2) (type: decimal(13,2)), round(cdecimal1) (type: 
decimal(11,0)), floor(cdecimal1) (type: decimal(11,0)), ceil(cdecimal1) (type: 
decimal(11,0)), round(exp(cdecimal1), 58) (type: double), ln(cdecimal1) (type: 
double), log10(cdecimal1) (type: double), log2(cdecimal1) (type: double), 
log2((cdecimal1 - 15601)) (type: double), log(2, cdecimal1) (type: double), 
power(log2(cdecimal1), 2) (type: double), power(log2(cdecimal1), 2) (type: 
double), sqrt(cdecimal1) (type: double), abs(cdecimal1) (type: decimal(20,10)), 
sin(cdecimal1) (type: double), asin(cdecimal1) (type: double), cos(cdecimal1) 
(type: double), acos(cdecimal1) (type: double), atan(cdecimal1) (type: double), 
degrees(cdecimal1) (type: double), radians(cdecimal1) (type: double), cdecimal1 
(type: decimal(20,10)), (- cdecimal1) (type: decimal(20,10)), sign(cdecimal1) 
(type: int), cos(((- sin(log(cdecimal1))) + 3.14159D)) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -363,10 +363,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterLongColEqualLongScalar(col 5:bigint, val 0)(children: 
LongColModuloLongScalar(col 0:bigint, val 500) -> 5:bigint), 
FilterDoubleColGreaterEqualDoubleScalar(col 7:double, val -1.0)(children: 
FuncSinDoubleToDouble(col 6:double)(children: CastDecimalToDouble(col 
2:decimal(12,4)) -> 6:double) -> 7:double))
-              predicate: (((cbigint % 500) = 0) and (sin(cdecimal1) >= -1.0)) 
(type: boolean)
+              predicate: (((cbigint % 500) = 0) and (sin(cdecimal1) >= -1.0D)) 
(type: boolean)
               Statistics: Num rows: 2048 Data size: 366865 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cdecimal1 (type: decimal(12,4)), round(cdecimal1, 
2) (type: decimal(11,2)), round(cdecimal1) (type: decimal(9,0)), 
floor(cdecimal1) (type: decimal(9,0)), ceil(cdecimal1) (type: decimal(9,0)), 
round(exp(cdecimal1), 58) (type: double), ln(cdecimal1) (type: double), 
log10(cdecimal1) (type: double), log2(cdecimal1) (type: double), 
log2((cdecimal1 - 15601)) (type: double), log(2, cdecimal1) (type: double), 
power(log2(cdecimal1), 2) (type: double), power(log2(cdecimal1), 2) (type: 
double), sqrt(cdecimal1) (type: double), abs(cdecimal1) (type: decimal(12,4)), 
sin(cdecimal1) (type: double), asin(cdecimal1) (type: double), cos(cdecimal1) 
(type: double), acos(cdecimal1) (type: double), atan(cdecimal1) (type: double), 
degrees(cdecimal1) (type: double), radians(cdecimal1) (type: double), cdecimal1 
(type: decimal(12,4)), (- cdecimal1) (type: decimal(12,4)), sign(cdecimal1) 
(type: int), cos(((- sin(log(cdecimal1))) + 3.14159)) (type: double)
+                expressions: cdecimal1 (type: decimal(12,4)), round(cdecimal1, 
2) (type: decimal(11,2)), round(cdecimal1) (type: decimal(9,0)), 
floor(cdecimal1) (type: decimal(9,0)), ceil(cdecimal1) (type: decimal(9,0)), 
round(exp(cdecimal1), 58) (type: double), ln(cdecimal1) (type: double), 
log10(cdecimal1) (type: double), log2(cdecimal1) (type: double), 
log2((cdecimal1 - 15601)) (type: double), log(2, cdecimal1) (type: double), 
power(log2(cdecimal1), 2) (type: double), power(log2(cdecimal1), 2) (type: 
double), sqrt(cdecimal1) (type: double), abs(cdecimal1) (type: decimal(12,4)), 
sin(cdecimal1) (type: double), asin(cdecimal1) (type: double), cos(cdecimal1) 
(type: double), acos(cdecimal1) (type: double), atan(cdecimal1) (type: double), 
degrees(cdecimal1) (type: double), radians(cdecimal1) (type: double), cdecimal1 
(type: decimal(12,4)), (- cdecimal1) (type: decimal(12,4)), sign(cdecimal1) 
(type: int), cos(((- sin(log(cdecimal1))) + 3.14159D)) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20, _col21, _col22, _col23, _col24, _col25
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_decimal_udf2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_udf2.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_udf2.q.out
index 2bcedd0..03e5172 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_udf2.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_udf2.q.out
@@ -92,7 +92,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 19 Data size: 1983 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: null (type: double), null (type: double), 
1.4711276743037347 (type: double), -0.8390715290764524 (type: double), 
-0.5440211108893698 (type: double), 0.6483608274590866 (type: double), 
0.17453292519943295 (type: double)
+                expressions: null (type: double), null (type: double), 
1.4711276743037347D (type: double), -0.8390715290764524D (type: double), 
-0.5440211108893698D (type: double), 0.6483608274590866D (type: double), 
0.17453292519943295D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -197,7 +197,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 19 Data size: 1983 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: 22026.465794806718 (type: double), 
2.302585092994046 (type: double), 2.302585092994046 (type: double), 1.0 (type: 
double), log(10, value) (type: double), log(value, 10) (type: double), 1.0 
(type: double), 3.1622776601683795 (type: double)
+                expressions: 22026.465794806718D (type: double), 
2.302585092994046D (type: double), 2.302585092994046D (type: double), 1.0D 
(type: double), log(10, value) (type: double), log(value, 10) (type: double), 
1.0D (type: double), 3.1622776601683795D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -308,7 +308,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: null (type: double), null (type: double), 
1.4711276743037347 (type: double), -0.8390715290764524 (type: double), 
-0.5440211108893698 (type: double), 0.6483608274590866 (type: double), 
0.17453292519943295 (type: double)
+                expressions: null (type: double), null (type: double), 
1.4711276743037347D (type: double), -0.8390715290764524D (type: double), 
-0.5440211108893698D (type: double), 0.6483608274590866D (type: double), 
0.17453292519943295D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -413,7 +413,7 @@ STAGE PLANS:
               predicate: (key = 10) (type: boolean)
               Statistics: Num rows: 1 Data size: 3590 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: 22026.465794806718 (type: double), 
2.302585092994046 (type: double), 2.302585092994046 (type: double), 1.0 (type: 
double), log(10, value) (type: double), log(value, 10) (type: double), 1.0 
(type: double), 3.1622776601683795 (type: double)
+                expressions: 22026.465794806718D (type: double), 
2.302585092994046D (type: double), 2.302585092994046D (type: double), 1.0D 
(type: double), log(10, value) (type: double), log(value, 10) (type: double), 
1.0D (type: double), 3.1622776601683795D (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_elt.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_elt.q.out 
b/ql/src/test/results/clientpositive/vector_elt.q.out
index 0b51d83..474efb5 100644
--- a/ql/src/test/results/clientpositive/vector_elt.q.out
+++ b/ql/src/test/results/clientpositive/vector_elt.q.out
@@ -28,7 +28,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterLongColGreaterLongScalar(col 
0:tinyint, val 0)
-              predicate: (ctinyint > 0) (type: boolean)
+              predicate: (ctinyint > 0Y) (type: boolean)
               Statistics: Num rows: 4096 Data size: 880654 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ((UDFToInteger(ctinyint) % 2) + 1) (type: int), 
cstring1 (type: string), cint (type: int), elt(((UDFToInteger(ctinyint) % 2) + 
1), cstring1, cint) (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out 
b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out
index 0815bdb..01c5096 100644
--- a/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/vector_groupby_mapjoin.q.out
@@ -199,7 +199,7 @@ STAGE PLANS:
                     className: VectorFilterOperator
                     native: true
                     predicateExpression: FilterExprOrExpr(children: 
FilterLongColEqualLongScalar(col 2:bigint, val 0), FilterExprAndExpr(children: 
SelectColumnIsNull(col 4:boolean), SelectColumnIsNotNull(col 0:string), 
FilterLongColGreaterEqualLongColumn(col 3:bigint, col 2:bigint)))
-                predicate: ((_col2 = 0) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
+                predicate: ((_col2 = 0L) or (_col5 is null and _col0 is not 
null and (_col3 >= _col2))) (type: boolean)
                 Statistics: Num rows: 366 Data size: 10110 Basic stats: 
COMPLETE Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string)
@@ -301,7 +301,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col5
           Statistics: Num rows: 550 Data size: 15193 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: ((_col2 = 0) or (_col5 is null and _col0 is not null 
and (_col3 >= _col2))) (type: boolean)
+            predicate: ((_col2 = 0L) or (_col5 is null and _col0 is not null 
and (_col3 >= _col2))) (type: boolean)
             Statistics: Num rows: 366 Data size: 10110 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_grouping_sets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_grouping_sets.q.out 
b/ql/src/test/results/clientpositive/vector_grouping_sets.q.out
index fc8290e..e89b6bc 100644
--- a/ql/src/test/results/clientpositive/vector_grouping_sets.q.out
+++ b/ql/src/test/results/clientpositive/vector_grouping_sets.q.out
@@ -166,7 +166,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: HASH
                     projectedOutputColumnNums: []
-                keys: s_store_id (type: string), 0 (type: bigint)
+                keys: s_store_id (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 24 Data size: 51264 Basic stats: 
COMPLETE Column stats: NONE
@@ -277,7 +277,7 @@ STAGE PLANS:
                     native: false
                     vectorProcessingMode: HASH
                     projectedOutputColumnNums: []
-                keys: _col0 (type: string), 0 (type: bigint)
+                keys: _col0 (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 24 Data size: 51264 Basic stats: 
COMPLETE Column stats: NONE
@@ -374,7 +374,7 @@ STAGE PLANS:
               outputColumnNames: _col0
               Statistics: Num rows: 12 Data size: 25632 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: _col0 (type: string), 0 (type: bigint)
+                keys: _col0 (type: string), 0L (type: bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 24 Data size: 51264 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_interval_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_interval_1.q.out 
b/ql/src/test/results/clientpositive/vector_interval_1.q.out
index 1c7df24..8c0086e 100644
--- a/ql/src/test/results/clientpositive/vector_interval_1.q.out
+++ b/ql/src/test/results/clientpositive/vector_interval_1.q.out
@@ -118,7 +118,7 @@ STAGE PLANS:
           enableConditionsNotMet: hive.execution.engine mr IN [tez, spark] IS 
false
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: string), 1-2 (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), 1 
02:03:04.000000000 (type: interval_day_time), VALUE._col1 (type: 
interval_day_time)
+          expressions: KEY.reducesinkkey0 (type: string), INTERVAL'1-2' (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), INTERVAL'1 
02:03:04.000000000' (type: interval_day_time), VALUE._col1 (type: 
interval_day_time)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 2 Data size: 442 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
@@ -195,7 +195,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dt (type: date), (CAST( str1 AS INTERVAL YEAR TO 
MONTH) + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(1-2 + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(CAST( str1 AS INTERVAL YEAR TO MONTH) - CAST( str1 AS INTERVAL YEAR TO MONTH)) 
(type: interval_year_month), (1-2 - CAST( str1 AS INTERVAL YEAR TO MONTH)) 
(type: interval_year_month)
+              expressions: dt (type: date), (CAST( str1 AS INTERVAL YEAR TO 
MONTH) + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month), 
(INTERVAL'1-2' + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: 
interval_year_month), (CAST( str1 AS INTERVAL YEAR TO MONTH) - CAST( str1 AS 
INTERVAL YEAR TO MONTH)) (type: interval_year_month), (INTERVAL'1-2' - CAST( 
str1 AS INTERVAL YEAR TO MONTH)) (type: interval_year_month)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
               Select Vectorization:
                   className: VectorSelectOperator
@@ -229,7 +229,7 @@ STAGE PLANS:
           enableConditionsNotMet: hive.execution.engine mr IN [tez, spark] IS 
false
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: date), 2-4 (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), VALUE._col1 
(type: interval_year_month), 0-0 (type: interval_year_month), VALUE._col2 
(type: interval_year_month), VALUE._col3 (type: interval_year_month)
+          expressions: KEY.reducesinkkey0 (type: date), INTERVAL'2-4' (type: 
interval_year_month), VALUE._col0 (type: interval_year_month), VALUE._col1 
(type: interval_year_month), INTERVAL'0-0' (type: interval_year_month), 
VALUE._col2 (type: interval_year_month), VALUE._col3 (type: interval_year_month)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6
           Statistics: Num rows: 2 Data size: 442 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
@@ -314,7 +314,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dt (type: date), (CAST( str2 AS INTERVAL DAY TO 
SECOND) + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time), (1 
02:03:04.000000000 + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time), (CAST( str2 AS INTERVAL DAY TO SECOND) - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: interval_day_time), (1 02:03:04.000000000 - 
CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time)
+              expressions: dt (type: date), (CAST( str2 AS INTERVAL DAY TO 
SECOND) + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: interval_day_time), 
(INTERVAL'1 02:03:04.000000000' + CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time), (CAST( str2 AS INTERVAL DAY TO SECOND) - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: interval_day_time), (INTERVAL'1 
02:03:04.000000000' - CAST( str2 AS INTERVAL DAY TO SECOND)) (type: 
interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4
               Select Vectorization:
                   className: VectorSelectOperator
@@ -348,7 +348,7 @@ STAGE PLANS:
           enableConditionsNotMet: hive.execution.engine mr IN [tez, spark] IS 
false
       Reduce Operator Tree:
         Select Operator
-          expressions: KEY.reducesinkkey0 (type: date), 2 04:06:08.000000000 
(type: interval_day_time), VALUE._col0 (type: interval_day_time), VALUE._col1 
(type: interval_day_time), 0 00:00:00.000000000 (type: interval_day_time), 
VALUE._col2 (type: interval_day_time), VALUE._col3 (type: interval_day_time)
+          expressions: KEY.reducesinkkey0 (type: date), INTERVAL'2 
04:06:08.000000000' (type: interval_day_time), VALUE._col0 (type: 
interval_day_time), VALUE._col1 (type: interval_day_time), INTERVAL'0 
00:00:00.000000000' (type: interval_day_time), VALUE._col2 (type: 
interval_day_time), VALUE._col3 (type: interval_day_time)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6
           Statistics: Num rows: 2 Data size: 442 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
@@ -445,7 +445,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dt (type: date), (dt + 1-2) (type: date), (dt + 
CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), (1-2 + dt) (type: date), 
(CAST( str1 AS INTERVAL YEAR TO MONTH) + dt) (type: date), (dt - 1-2) (type: 
date), (dt - CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), (dt + 1 
02:03:04.000000000) (type: timestamp), (dt + CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp), (1 02:03:04.000000000 + dt) (type: timestamp), 
(CAST( str2 AS INTERVAL DAY TO SECOND) + dt) (type: timestamp), (dt - 1 
02:03:04.000000000) (type: timestamp), (dt - CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp)
+              expressions: dt (type: date), (dt + INTERVAL'1-2') (type: date), 
(dt + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: date), (INTERVAL'1-2' + dt) 
(type: date), (CAST( str1 AS INTERVAL YEAR TO MONTH) + dt) (type: date), (dt - 
INTERVAL'1-2') (type: date), (dt - CAST( str1 AS INTERVAL YEAR TO MONTH)) 
(type: date), (dt + INTERVAL'1 02:03:04.000000000') (type: timestamp), (dt + 
CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp), (INTERVAL'1 
02:03:04.000000000' + dt) (type: timestamp), (CAST( str2 AS INTERVAL DAY TO 
SECOND) + dt) (type: timestamp), (dt - INTERVAL'1 02:03:04.000000000') (type: 
timestamp), (dt - CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
               Select Vectorization:
                   className: VectorSelectOperator
@@ -588,7 +588,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: ts (type: timestamp), (ts + 1-2) (type: timestamp), 
(ts + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: timestamp), (1-2 + ts) 
(type: timestamp), (CAST( str1 AS INTERVAL YEAR TO MONTH) + ts) (type: 
timestamp), (ts - 1-2) (type: timestamp), (ts - CAST( str1 AS INTERVAL YEAR TO 
MONTH)) (type: timestamp), (ts + 1 02:03:04.000000000) (type: timestamp), (ts + 
CAST( str2 AS INTERVAL DAY TO SECOND)) (type: timestamp), (1 02:03:04.000000000 
+ ts) (type: timestamp), (CAST( str2 AS INTERVAL DAY TO SECOND) + ts) (type: 
timestamp), (ts - 1 02:03:04.000000000) (type: timestamp), (ts - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: timestamp)
+              expressions: ts (type: timestamp), (ts + INTERVAL'1-2') (type: 
timestamp), (ts + CAST( str1 AS INTERVAL YEAR TO MONTH)) (type: timestamp), 
(INTERVAL'1-2' + ts) (type: timestamp), (CAST( str1 AS INTERVAL YEAR TO MONTH) 
+ ts) (type: timestamp), (ts - INTERVAL'1-2') (type: timestamp), (ts - CAST( 
str1 AS INTERVAL YEAR TO MONTH)) (type: timestamp), (ts + INTERVAL'1 
02:03:04.000000000') (type: timestamp), (ts + CAST( str2 AS INTERVAL DAY TO 
SECOND)) (type: timestamp), (INTERVAL'1 02:03:04.000000000' + ts) (type: 
timestamp), (CAST( str2 AS INTERVAL DAY TO SECOND) + ts) (type: timestamp), (ts 
- INTERVAL'1 02:03:04.000000000') (type: timestamp), (ts - CAST( str2 AS 
INTERVAL DAY TO SECOND)) (type: timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
               Select Vectorization:
                   className: VectorSelectOperator
@@ -713,7 +713,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: ts (type: timestamp), (ts - ts) (type: 
interval_day_time), (2001-01-01 01:02:03.0 - ts) (type: interval_day_time), (ts 
- 2001-01-01 01:02:03.0) (type: interval_day_time)
+              expressions: ts (type: timestamp), (ts - ts) (type: 
interval_day_time), (TIMESTAMP'2001-01-01 01:02:03.0' - ts) (type: 
interval_day_time), (ts - TIMESTAMP'2001-01-01 01:02:03.0') (type: 
interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3
               Select Vectorization:
                   className: VectorSelectOperator
@@ -820,7 +820,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dt (type: date), (dt - dt) (type: 
interval_day_time), (2001-01-01 - dt) (type: interval_day_time), (dt - 
2001-01-01) (type: interval_day_time)
+              expressions: dt (type: date), (dt - dt) (type: 
interval_day_time), (DATE'2001-01-01' - dt) (type: interval_day_time), (dt - 
DATE'2001-01-01') (type: interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3
               Select Vectorization:
                   className: VectorSelectOperator
@@ -933,7 +933,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dt (type: date), (ts - dt) (type: 
interval_day_time), (2001-01-01 01:02:03.0 - dt) (type: interval_day_time), (ts 
- 2001-01-01) (type: interval_day_time), (dt - ts) (type: interval_day_time), 
(dt - 2001-01-01 01:02:03.0) (type: interval_day_time), (2001-01-01 - ts) 
(type: interval_day_time)
+              expressions: dt (type: date), (ts - dt) (type: 
interval_day_time), (TIMESTAMP'2001-01-01 01:02:03.0' - dt) (type: 
interval_day_time), (ts - DATE'2001-01-01') (type: interval_day_time), (dt - 
ts) (type: interval_day_time), (dt - TIMESTAMP'2001-01-01 01:02:03.0') (type: 
interval_day_time), (DATE'2001-01-01' - ts) (type: interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Select Vectorization:
                   className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out 
b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
index 3ab7467..1547942 100644
--- a/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
+++ b/ql/src/test/results/clientpositive/vector_interval_arithmetic.q.out
@@ -78,7 +78,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dateval (type: date), (dateval - 2-2) (type: date), 
(dateval - -2-2) (type: date), (dateval + 2-2) (type: date), (dateval + -2-2) 
(type: date), (-2-2 + dateval) (type: date), (2-2 + dateval) (type: date)
+              expressions: dateval (type: date), (dateval - INTERVAL'2-2') 
(type: date), (dateval - INTERVAL'-2-2') (type: date), (dateval + 
INTERVAL'2-2') (type: date), (dateval + INTERVAL'-2-2') (type: date), 
(INTERVAL'-2-2' + dateval) (type: date), (INTERVAL'2-2' + dateval) (type: date)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Select Vectorization:
                   className: VectorSelectOperator
@@ -243,7 +243,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dateval (type: date), (dateval - 1999-06-07) (type: 
interval_day_time), (1999-06-07 - dateval) (type: interval_day_time), (dateval 
- dateval) (type: interval_day_time)
+              expressions: dateval (type: date), (dateval - DATE'1999-06-07') 
(type: interval_day_time), (DATE'1999-06-07' - dateval) (type: 
interval_day_time), (dateval - dateval) (type: interval_day_time)
               outputColumnNames: _col0, _col1, _col2, _col3
               Select Vectorization:
                   className: VectorSelectOperator
@@ -408,7 +408,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: tsval (type: timestamp), (tsval - 2-2) (type: 
timestamp), (tsval - -2-2) (type: timestamp), (tsval + 2-2) (type: timestamp), 
(tsval + -2-2) (type: timestamp), (-2-2 + tsval) (type: timestamp), (2-2 + 
tsval) (type: timestamp)
+              expressions: tsval (type: timestamp), (tsval - INTERVAL'2-2') 
(type: timestamp), (tsval - INTERVAL'-2-2') (type: timestamp), (tsval + 
INTERVAL'2-2') (type: timestamp), (tsval + INTERVAL'-2-2') (type: timestamp), 
(INTERVAL'-2-2' + tsval) (type: timestamp), (INTERVAL'2-2' + tsval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Select Vectorization:
                   className: VectorSelectOperator
@@ -571,7 +571,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: 5-5 (type: interval_year_month), -1-1 (type: 
interval_year_month)
+              expressions: INTERVAL'5-5' (type: interval_year_month), 
INTERVAL'-1-1' (type: interval_year_month)
               outputColumnNames: _col0, _col1
               Select Vectorization:
                   className: VectorSelectOperator
@@ -676,7 +676,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: dateval (type: date), (dateval - 99 
11:22:33.123456789) (type: timestamp), (dateval - -99 11:22:33.123456789) 
(type: timestamp), (dateval + 99 11:22:33.123456789) (type: timestamp), 
(dateval + -99 11:22:33.123456789) (type: timestamp), (-99 11:22:33.123456789 + 
dateval) (type: timestamp), (99 11:22:33.123456789 + dateval) (type: timestamp)
+              expressions: dateval (type: date), (dateval - INTERVAL'99 
11:22:33.123456789') (type: timestamp), (dateval - INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (dateval + INTERVAL'99 
11:22:33.123456789') (type: timestamp), (dateval + INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (INTERVAL'-99 11:22:33.123456789' + 
dateval) (type: timestamp), (INTERVAL'99 11:22:33.123456789' + dateval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Select Vectorization:
                   className: VectorSelectOperator
@@ -1010,7 +1010,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: tsval (type: timestamp), (tsval - 99 
11:22:33.123456789) (type: timestamp), (tsval - -99 11:22:33.123456789) (type: 
timestamp), (tsval + 99 11:22:33.123456789) (type: timestamp), (tsval + -99 
11:22:33.123456789) (type: timestamp), (-99 11:22:33.123456789 + tsval) (type: 
timestamp), (99 11:22:33.123456789 + tsval) (type: timestamp)
+              expressions: tsval (type: timestamp), (tsval - INTERVAL'99 
11:22:33.123456789') (type: timestamp), (tsval - INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (tsval + INTERVAL'99 
11:22:33.123456789') (type: timestamp), (tsval + INTERVAL'-99 
11:22:33.123456789') (type: timestamp), (INTERVAL'-99 11:22:33.123456789' + 
tsval) (type: timestamp), (INTERVAL'99 11:22:33.123456789' + tsval) (type: 
timestamp)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6
               Select Vectorization:
                   className: VectorSelectOperator
@@ -1171,7 +1171,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: 109 20:30:40.246913578 (type: interval_day_time), 
89 02:14:26.000000000 (type: interval_day_time)
+              expressions: INTERVAL'109 20:30:40.246913578' (type: 
interval_day_time), INTERVAL'89 02:14:26.000000000' (type: interval_day_time)
               outputColumnNames: _col0, _col1
               Select Vectorization:
                   className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_nvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_nvl.q.out 
b/ql/src/test/results/clientpositive/vector_nvl.q.out
index 1c5cedb..11eacc2 100644
--- a/ql/src/test/results/clientpositive/vector_nvl.q.out
+++ b/ql/src/test/results/clientpositive/vector_nvl.q.out
@@ -33,7 +33,7 @@ STAGE PLANS:
               predicate: cdouble is null (type: boolean)
               Statistics: Num rows: 6144 Data size: 1320982 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: null (type: double), 100.0 (type: double)
+                expressions: null (type: double), 100.0D (type: double)
                 outputColumnNames: _col0, _col1
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_string_concat.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_string_concat.q.out 
b/ql/src/test/results/clientpositive/vector_string_concat.q.out
index ff3b755..bede8a1 100644
--- a/ql/src/test/results/clientpositive/vector_string_concat.q.out
+++ b/ql/src/test/results/clientpositive/vector_string_concat.q.out
@@ -334,7 +334,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: concat(concat(concat('Quarter ', 
UDFToString(UDFToInteger(((UDFToDouble((month(dt) - 1)) / 3.0) + 1.0)))), '-'), 
UDFToString(year(dt))) (type: string)
+              expressions: concat(concat(concat('Quarter ', 
UDFToString(UDFToInteger(((UDFToDouble((month(dt) - 1)) / 3.0D) + 1.0D)))), 
'-'), UDFToString(year(dt))) (type: string)
               outputColumnNames: _col0
               Select Vectorization:
                   className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vector_struct_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_struct_in.q.out 
b/ql/src/test/results/clientpositive/vector_struct_in.q.out
index 773908b..f980286 100644
--- a/ql/src/test/results/clientpositive/vector_struct_in.q.out
+++ b/ql/src/test/results/clientpositive/vector_struct_in.q.out
@@ -819,7 +819,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: 
FilterStructColumnInList(structExpressions [col 0:bigint, col 1:string, col 
2:double], fieldVectorColumnTypes [LONG, BYTES, DOUBLE], structColumnMap [0, 1, 
2])
-              predicate: (struct(my_bigint,my_string,my_double)) IN (const 
struct(1,'a',1.5), const struct(1,'b',-0.5), const struct(3,'b',1.5), const 
struct(1,'d',1.5), const struct(1,'c',1.5), const struct(1,'b',2.5), const 
struct(1,'b',0.5), const struct(5,'b',1.5), const struct(1,'a',0.5), const 
struct(3,'b',1.5)) (type: boolean)
+              predicate: (struct(my_bigint,my_string,my_double)) IN (const 
struct(1L,'a',1.5D), const struct(1L,'b',-0.5D), const struct(3L,'b',1.5D), 
const struct(1L,'d',1.5D), const struct(1L,'c',1.5D), const 
struct(1L,'b',2.5D), const struct(1L,'b',0.5D), const struct(5L,'b',1.5D), 
const struct(1L,'a',0.5D), const struct(3L,'b',1.5D)) (type: boolean)
               Statistics: Num rows: 1 Data size: 101 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: my_bigint (type: bigint), my_string (type: 
string), my_double (type: double)
@@ -937,7 +937,7 @@ STAGE PLANS:
             TableScan Vectorization:
                 native: true
             Select Operator
-              expressions: my_bigint (type: bigint), my_string (type: string), 
my_double (type: double), (struct(my_bigint,my_string,my_double)) IN (const 
struct(1,'a',1.5), const struct(1,'b',-0.5), const struct(3,'b',1.5), const 
struct(1,'d',1.5), const struct(1,'c',1.5), const struct(1,'b',2.5), const 
struct(1,'b',0.5), const struct(5,'b',1.5), const struct(1,'a',0.5), const 
struct(3,'b',1.5)) (type: boolean)
+              expressions: my_bigint (type: bigint), my_string (type: string), 
my_double (type: double), (struct(my_bigint,my_string,my_double)) IN (const 
struct(1L,'a',1.5D), const struct(1L,'b',-0.5D), const struct(3L,'b',1.5D), 
const struct(1L,'d',1.5D), const struct(1L,'c',1.5D), const 
struct(1L,'b',2.5D), const struct(1L,'b',0.5D), const struct(5L,'b',1.5D), 
const struct(1L,'a',0.5D), const struct(3L,'b',1.5D)) (type: boolean)
               outputColumnNames: _col0, _col1, _col2, _col3
               Select Vectorization:
                   className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vectorization_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_1.q.out 
b/ql/src/test/results/clientpositive/vectorization_1.q.out
index e72321b..5230581 100644
--- a/ql/src/test/results/clientpositive/vectorization_1.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_1.q.out
@@ -121,7 +121,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: double), (_col0 / -26.28) (type: 
double), _col1 (type: double), (-1.389 + _col1) (type: double), (_col1 * 
(-1.389 + _col1)) (type: double), _col2 (type: tinyint), (- (_col1 * (-1.389 + 
_col1))) (type: double), _col3 (type: int), (CAST( _col3 AS decimal(10,0)) * 
79.553) (type: decimal(16,3)), _col4 (type: double), (10.175 % (- (_col1 * 
(-1.389 + _col1)))) (type: double), _col5 (type: bigint), (-563 % _col3) (type: 
int)
+            expressions: _col0 (type: double), (_col0 / -26.28D) (type: 
double), _col1 (type: double), (-1.389D + _col1) (type: double), (_col1 * 
(-1.389D + _col1)) (type: double), _col2 (type: tinyint), (- (_col1 * (-1.389D 
+ _col1))) (type: double), _col3 (type: int), (CAST( _col3 AS decimal(10,0)) * 
79.553) (type: decimal(16,3)), _col4 (type: double), (10.175D % (- (_col1 * 
(-1.389D + _col1)))) (type: double), _col5 (type: bigint), (-563 % _col3) 
(type: int)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
             Statistics: Num rows: 1 Data size: 184 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/vectorization_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_10.q.out 
b/ql/src/test/results/clientpositive/vectorization_10.q.out
index 325d1a7..02189b8 100644
--- a/ql/src/test/results/clientpositive/vectorization_10.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_10.q.out
@@ -69,10 +69,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterStringGroupColLessEqualStringScalar(col 7:string, val 10), 
FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, 
col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 13:double), 
FilterDecimalScalarGreaterEqualDecimalColumn(val -5638.15, col 
14:decimal(6,2))(children: CastLongToDecimal(col 0:tinyint) -> 
14:decimal(6,2))), FilterExprAndExpr(children: 
FilterDoubleColGreaterDoubleScalar(col 5:double, val 6981.0), 
FilterExprOrExpr(children: FilterDecimalColEqualDecimalScalar(col 
15:decimal(11,4), val 9763215.5639)(children: CastLongToDecimal(col 1:smallint) 
-> 15:decimal(11,4)), FilterStringColLikeStringScalar(col 6:string, pattern 
%a))))
-              predicate: (((UDFToDouble(ctinyint) > cdouble) and (-5638.15 >= 
CAST( ctinyint AS decimal(6,2)))) or ((cdouble > 6981.0) and ((CAST( csmallint 
AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= 
'10')) (type: boolean)
+              predicate: (((UDFToDouble(ctinyint) > cdouble) and (-5638.15 >= 
CAST( ctinyint AS decimal(6,2)))) or ((cdouble > 6981.0D) and ((CAST( csmallint 
AS decimal(11,4)) = 9763215.5639) or (cstring1 like '%a'))) or (cstring2 <= 
'10')) (type: boolean)
               Statistics: Num rows: 9557 Data size: 2054789 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cdouble (type: double), ctimestamp1 (type: 
timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 
(type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) 
(type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0) (type: double), (- 
cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), 
(UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: 
double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: 
bigint), (9763215.5639 - (cdouble + UDFToDouble(csmallint))) (type: double), (- 
(- cdouble)) (type: double)
+                expressions: cdouble (type: double), ctimestamp1 (type: 
timestamp), ctinyint (type: tinyint), cboolean1 (type: boolean), cstring1 
(type: string), (- cdouble) (type: double), (cdouble + UDFToDouble(csmallint)) 
(type: double), ((cdouble + UDFToDouble(csmallint)) % 33.0D) (type: double), (- 
cdouble) (type: double), (UDFToDouble(ctinyint) % cdouble) (type: double), 
(UDFToShort(ctinyint) % csmallint) (type: smallint), (- cdouble) (type: 
double), (cbigint * UDFToLong((UDFToShort(ctinyint) % csmallint))) (type: 
bigint), (9763215.5639D - (cdouble + UDFToDouble(csmallint))) (type: double), 
(- (- cdouble)) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vectorization_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_11.q.out 
b/ql/src/test/results/clientpositive/vectorization_11.q.out
index 027d718..dd7fa34 100644
--- a/ql/src/test/results/clientpositive/vectorization_11.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_11.q.out
@@ -54,7 +54,7 @@ STAGE PLANS:
               predicate: ((cstring2 = cstring1) or (ctimestamp1 is null and 
(cstring1 like '%a'))) (type: boolean)
               Statistics: Num rows: 9216 Data size: 1981473 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cstring1 (type: string), cboolean1 (type: 
boolean), cdouble (type: double), ctimestamp1 (type: timestamp), (-3728 * 
UDFToInteger(csmallint)) (type: int), (cdouble - 9763215.5639) (type: double), 
(- cdouble) (type: double), ((- cdouble) + 6981.0) (type: double), (cdouble * 
-5638.15) (type: double)
+                expressions: cstring1 (type: string), cboolean1 (type: 
boolean), cdouble (type: double), ctimestamp1 (type: timestamp), (-3728 * 
UDFToInteger(csmallint)) (type: int), (cdouble - 9763215.5639D) (type: double), 
(- cdouble) (type: double), ((- cdouble) + 6981.0D) (type: double), (cdouble * 
-5638.15D) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vectorization_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_12.q.out 
b/ql/src/test/results/clientpositive/vectorization_12.q.out
index fb0a065..3eca12c 100644
--- a/ql/src/test/results/clientpositive/vectorization_12.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_12.q.out
@@ -149,7 +149,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8
           Statistics: Num rows: 1877 Data size: 403561 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col1 (type: bigint), _col3 (type: boolean), _col2 
(type: string), _col0 (type: double), (-6432.0 * _col0) (type: double), (- 
_col1) (type: bigint), _col4 (type: bigint), (_col1 * _col4) (type: bigint), 
_col5 (type: double), ((-6432.0 * _col0) / -6432.0) (type: double), (- 
((-6432.0 * _col0) / -6432.0)) (type: double), _col6 (type: double), (- 
(-6432.0 * _col0)) (type: double), (-5638.15 + CAST( _col1 AS decimal(19,0))) 
(type: decimal(22,2)), _col7 (type: bigint), (_col6 / (-6432.0 * _col0)) (type: 
double), (- (- ((-6432.0 * _col0) / -6432.0))) (type: double), (((-6432.0 * 
_col0) / -6432.0) + (- (-6432.0 * _col0))) (type: double), _col8 (type: double)
+            expressions: _col1 (type: bigint), _col3 (type: boolean), _col2 
(type: string), _col0 (type: double), (-6432.0D * _col0) (type: double), (- 
_col1) (type: bigint), _col4 (type: bigint), (_col1 * _col4) (type: bigint), 
_col5 (type: double), ((-6432.0D * _col0) / -6432.0D) (type: double), (- 
((-6432.0D * _col0) / -6432.0D)) (type: double), _col6 (type: double), (- 
(-6432.0D * _col0)) (type: double), (-5638.15 + CAST( _col1 AS decimal(19,0))) 
(type: decimal(22,2)), _col7 (type: bigint), (_col6 / (-6432.0D * _col0)) 
(type: double), (- (- ((-6432.0D * _col0) / -6432.0D))) (type: double), 
(((-6432.0D * _col0) / -6432.0D) + (- (-6432.0D * _col0))) (type: double), 
_col8 (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col17, _col18, _col19
             Statistics: Num rows: 1877 Data size: 403561 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/vectorization_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_13.q.out 
b/ql/src/test/results/clientpositive/vectorization_13.q.out
index caad57a..ee1d65e 100644
--- a/ql/src/test/results/clientpositive/vectorization_13.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_13.q.out
@@ -88,7 +88,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 
3569.0), FilterDoubleScalarGreaterEqualDoubleColumn(val 10.175, col 5:double), 
FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), 
FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, 
val 11.0)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), 
FilterDoubleColNotEqualDoubleScalar(col 13:double, val 12.0)(children: 
CastTimestampToDouble(col 9:timestamp) -> 13:double), 
FilterDecimalColLessDecimalScalar(col 14:decimal(11,4), val 
9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(11,4))))
-              predicate: (((UDFToDouble(ctimestamp1) > 11.0) and 
(UDFToDouble(ctimestamp2) <> 12.0) and (CAST( ctinyint AS decimal(11,4)) < 
9763215.5639)) or ((cfloat < 3569) and (10.175 >= cdouble) and (cboolean1 <> 
1))) (type: boolean)
+              predicate: (((UDFToDouble(ctimestamp1) > 11.0D) and 
(UDFToDouble(ctimestamp2) <> 12.0D) and (CAST( ctinyint AS decimal(11,4)) < 
9763215.5639)) or ((cfloat < 3569) and (10.175D >= cdouble) and (cboolean1 <> 
1))) (type: boolean)
               Statistics: Num rows: 2730 Data size: 586959 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), cfloat (type: float), 
cstring1 (type: string), ctimestamp1 (type: timestamp), cboolean1 (type: 
boolean)
@@ -151,7 +151,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10
           Statistics: Num rows: 1365 Data size: 293479 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: boolean), _col1 (type: tinyint), _col2 
(type: timestamp), _col3 (type: float), _col4 (type: string), (- _col1) (type: 
tinyint), _col5 (type: tinyint), ((- _col1) + _col5) (type: tinyint), _col6 
(type: double), (_col6 * UDFToDouble(((- _col1) + _col5))) (type: double), (- 
_col6) (type: double), (79.553 * _col3) (type: float), _col7 (type: double), (- 
_col6) (type: double), _col8 (type: double), (CAST( ((- _col1) + _col5) AS 
decimal(3,0)) - 10.175) (type: decimal(7,3)), (- (- _col6)) (type: double), 
(-26.28 / (- (- _col6))) (type: double), _col9 (type: float), ((_col6 * 
UDFToDouble(((- _col1) + _col5))) / UDFToDouble(_col1)) (type: double), _col10 
(type: tinyint)
+            expressions: _col0 (type: boolean), _col1 (type: tinyint), _col2 
(type: timestamp), _col3 (type: float), _col4 (type: string), (- _col1) (type: 
tinyint), _col5 (type: tinyint), ((- _col1) + _col5) (type: tinyint), _col6 
(type: double), (_col6 * UDFToDouble(((- _col1) + _col5))) (type: double), (- 
_col6) (type: double), (79.553 * _col3) (type: float), _col7 (type: double), (- 
_col6) (type: double), _col8 (type: double), (CAST( ((- _col1) + _col5) AS 
decimal(3,0)) - 10.175) (type: decimal(7,3)), (- (- _col6)) (type: double), 
(-26.28D / (- (- _col6))) (type: double), _col9 (type: float), ((_col6 * 
UDFToDouble(((- _col1) + _col5))) / UDFToDouble(_col1)) (type: double), _col10 
(type: tinyint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20
             Statistics: Num rows: 1365 Data size: 293479 Basic stats: COMPLETE 
Column stats: NONE
             File Output Operator
@@ -417,7 +417,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterExprAndExpr(children: FilterDoubleColLessDoubleScalar(col 4:float, val 
3569.0), FilterDoubleScalarGreaterEqualDoubleColumn(val 10.175, col 5:double), 
FilterLongColNotEqualLongScalar(col 10:boolean, val 1)), 
FilterExprAndExpr(children: FilterDoubleColGreaterDoubleScalar(col 13:double, 
val -1.388)(children: CastTimestampToDouble(col 8:timestamp) -> 13:double), 
FilterDoubleColNotEqualDoubleScalar(col 13:double, val 
-1.3359999999999999)(children: CastTimestampToDouble(col 9:timestamp) -> 
13:double), FilterDecimalColLessDecimalScalar(col 14:decimal(11,4), val 
9763215.5639)(children: CastLongToDecimal(col 0:tinyint) -> 14:decimal(11,4))))
-              predicate: (((UDFToDouble(ctimestamp1) > -1.388) and 
(UDFToDouble(ctimestamp2) <> -1.3359999999999999) and (CAST( ctinyint AS 
decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569) and (10.175 >= cdouble) and 
(cboolean1 <> 1))) (type: boolean)
+              predicate: (((UDFToDouble(ctimestamp1) > -1.388D) and 
(UDFToDouble(ctimestamp2) <> -1.3359999999999999D) and (CAST( ctinyint AS 
decimal(11,4)) < 9763215.5639)) or ((cfloat < 3569) and (10.175D >= cdouble) 
and (cboolean1 <> 1))) (type: boolean)
               Statistics: Num rows: 2730 Data size: 586959 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), cfloat (type: float), 
cstring1 (type: string), ctimestamp1 (type: timestamp), cboolean1 (type: 
boolean)
@@ -474,7 +474,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10
           Statistics: Num rows: 1365 Data size: 293479 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: boolean), _col1 (type: tinyint), _col2 
(type: timestamp), _col3 (type: float), _col4 (type: string), (- _col1) (type: 
tinyint), _col5 (type: tinyint), ((- _col1) + _col5) (type: tinyint), _col6 
(type: double), (_col6 * UDFToDouble(((- _col1) + _col5))) (type: double), (- 
_col6) (type: double), (79.553 * _col3) (type: float), _col7 (type: double), (- 
_col6) (type: double), _col8 (type: double), (CAST( ((- _col1) + _col5) AS 
decimal(3,0)) - 10.175) (type: decimal(7,3)), (- (- _col6)) (type: double), 
(-26.28 / (- (- _col6))) (type: double), _col9 (type: float), ((_col6 * 
UDFToDouble(((- _col1) + _col5))) / UDFToDouble(_col1)) (type: double), _col10 
(type: tinyint)
+            expressions: _col0 (type: boolean), _col1 (type: tinyint), _col2 
(type: timestamp), _col3 (type: float), _col4 (type: string), (- _col1) (type: 
tinyint), _col5 (type: tinyint), ((- _col1) + _col5) (type: tinyint), _col6 
(type: double), (_col6 * UDFToDouble(((- _col1) + _col5))) (type: double), (- 
_col6) (type: double), (79.553 * _col3) (type: float), _col7 (type: double), (- 
_col6) (type: double), _col8 (type: double), (CAST( ((- _col1) + _col5) AS 
decimal(3,0)) - 10.175) (type: decimal(7,3)), (- (- _col6)) (type: double), 
(-26.28D / (- (- _col6))) (type: double), _col9 (type: float), ((_col6 * 
UDFToDouble(((- _col1) + _col5))) / UDFToDouble(_col1)) (type: double), _col10 
(type: tinyint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20
             Statistics: Num rows: 1365 Data size: 293479 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/vectorization_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_14.q.out 
b/ql/src/test/results/clientpositive/vectorization_14.q.out
index 0a0c5fb..dd28197 100644
--- a/ql/src/test/results/clientpositive/vectorization_14.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_14.q.out
@@ -88,10 +88,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterLongColLessEqualLongColumn(col 0:bigint, col 3:bigint)(children: col 
0:tinyint), FilterExprOrExpr(children: FilterDoubleColLessEqualDoubleColumn(col 
13:double, col 5:double)(children: CastLongToDouble(col 2:int) -> 13:double), 
FilterTimestampColLessTimestampColumn(col 9:timestamp, col 8:timestamp)), 
FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: 
CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: 
FilterLongColGreaterLongScalar(col 3:bigint, val -257), 
FilterDoubleColLessDoubleColumn(col 4:float, col 13:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 13:float)))
-              predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < 
ctimestamp1)) and ((cbigint > -257) or (cfloat < UDFToFloat(cint))) and 
(UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: 
boolean)
+              predicate: (((UDFToDouble(cint) <= cdouble) or (ctimestamp2 < 
ctimestamp1)) and ((cbigint > -257L) or (cfloat < UDFToFloat(cint))) and 
(UDFToLong(ctinyint) <= cbigint) and (cdouble < UDFToDouble(ctinyint))) (type: 
boolean)
               Statistics: Num rows: 606 Data size: 130292 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: ctimestamp1 (type: timestamp), cfloat (type: 
float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: 
double), (- (-26.28 + cdouble)) (type: double)
+                expressions: ctimestamp1 (type: timestamp), cfloat (type: 
float), cstring1 (type: string), cboolean1 (type: boolean), cdouble (type: 
double), (- (-26.28D + cdouble)) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
                 Select Vectorization:
                     className: VectorSelectOperator
@@ -152,7 +152,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10
           Statistics: Num rows: 303 Data size: 65146 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col3 (type: timestamp), _col1 (type: float), _col0 
(type: string), _col4 (type: boolean), _col2 (type: double), (-26.28 + _col2) 
(type: double), (- (-26.28 + _col2)) (type: double), _col5 (type: double), 
(_col1 * -26.28) (type: float), _col6 (type: float), (- _col1) (type: float), 
(- _col6) (type: float), ((- (-26.28 + _col2)) / 10.175) (type: double), _col7 
(type: double), _col8 (type: bigint), (- ((- (-26.28 + _col2)) / 10.175)) 
(type: double), (-1.389 % _col5) (type: double), (UDFToDouble(_col1) - _col2) 
(type: double), _col9 (type: double), (_col9 % 10.175) (type: double), _col10 
(type: double), (- (UDFToDouble(_col1) - _col2)) (type: double)
+            expressions: _col3 (type: timestamp), _col1 (type: float), _col0 
(type: string), _col4 (type: boolean), _col2 (type: double), (-26.28D + _col2) 
(type: double), (- (-26.28D + _col2)) (type: double), _col5 (type: double), 
(_col1 * -26.28) (type: float), _col6 (type: float), (- _col1) (type: float), 
(- _col6) (type: float), ((- (-26.28D + _col2)) / 10.175D) (type: double), 
_col7 (type: double), _col8 (type: bigint), (- ((- (-26.28D + _col2)) / 
10.175D)) (type: double), (-1.389D % _col5) (type: double), (UDFToDouble(_col1) 
- _col2) (type: double), _col9 (type: double), (_col9 % 10.175D) (type: 
double), _col10 (type: double), (- (UDFToDouble(_col1) - _col2)) (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20, _col21
             Statistics: Num rows: 303 Data size: 65146 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/vectorization_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_15.q.out 
b/ql/src/test/results/clientpositive/vectorization_15.q.out
index 3e3ceba..9101f9b 100644
--- a/ql/src/test/results/clientpositive/vectorization_15.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_15.q.out
@@ -84,7 +84,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterStringColLikeStringScalar(col 7:string, pattern %ss%), 
FilterStringColLikeStringScalar(col 6:string, pattern 10%), 
FilterExprAndExpr(children: FilterLongColGreaterEqualLongScalar(col 2:int, val 
-75), FilterLongColEqualLongColumn(col 0:smallint, col 1:smallint)(children: 
col 0:tinyint), FilterDoubleColGreaterEqualDoubleScalar(col 5:double, val 
-3728.0)))
-              predicate: (((cint >= -75) and (UDFToShort(ctinyint) = 
csmallint) and (cdouble >= -3728.0)) or (cstring1 like '10%') or (cstring2 like 
'%ss%')) (type: boolean)
+              predicate: (((cint >= -75) and (UDFToShort(ctinyint) = 
csmallint) and (cdouble >= -3728.0D)) or (cstring1 like '10%') or (cstring2 
like '%ss%')) (type: boolean)
               Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), cint (type: int), 
cfloat (type: float), cdouble (type: double), cstring1 (type: string), 
ctimestamp1 (type: timestamp), cboolean1 (type: boolean)
@@ -146,7 +146,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, 
_col7, _col8, _col9, _col10, _col11, _col12
           Statistics: Num rows: 6144 Data size: 1320982 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col0 (type: float), _col1 (type: boolean), _col2 
(type: double), _col3 (type: string), _col4 (type: tinyint), _col5 (type: int), 
_col6 (type: timestamp), _col7 (type: double), (-26.28 - CAST( _col5 AS 
decimal(10,0))) (type: decimal(13,2)), _col8 (type: double), (_col2 * 79.553) 
(type: double), (33.0 % _col0) (type: float), _col9 (type: double), _col10 
(type: double), (-23.0 % _col2) (type: double), (- _col4) (type: tinyint), 
_col11 (type: double), (UDFToFloat(_col5) - _col0) (type: float), (-23 % 
UDFToInteger(_col4)) (type: int), (- (-26.28 - CAST( _col5 AS decimal(10,0)))) 
(type: decimal(13,2)), _col12 (type: double)
+            expressions: _col0 (type: float), _col1 (type: boolean), _col2 
(type: double), _col3 (type: string), _col4 (type: tinyint), _col5 (type: int), 
_col6 (type: timestamp), _col7 (type: double), (-26.28 - CAST( _col5 AS 
decimal(10,0))) (type: decimal(13,2)), _col8 (type: double), (_col2 * 79.553D) 
(type: double), (33.0 % _col0) (type: float), _col9 (type: double), _col10 
(type: double), (-23.0D % _col2) (type: double), (- _col4) (type: tinyint), 
_col11 (type: double), (UDFToFloat(_col5) - _col0) (type: float), (-23 % 
UDFToInteger(_col4)) (type: int), (- (-26.28 - CAST( _col5 AS decimal(10,0)))) 
(type: decimal(13,2)), _col12 (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16, _col17, _col18, _col19, _col20
             Statistics: Num rows: 6144 Data size: 1320982 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/vectorization_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_16.q.out 
b/ql/src/test/results/clientpositive/vectorization_16.q.out
index 69f5982..b33c0f7 100644
--- a/ql/src/test/results/clientpositive/vectorization_16.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_16.q.out
@@ -61,7 +61,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterStringColLikeStringScalar(col 7:string, pattern %b%), 
FilterExprOrExpr(children: FilterDoubleColGreaterEqualDoubleScalar(col 
5:double, val -1.389), FilterStringGroupColLessStringScalar(col 6:string, val 
a)))
-              predicate: (((cdouble >= -1.389) or (cstring1 < 'a')) and 
(cstring2 like '%b%')) (type: boolean)
+              predicate: (((cdouble >= -1.389D) or (cstring1 < 'a')) and 
(cstring2 like '%b%')) (type: boolean)
               Statistics: Num rows: 4096 Data size: 880654 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: cdouble (type: double), cstring1 (type: string), 
ctimestamp1 (type: timestamp)
@@ -124,7 +124,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 2048 Data size: 440327 Basic stats: COMPLETE 
Column stats: NONE
           Select Operator
-            expressions: _col1 (type: string), _col0 (type: double), _col2 
(type: timestamp), (_col0 - 9763215.5639) (type: double), (- (_col0 - 
9763215.5639)) (type: double), _col3 (type: bigint), _col4 (type: double), (- 
_col4) (type: double), (_col4 * UDFToDouble(_col3)) (type: double), _col5 
(type: double), (9763215.5639 / _col0) (type: double), (CAST( _col3 AS 
decimal(19,0)) / -1.389) (type: decimal(28,6)), _col4 (type: double)
+            expressions: _col1 (type: string), _col0 (type: double), _col2 
(type: timestamp), (_col0 - 9763215.5639D) (type: double), (- (_col0 - 
9763215.5639D)) (type: double), _col3 (type: bigint), _col4 (type: double), (- 
_col4) (type: double), (_col4 * UDFToDouble(_col3)) (type: double), _col5 
(type: double), (9763215.5639D / _col0) (type: double), (CAST( _col3 AS 
decimal(19,0)) / -1.389) (type: decimal(28,6)), _col4 (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12
             Statistics: Num rows: 2048 Data size: 440327 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/vectorization_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_17.q.out 
b/ql/src/test/results/clientpositive/vectorization_17.q.out
index 7104ae5..4f0b9ac 100644
--- a/ql/src/test/results/clientpositive/vectorization_17.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_17.q.out
@@ -69,10 +69,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterLongColGreaterLongScalar(col 3:bigint, val -23), 
FilterExprOrExpr(children: FilterDoubleColNotEqualDoubleScalar(col 5:double, 
val 988888.0), FilterDecimalColGreaterDecimalScalar(col 13:decimal(13,3), val 
-863.257)(children: CastLongToDecimal(col 2:int) -> 13:decimal(13,3))), 
FilterExprOrExpr(children: FilterLongColGreaterEqualLongScalar(col 0:tinyint, 
val 33), FilterLongColGreaterEqualLongColumn(col 1:bigint, col 
3:bigint)(children: col 1:smallint), FilterDoubleColEqualDoubleColumn(col 
4:double, col 5:double)(children: col 4:float)))
-              predicate: (((cdouble <> 988888.0) or (CAST( cint AS 
decimal(13,3)) > -863.257)) and ((ctinyint >= 33) or (UDFToLong(csmallint) >= 
cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23)) (type: 
boolean)
+              predicate: (((cdouble <> 988888.0D) or (CAST( cint AS 
decimal(13,3)) > -863.257)) and ((ctinyint >= 33Y) or (UDFToLong(csmallint) >= 
cbigint) or (UDFToDouble(cfloat) = cdouble)) and (cbigint > -23L)) (type: 
boolean)
               Statistics: Num rows: 4096 Data size: 880654 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cfloat (type: float), cstring1 (type: string), 
cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), 
cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: 
double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: 
double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: 
double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: 
double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: 
decimal(11,4)), (2563.58 + (- (- cdouble))) (type: double)
+                expressions: cfloat (type: float), cstring1 (type: string), 
cint (type: int), ctimestamp1 (type: timestamp), cdouble (type: double), 
cbigint (type: bigint), (UDFToDouble(cfloat) / UDFToDouble(ctinyint)) (type: 
double), (UDFToLong(cint) % cbigint) (type: bigint), (- cdouble) (type: 
double), (cdouble + (UDFToDouble(cfloat) / UDFToDouble(ctinyint))) (type: 
double), (cdouble / UDFToDouble(cint)) (type: double), (- (- cdouble)) (type: 
double), (9763215.5639 % CAST( cbigint AS decimal(19,0))) (type: 
decimal(11,4)), (2563.58D + (- (- cdouble))) (type: double)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
                 Select Vectorization:
                     className: VectorSelectOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/vectorization_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_2.q.out 
b/ql/src/test/results/clientpositive/vectorization_2.q.out
index 6c3b277..78e24b1 100644
--- a/ql/src/test/results/clientpositive/vectorization_2.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_2.q.out
@@ -67,7 +67,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterExprAndExpr(children: FilterTimestampColLessTimestampColumn(col 
8:timestamp, col 9:timestamp), FilterStringColLikeStringScalar(col 7:string, 
pattern b%), FilterDoubleColLessEqualDoubleScalar(col 4:float, val 
-5638.14990234375)), FilterExprAndExpr(children: 
FilterDoubleColLessDoubleColumn(col 5:double, col 13:double)(children: 
CastLongToDouble(col 0:tinyint) -> 13:double), FilterExprOrExpr(children: 
FilterDoubleScalarNotEqualDoubleColumn(val -10669.0, col 13:double)(children: 
CastTimestampToDouble(col 9:timestamp) -> 13:double), 
FilterLongScalarGreaterLongColumn(val 359, col 2:int))))
-              predicate: (((cdouble < UDFToDouble(ctinyint)) and ((-10669.0 <> 
UDFToDouble(ctimestamp2)) or (359 > cint))) or ((ctimestamp1 < ctimestamp2) and 
(cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean)
+              predicate: (((cdouble < UDFToDouble(ctinyint)) and ((-10669.0D 
<> UDFToDouble(ctimestamp2)) or (359 > cint))) or ((ctimestamp1 < ctimestamp2) 
and (cstring2 like 'b%') and (cfloat <= -5638.15))) (type: boolean)
               Statistics: Num rows: 4778 Data size: 1027287 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), csmallint (type: 
smallint), cbigint (type: bigint), cfloat (type: float), cdouble (type: double)
@@ -125,7 +125,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 1 Data size: 256 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: double), (_col0 % -563.0) (type: 
double), (_col0 + 762.0) (type: double), _col1 (type: double), _col2 (type: 
double), (- _col2) (type: double), (_col1 - _col0) (type: double), _col3 (type: 
bigint), (- (_col1 - _col0)) (type: double), (_col2 - 762.0) (type: double), 
_col4 (type: tinyint), ((- _col2) + UDFToDouble(_col4)) (type: double), _col5 
(type: double), (((- _col2) + UDFToDouble(_col4)) - _col1) (type: double)
+            expressions: _col0 (type: double), (_col0 % -563.0D) (type: 
double), (_col0 + 762.0D) (type: double), _col1 (type: double), _col2 (type: 
double), (- _col2) (type: double), (_col1 - _col0) (type: double), _col3 (type: 
bigint), (- (_col1 - _col0)) (type: double), (_col2 - 762.0D) (type: double), 
_col4 (type: tinyint), ((- _col2) + UDFToDouble(_col4)) (type: double), _col5 
(type: double), (((- _col2) + UDFToDouble(_col4)) - _col1) (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
             Statistics: Num rows: 1 Data size: 256 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/vectorization_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_3.q.out 
b/ql/src/test/results/clientpositive/vectorization_3.q.out
index 0a0a3b9..4cd206f 100644
--- a/ql/src/test/results/clientpositive/vectorization_3.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_3.q.out
@@ -72,7 +72,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterExprAndExpr(children: FilterDoubleColLessEqualDoubleColumn(col 13:float, 
col 4:float)(children: CastLongToFloatViaLongToDouble(col 2:int) -> 13:float), 
FilterDecimalScalarNotEqualDecimalColumn(val 79.553, col 
14:decimal(22,3))(children: CastLongToDecimal(col 3:bigint) -> 
14:decimal(22,3)), FilterDoubleColEqualDoubleScalar(col 13:double, val 
-29071.0)(children: CastTimestampToDouble(col 9:timestamp) -> 13:double)), 
FilterExprAndExpr(children: FilterDoubleColGreaterDoubleColumn(col 13:double, 
col 5:double)(children: CastLongToDouble(col 3:bigint) -> 13:double), 
FilterDecimalScalarLessEqualDecimalColumn(val 79.553, col 
15:decimal(8,3))(children: CastLongToDecimal(col 1:smallint) -> 
15:decimal(8,3)), FilterTimestampColGreaterTimestampColumn(col 8:timestamp, col 
9:timestamp)))
-              predicate: (((UDFToDouble(cbigint) > cdouble) and (79.553 <= 
CAST( csmallint AS decimal(8,3))) and (ctimestamp1 > ctimestamp2)) or 
((UDFToFloat(cint) <= cfloat) and (79.553 <> CAST( cbigint AS decimal(22,3))) 
and (UDFToDouble(ctimestamp2) = -29071.0))) (type: boolean)
+              predicate: (((UDFToDouble(cbigint) > cdouble) and (79.553 <= 
CAST( csmallint AS decimal(8,3))) and (ctimestamp1 > ctimestamp2)) or 
((UDFToFloat(cint) <= cfloat) and (79.553 <> CAST( cbigint AS decimal(22,3))) 
and (UDFToDouble(ctimestamp2) = -29071.0D))) (type: boolean)
               Statistics: Num rows: 2503 Data size: 538153 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), csmallint (type: 
smallint), cint (type: int), cfloat (type: float)
@@ -130,7 +130,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
           Statistics: Num rows: 1 Data size: 404 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: double), (_col0 - 10.175) (type: 
double), _col1 (type: double), (_col0 * (_col0 - 10.175)) (type: double), (- 
_col1) (type: double), (_col0 % 79.553) (type: double), (- (_col0 * (_col0 - 
10.175))) (type: double), _col2 (type: double), (- _col0) (type: double), _col3 
(type: double), ((- (_col0 * (_col0 - 10.175))) / (_col0 - 10.175)) (type: 
double), (- (_col0 - 10.175)) (type: double), _col4 (type: double), (-3728.0 - 
_col0) (type: double), _col5 (type: double), (_col4 / _col2) (type: double)
+            expressions: _col0 (type: double), (_col0 - 10.175D) (type: 
double), _col1 (type: double), (_col0 * (_col0 - 10.175D)) (type: double), (- 
_col1) (type: double), (_col0 % 79.553D) (type: double), (- (_col0 * (_col0 - 
10.175D))) (type: double), _col2 (type: double), (- _col0) (type: double), 
_col3 (type: double), ((- (_col0 * (_col0 - 10.175D))) / (_col0 - 10.175D)) 
(type: double), (- (_col0 - 10.175D)) (type: double), _col4 (type: double), 
(-3728.0D - _col0) (type: double), _col5 (type: double), (_col4 / _col2) (type: 
double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15
             Statistics: Num rows: 1 Data size: 404 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/vectorization_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_4.q.out 
b/ql/src/test/results/clientpositive/vectorization_4.q.out
index ee61869..dcc5f2c 100644
--- a/ql/src/test/results/clientpositive/vectorization_4.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_4.q.out
@@ -67,7 +67,7 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprOrExpr(children: 
FilterLongColGreaterEqualLongColumn(col 1:int, col 2:int)(children: col 
1:smallint), FilterExprAndExpr(children: 
FilterLongScalarGreaterEqualLongColumn(val -89010, col 0:int)(children: col 
0:tinyint), FilterDoubleColGreaterDoubleScalar(col 5:double, val 79.553)), 
FilterExprAndExpr(children: FilterLongScalarNotEqualLongColumn(val -563, col 
3:bigint), FilterExprOrExpr(children: FilterLongColNotEqualLongColumn(col 
0:bigint, col 3:bigint)(children: col 0:tinyint), 
FilterDoubleScalarGreaterEqualDoubleColumn(val -3728.0, col 5:double))))
-              predicate: (((-563 <> cbigint) and ((UDFToLong(ctinyint) <> 
cbigint) or (-3728.0 >= cdouble))) or ((-89010 >= UDFToInteger(ctinyint)) and 
(cdouble > 79.553)) or (UDFToInteger(csmallint) >= cint)) (type: boolean)
+              predicate: (((-563L <> cbigint) and ((UDFToLong(ctinyint) <> 
cbigint) or (-3728.0D >= cdouble))) or ((-89010 >= UDFToInteger(ctinyint)) and 
(cdouble > 79.553D)) or (UDFToInteger(csmallint) >= cint)) (type: boolean)
               Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 expressions: ctinyint (type: tinyint), cint (type: int), 
cdouble (type: double)
@@ -125,7 +125,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1 Data size: 252 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: bigint), (_col0 * -563) (type: bigint), 
(-3728 + _col0) (type: bigint), _col1 (type: double), (- _col1) (type: double), 
_col2 (type: double), ((_col0 * -563) % _col0) (type: bigint), 
(UDFToDouble(((_col0 * -563) % _col0)) / _col2) (type: double), _col3 (type: 
double), (- (UDFToDouble(((_col0 * -563) % _col0)) / _col2)) (type: double), 
((-3728 + _col0) - (_col0 * -563)) (type: bigint), _col4 (type: tinyint), _col4 
(type: tinyint), (UDFToDouble(_col4) * (- (UDFToDouble(((_col0 * -563) % 
_col0)) / _col2))) (type: double)
+            expressions: _col0 (type: bigint), (_col0 * -563L) (type: bigint), 
(-3728L + _col0) (type: bigint), _col1 (type: double), (- _col1) (type: 
double), _col2 (type: double), ((_col0 * -563L) % _col0) (type: bigint), 
(UDFToDouble(((_col0 * -563L) % _col0)) / _col2) (type: double), _col3 (type: 
double), (- (UDFToDouble(((_col0 * -563L) % _col0)) / _col2)) (type: double), 
((-3728L + _col0) - (_col0 * -563L)) (type: bigint), _col4 (type: tinyint), 
_col4 (type: tinyint), (UDFToDouble(_col4) * (- (UDFToDouble(((_col0 * -563L) % 
_col0)) / _col2))) (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13
             Statistics: Num rows: 1 Data size: 252 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/vectorization_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_5.q.out 
b/ql/src/test/results/clientpositive/vectorization_5.q.out
index 13fa89b..fc6d69b 100644
--- a/ql/src/test/results/clientpositive/vectorization_5.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_5.q.out
@@ -119,7 +119,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 1 Data size: 28 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            expressions: _col0 (type: smallint), (UDFToInteger(_col0) * -75) 
(type: int), _col1 (type: bigint), (UDFToDouble((UDFToInteger(_col0) * -75)) / 
UDFToDouble(_col1)) (type: double), (6981 * UDFToInteger(_col0)) (type: int), 
_col2 (type: smallint), (- _col2) (type: smallint), (197.0 % 
(UDFToDouble((UDFToInteger(_col0) * -75)) / UDFToDouble(_col1))) (type: 
double), _col3 (type: bigint), _col4 (type: tinyint), (- _col4) (type: 
tinyint), ((- _col4) + _col4) (type: tinyint)
+            expressions: _col0 (type: smallint), (UDFToInteger(_col0) * -75) 
(type: int), _col1 (type: bigint), (UDFToDouble((UDFToInteger(_col0) * -75)) / 
UDFToDouble(_col1)) (type: double), (6981 * UDFToInteger(_col0)) (type: int), 
_col2 (type: smallint), (- _col2) (type: smallint), (197.0D % 
(UDFToDouble((UDFToInteger(_col0) * -75)) / UDFToDouble(_col1))) (type: 
double), _col3 (type: bigint), _col4 (type: tinyint), (- _col4) (type: 
tinyint), ((- _col4) + _col4) (type: tinyint)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
             Statistics: Num rows: 1 Data size: 28 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/vectorization_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vectorization_6.q.out 
b/ql/src/test/results/clientpositive/vectorization_6.q.out
index f2204fc..c29a377 100644
--- a/ql/src/test/results/clientpositive/vectorization_6.q.out
+++ b/ql/src/test/results/clientpositive/vectorization_6.q.out
@@ -63,10 +63,10 @@ STAGE PLANS:
                   className: VectorFilterOperator
                   native: true
                   predicateExpression: FilterExprAndExpr(children: 
FilterLongColNotEqualLongScalar(col 0:tinyint, val 0), 
FilterExprOrExpr(children: FilterExprAndExpr(children: 
FilterLongColLessEqualLongScalar(col 10:boolean, val 0), 
FilterLongColGreaterEqualLongColumn(col 11:boolean, col 10:boolean)), 
FilterExprAndExpr(children: SelectColumnIsNotNull(col 3:bigint), 
FilterExprOrExpr(children: FilterStringColLikeStringScalar(col 7:string, 
pattern %a), FilterDoubleColLessEqualDoubleScalar(col 4:float, val -257.0)))))
-              predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or 
(cbigint is not null and ((cstring2 like '%a') or (cfloat <= -257)))) and 
(ctinyint <> 0)) (type: boolean)
+              predicate: ((((cboolean1 <= 0) and (cboolean2 >= cboolean1)) or 
(cbigint is not null and ((cstring2 like '%a') or (cfloat <= -257)))) and 
(ctinyint <> 0Y)) (type: boolean)
               Statistics: Num rows: 11605 Data size: 2495116 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
-                expressions: cboolean1 (type: boolean), cfloat (type: float), 
cstring1 (type: string), (988888 * UDFToInteger(csmallint)) (type: int), (- 
csmallint) (type: smallint), (- cfloat) (type: float), (-26.28 / 
UDFToDouble(cfloat)) (type: double), (cfloat * 359.0) (type: float), (cint % 
UDFToInteger(ctinyint)) (type: int), (- cdouble) (type: double), 
(UDFToInteger(ctinyint) - -75) (type: int), (762 * (cint % 
UDFToInteger(ctinyint))) (type: int)
+                expressions: cboolean1 (type: boolean), cfloat (type: float), 
cstring1 (type: string), (988888 * UDFToInteger(csmallint)) (type: int), (- 
csmallint) (type: smallint), (- cfloat) (type: float), (-26.28D / 
UDFToDouble(cfloat)) (type: double), (cfloat * 359.0) (type: float), (cint % 
UDFToInteger(ctinyint)) (type: int), (- cdouble) (type: double), 
(UDFToInteger(ctinyint) - -75) (type: int), (762 * (cint % 
UDFToInteger(ctinyint))) (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
                 Select Vectorization:
                     className: VectorSelectOperator

Reply via email to