http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/llap/vectorized_date_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_date_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_date_funcs.q.out
index 1908418..15cd648 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_date_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_date_funcs.q.out
@@ -562,8 +562,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [0, 3, 4, 5, 6, 7, 8, 9, 0, 
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
-                        selectExpressions: VectorUDFUnixTimeStampDate(col 0) 
-> 3:bigint, VectorUDFYearDate(col 0, field YEAR) -> 4:int, 
VectorUDFMonthDate(col 0, field MONTH) -> 5:int, VectorUDFDayOfMonthDate(col 0, 
field DAY_OF_MONTH) -> 6:int, VectorUDFDayOfMonthDate(col 0, field 
DAY_OF_MONTH) -> 7:int, VectorUDFDayOfWeekDate(col 0, field DAY_OF_WEEK) -> 
8:int, VectorUDFWeekOfYearDate(col 0, field WEEK_OF_YEAR) -> 9:int, 
VectorUDFDateLong(col 0:date) -> 10:date, VectorUDFDateAddColScalar(col 0:date, 
val 2) -> 11:date, VectorUDFDateSubColScalar(col 0:date, val 2) -> 12:date, 
VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 13:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 14:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 15:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 16:int, 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 17:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 18:int, 
VectorUDFDateDiffColScalar(col 0:date, va
 l NULL) -> 19:int, VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 20:int
+                        projectedOutputColumnNums: [0, 3, 4, 5, 6, 7, 8, 9, 0, 
0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+                        selectExpressions: VectorUDFUnixTimeStampDate(col 0) 
-> 3:bigint, VectorUDFYearDate(col 0, field YEAR) -> 4:int, 
VectorUDFMonthDate(col 0, field MONTH) -> 5:int, VectorUDFDayOfMonthDate(col 0, 
field DAY_OF_MONTH) -> 6:int, VectorUDFDayOfMonthDate(col 0, field 
DAY_OF_MONTH) -> 7:int, VectorUDFDayOfWeekDate(col 0, field DAY_OF_WEEK) -> 
8:int, VectorUDFWeekOfYearDate(col 0, field WEEK_OF_YEAR) -> 9:int, 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 10:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 11:date, 
VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 12:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 13:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 14:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 15:int, 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 16:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 17:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 18:int, 
VectorUDFDateDiffColSca
 lar(col 0:date, val NULL) -> 19:int
                     Statistics: Num rows: 137 Data size: 7392 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -858,8 +858,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [1, 0, 5, 6, 7, 8, 9, 10, 
4, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]
-                        selectExpressions: LongColEqualLongColumn(col 3:int, 
col 4:int)(children: VectorUDFYearTimestamp(col 1:timestamp, field YEAR) -> 
3:int, VectorUDFYearDate(col 0, field YEAR) -> 4:int) -> 5:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 3:int, 
VectorUDFMonthDate(col 0, field MONTH) -> 4:int) -> 6:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 3:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 4:int) -> 7:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 3:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 4:int) -> 8:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfWeekTimestamp(col 1:timestamp, field DAY_OF_WEEK) -> 3:int, 
VectorUDFDayOfWeekDate(col 0, field DAY_OF_WEEK) -> 4
 :int) -> 9:boolean, LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFWeekOfYearTimestamp(col 1:timestamp, field WEEK_OF_YEAR) -> 3:int, 
VectorUDFWeekOfYearDate(col 0, field WEEK_OF_YEAR) -> 4:int) -> 10:boolean, 
LongColEqualLongColumn(col 3:date, col 0:date)(children: 
CastTimestampToDate(col 1:timestamp) -> 3:date) -> 4:boolean, 
LongColEqualLongColumn(col 3:date, col 11:date)(children: 
VectorUDFDateTimestamp(col 1:timestamp) -> 3:date, VectorUDFDateLong(col 
0:date) -> 11:date) -> 12:boolean, LongColEqualLongColumn(col 3:date, col 
11:date)(children: VectorUDFDateAddColScalar(col 1:timestamp, val 2) -> 3:date, 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 11:date) -> 13:boolean, 
LongColEqualLongColumn(col 3:date, col 11:date)(children: 
VectorUDFDateSubColScalar(col 1:timestamp, val 2) -> 3:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 11:date) -> 14:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val
  2000-01-01) -> 3:int, VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) 
-> 11:int) -> 15:boolean, LongColEqualLongColumn(col 3:int, col 
11:int)(children: VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 
3:int, VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 
16:boolean, LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 17:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 18:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val 2007-03-14) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 11:int) -> 
19:boolean, LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, v
 al NULL) -> 3:int, VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) 
-> 20:boolean, LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 21:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 22:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 23:boolean, 
LongColEqualLongColumn(col 3:int, col 11:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 11:int) -> 24:boolean
+                        projectedOutputColumnNums: [1, 0, 5, 6, 7, 8, 9, 10, 
4, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]
+                        selectExpressions: LongColEqualLongColumn(col 3:int, 
col 4:int)(children: VectorUDFYearTimestamp(col 1:timestamp, field YEAR) -> 
3:int, VectorUDFYearDate(col 0, field YEAR) -> 4:int) -> 5:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 3:int, 
VectorUDFMonthDate(col 0, field MONTH) -> 4:int) -> 6:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 3:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 4:int) -> 7:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 3:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 4:int) -> 8:boolean, 
LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFDayOfWeekTimestamp(col 1:timestamp, field DAY_OF_WEEK) -> 3:int, 
VectorUDFDayOfWeekDate(col 0, field DAY_OF_WEEK) -> 4
 :int) -> 9:boolean, LongColEqualLongColumn(col 3:int, col 4:int)(children: 
VectorUDFWeekOfYearTimestamp(col 1:timestamp, field WEEK_OF_YEAR) -> 3:int, 
VectorUDFWeekOfYearDate(col 0, field WEEK_OF_YEAR) -> 4:int) -> 10:boolean, 
LongColEqualLongColumn(col 3:date, col 0:date)(children: 
CastTimestampToDate(col 1:timestamp) -> 3:date) -> 4:boolean, 
LongColEqualLongColumn(col 3:date, col 0:date)(children: 
VectorUDFDateTimestamp(col 1:timestamp) -> 3:date, col 0:date) -> 11:boolean, 
LongColEqualLongColumn(col 3:date, col 12:date)(children: 
VectorUDFDateAddColScalar(col 1:timestamp, val 2) -> 3:date, 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 12:date) -> 13:boolean, 
LongColEqualLongColumn(col 3:date, col 12:date)(children: 
VectorUDFDateSubColScalar(col 1:timestamp, val 2) -> 3:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 12:date) -> 14:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val 2000-01-01) -> 3:int, VectorUD
 FDateDiffColScalar(col 0:date, val 2000-01-01) -> 12:int) -> 15:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 16:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 17:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 18:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val 2007-03-14) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 12:int) -> 
19:boolean, LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, VectorUDFDat
 eDiffColScalar(col 0:date, val NULL) -> 12:int) -> 20:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 21:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 22:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 23:boolean, 
LongColEqualLongColumn(col 3:int, col 12:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 3:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 12:int) -> 24:boolean
                     Statistics: Num rows: 137 Data size: 12672 Basic stats: 
COMPLETE Column stats: NONE
                     File Output Operator
                       compressed: false
@@ -1126,8 +1126,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [0, 4, 5, 6, 7, 9]
-                        selectExpressions: VectorUDFDateLong(col 
3:date)(children: VectorUDFDateAddColScalar(col 0:date, val 2) -> 3:date) -> 
4:date, VectorUDFDateLong(col 3:date)(children: VectorUDFDateSubColScalar(col 
0:date, val 2) -> 3:date) -> 5:date, VectorUDFDateDiffColCol(col 0:date, col 
3:date)(children: VectorUDFDateAddColScalar(col 0:date, val 2) -> 3:date) -> 
6:int, VectorUDFDateDiffColCol(col 0:date, col 3:date)(children: 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 3:date) -> 7:int, 
VectorUDFDateDiffColCol(col 3:date, col 8:date)(children: 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 3:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 8:date) -> 9:int
+                        projectedOutputColumnNums: [0, 3, 4, 6, 7, 9]
+                        selectExpressions: VectorUDFDateAddColScalar(col 
0:date, val 2) -> 3:date, VectorUDFDateSubColScalar(col 0:date, val 2) -> 
4:date, VectorUDFDateDiffColCol(col 0:date, col 5:date)(children: 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 5:date) -> 6:int, 
VectorUDFDateDiffColCol(col 0:date, col 5:date)(children: 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 5:date) -> 7:int, 
VectorUDFDateDiffColCol(col 5:date, col 8:date)(children: 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 5:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 8:date) -> 9:int
                     Statistics: Num rows: 137 Data size: 7392 Basic stats: 
COMPLETE Column stats: NONE
                     Limit
                       Number of rows: 10

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
index 4edd0e4..9033b88 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_funcs.q.out
@@ -1310,7 +1310,7 @@ STAGE PLANS:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine tez IN [tez, spark] IS true
                 allNative: false
-                usesVectorUDFAdaptor: true
+                usesVectorUDFAdaptor: false
                 vectorized: true
             Reduce Operator Tree:
               Group By Operator
@@ -1332,7 +1332,7 @@ STAGE PLANS:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [5, 7, 8, 11, 6, 12, 13, 14]
-                      selectExpressions: RoundWithNumDigitsDoubleToDouble(col 
4, decimalPlaces 0)(children: DoubleColDivideLongColumn(col 0:double, col 
1:bigint) -> 4:double) -> 5:double, VectorUDFAdaptor(((_col2 - ((_col3 * _col3) 
/ _col1)) / _col1) BETWEEN 8.97077295279421E19D AND 
8.97077295279422E19D)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, col 
6:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 7:boolean, 
VectorUDFAdaptor(((_col2 - ((_col3 * _col3) / _col1)) / _col1) BETWEEN 
8.97077295279421E19D AND 8.97077295279422E19D)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:d
 ouble, col 3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 
8:boolean, VectorUDFAdaptor(((_col2 - ((_col3 * _col3) / _col1)) / CASE WHEN 
((_col1 = 1L)) THEN (null) ELSE ((_col1 - 1)) END) BETWEEN 9.20684592523616E19D 
AND 9.20684592523617E19D)(children: DoubleColDivideLongColumn(col 4:double, col 
11:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, col 
6:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 6:double) -> 4:double, IfExprNullCondExpr(col 9:boolean, null, 
col 10:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
9:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 10:bigint) -> 
11:bigint) -> 6:double) -> 11:boolean, RoundWithNumDigitsDoubleToDouble(col 4, 
decimalPlaces 3)(children: FuncPowerDoubleToDouble(col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn
 (col 2:double, col 6:double)(children: DoubleColDivideLongColumn(col 4:double, 
col 1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 
3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 4:double) -> 
6:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 12:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 12:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 12:double) -> 4:double) -> 12:double) -> 4:double) -> 
12:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 13:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 13:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(chi
 ldren: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) 
-> 13:double) -> 4:double) -> 13:double) -> 4:double) -> 13:double, 
RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 14:double)(children: DoubleColDivideLongColumn(col 
4:double, col 17:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 14:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 14:double) -> 4:double, IfExprNullCondExpr(col 15:boolean, 
null, col 16:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
15:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 16:bigint) -> 
17:bigint) -> 14:double) -> 4:double) -> 14:double
+                      selectExpressions: RoundWithNumDigitsDoubleToDouble(col 
4, decimalPlaces 0)(children: DoubleColDivideLongColumn(col 0:double, col 
1:bigint) -> 4:double) -> 5:double, DoubleColumnBetween(col 6:double, left 
8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double) -> 6:double) -> 7:boolean, DoubleColumnBetween(col 
6:double, left 8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double) ->
  6:double) -> 8:boolean, DoubleColumnBetween(col 6:double, left 
9.20684592523616E19, right 9.20684592523617E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 11:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double, IfExprNullCondExpr(col 9:boolean, null, col 
10:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 9:boolean, 
LongColSubtractLongScalar(col 1:bigint, val 1) -> 10:bigint) -> 11:bigint) -> 
6:double) -> 11:boolean, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 
3)(children: FuncPowerDoubleToDouble(col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, 
 col 3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 4:double) 
-> 6:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 12:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 12:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 12:double) -> 4:double) -> 12:double) -> 4:double) -> 
12:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 13:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 13:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 13:double) -> 4:double) -> 13:double) -> 4:double) -> 
13:double, R
 oundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 14:double)(children: DoubleColDivideLongColumn(col 
4:double, col 17:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 14:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 14:double) -> 4:double, IfExprNullCondExpr(col 15:boolean, 
null, col 16:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
15:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 16:bigint) -> 
17:bigint) -> 14:double) -> 4:double) -> 14:double
                   Statistics: Num rows: 1 Data size: 52 Basic stats: COMPLETE 
Column stats: COMPLETE
                   File Output Operator
                     compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out 
b/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out
index bc92af4..d174a00 100644
--- a/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out
+++ b/ql/src/test/results/clientpositive/parquet_vectorization_10.q.out
@@ -79,7 +79,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [5, 8, 0, 10, 6, 13, 17, 16, 
18, 20, 21, 19, 23, 24, 26]
-                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: col 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
DoubleColAddDoubleColumn(col 5:double, col 24:double)(children: 
CastLongToDouble(col 1:smal
 lint) -> 24:double) -> 25:double) -> 24:double, DoubleColUnaryMinus(col 
25:double)(children: DoubleColUnaryMinus(col 5:double) -> 25:double) -> 
26:double
+                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
DoubleColAd
 dDoubleColumn(col 5:double, col 24:double)(children: CastLongToDouble(col 
1:smallint) -> 24:double) -> 25:double) -> 24:double, DoubleColUnaryMinus(col 
25:double)(children: DoubleColUnaryMinus(col 5:double) -> 25:double) -> 
26:double
                 Statistics: Num rows: 9557 Data size: 114684 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out 
b/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out
index 011dbb0..0630e8b 100644
--- a/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out
+++ b/ql/src/test/results/clientpositive/parquet_vectorization_7.q.out
@@ -85,7 +85,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [10, 3, 1, 0, 8, 6, 14, 15, 16, 
17, 19, 20, 18, 21, 23]
-                    selectExpressions: LongColAddLongColumn(col 3:bigint, col 
3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val -257)(children: 
col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 16:smallint, 
LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, LongColAddLongScalar(col 
18:int, val 17)(children: col 18:tinyint) -> 19:int, 
LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: col 
18:smallint) -> 20:bigint, LongColModuloLongColumn(col 2:int, col 
1:int)(children: col 1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 
21:tinyint, LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
+                    selectExpressions: LongColAddLongColumn(col 3:bigint, col 
3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val -257)(children: 
col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 16:smallint, 
LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, LongColAddLongScalar(col 
18:int, val 17)(children: LongColUnaryMinus(col 0:tinyint) -> 18:tinyint) -> 
19:int, LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: 
LongColUnaryMinus(col 1:smallint) -> 18:smallint) -> 20:bigint, 
LongColModuloLongColumn(col 2:int, col 1:int)(children: col 1:smallint) -> 
18:int, LongColUnaryMinus(col 0:tinyint) -> 21:tinyint, 
LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
                 Statistics: Num rows: 5461 Data size: 65532 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: boolean), _col1 (type: 
bigint), _col2 (type: smallint), _col3 (type: tinyint), _col4 (type: 
timestamp), _col5 (type: string), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: smallint), _col9 (type: tinyint), _col10 (type: int), _col11 
(type: bigint), _col12 (type: int), _col13 (type: tinyint), _col14 (type: 
tinyint)
@@ -306,7 +306,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [10, 3, 1, 0, 8, 6, 14, 15, 16, 
17, 19, 20, 18, 21, 23]
-                    selectExpressions: LongColAddLongColumn(col 3:bigint, col 
3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val -257)(children: 
col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 16:smallint, 
LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, LongColAddLongScalar(col 
18:int, val 17)(children: col 18:tinyint) -> 19:int, 
LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: col 
18:smallint) -> 20:bigint, LongColModuloLongColumn(col 2:int, col 
1:int)(children: col 1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 
21:tinyint, LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
+                    selectExpressions: LongColAddLongColumn(col 3:bigint, col 
3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val -257)(children: 
col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 16:smallint, 
LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, LongColAddLongScalar(col 
18:int, val 17)(children: LongColUnaryMinus(col 0:tinyint) -> 18:tinyint) -> 
19:int, LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: 
LongColUnaryMinus(col 1:smallint) -> 18:smallint) -> 20:bigint, 
LongColModuloLongColumn(col 2:int, col 1:int)(children: col 1:smallint) -> 
18:int, LongColUnaryMinus(col 0:tinyint) -> 21:tinyint, 
LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
                 Statistics: Num rows: 5461 Data size: 65532 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: boolean), _col1 (type: 
bigint), _col2 (type: smallint), _col3 (type: tinyint), _col4 (type: 
timestamp), _col5 (type: string), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: smallint), _col9 (type: tinyint), _col10 (type: int), _col11 
(type: bigint), _col12 (type: int), _col13 (type: tinyint), _col14 (type: 
tinyint)

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out 
b/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out
index 38c59bd..b4481bf 100644
--- a/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out
+++ b/ql/src/test/results/clientpositive/parquet_vectorization_8.q.out
@@ -81,7 +81,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [8, 5, 10, 6, 4, 13, 14, 15, 
17, 19, 16, 18, 20, 22]
-                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, col 
23:float) -> 22:double
+                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, 
DoubleColAddDoubleColumn(col 22:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 22:float) -> 23:float) -> 22:double
                 Statistics: Num rows: 12288 Data size: 147456 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: timestamp), _col1 (type: 
double), _col2 (type: boolean), _col3 (type: string), _col4 (type: float), 
_col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: 
float), _col9 (type: double), _col10 (type: double), _col11 (type: float), 
_col12 (type: float), _col13 (type: double)
@@ -289,7 +289,7 @@ STAGE PLANS:
                     className: VectorSelectOperator
                     native: true
                     projectedOutputColumnNums: [8, 5, 10, 6, 4, 13, 14, 15, 
17, 19, 16, 18, 20, 22]
-                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, col 
23:float) -> 22:double
+                    selectExpressions: DoubleColUnaryMinus(col 5:double) -> 
13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, 
DoubleColAddDoubleColumn(col 22:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 22:float) -> 23:float) -> 22:double
                 Statistics: Num rows: 12288 Data size: 147456 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: timestamp), _col1 (type: 
double), _col2 (type: boolean), _col3 (type: string), _col4 (type: float), 
_col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: 
float), _col9 (type: double), _col10 (type: double), _col11 (type: float), 
_col12 (type: float), _col13 (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out 
b/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out
index dfb187f..4305fee 100644
--- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_10.q.out
@@ -82,7 +82,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [5, 8, 0, 10, 6, 13, 17, 
16, 18, 20, 21, 19, 23, 24, 26]
-                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: col 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
DoubleColAddDoubleColumn(col 5:double, col 24:double)(children: 
CastLongToDouble(col 
 1:smallint) -> 24:double) -> 25:double) -> 24:double, DoubleColUnaryMinus(col 
25:double)(children: DoubleColUnaryMinus(col 5:double) -> 25:double) -> 
26:double
+                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
Doubl
 eColAddDoubleColumn(col 5:double, col 24:double)(children: 
CastLongToDouble(col 1:smallint) -> 24:double) -> 25:double) -> 24:double, 
DoubleColUnaryMinus(col 25:double)(children: DoubleColUnaryMinus(col 5:double) 
-> 25:double) -> 26:double
                       Statistics: Num rows: 9557 Data size: 114684 Basic 
stats: COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out 
b/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out
index 552b5d1..67cd1fe 100644
--- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_7.q.out
@@ -90,7 +90,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [10, 3, 1, 0, 8, 6, 14, 
15, 16, 17, 19, 20, 18, 21, 23]
-                          selectExpressions: LongColAddLongColumn(col 
3:bigint, col 3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val 
-257)(children: col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 
16:smallint, LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, 
LongColAddLongScalar(col 18:int, val 17)(children: col 18:tinyint) -> 19:int, 
LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: col 
18:smallint) -> 20:bigint, LongColModuloLongColumn(col 2:int, col 
1:int)(children: col 1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 
21:tinyint, LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
+                          selectExpressions: LongColAddLongColumn(col 
3:bigint, col 3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val 
-257)(children: col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 
16:smallint, LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, 
LongColAddLongScalar(col 18:int, val 17)(children: LongColUnaryMinus(col 
0:tinyint) -> 18:tinyint) -> 19:int, LongColMultiplyLongColumn(col 3:bigint, 
col 18:bigint)(children: LongColUnaryMinus(col 1:smallint) -> 18:smallint) -> 
20:bigint, LongColModuloLongColumn(col 2:int, col 1:int)(children: col 
1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 21:tinyint, 
LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
                       Statistics: Num rows: 5461 Data size: 65532 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: boolean), _col1 (type: 
bigint), _col2 (type: smallint), _col3 (type: tinyint), _col4 (type: 
timestamp), _col5 (type: string), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: smallint), _col9 (type: tinyint), _col10 (type: int), _col11 
(type: bigint), _col12 (type: int), _col13 (type: tinyint), _col14 (type: 
tinyint)
@@ -338,7 +338,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [10, 3, 1, 0, 8, 6, 14, 
15, 16, 17, 19, 20, 18, 21, 23]
-                          selectExpressions: LongColAddLongColumn(col 
3:bigint, col 3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val 
-257)(children: col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 
16:smallint, LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, 
LongColAddLongScalar(col 18:int, val 17)(children: col 18:tinyint) -> 19:int, 
LongColMultiplyLongColumn(col 3:bigint, col 18:bigint)(children: col 
18:smallint) -> 20:bigint, LongColModuloLongColumn(col 2:int, col 
1:int)(children: col 1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 
21:tinyint, LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
+                          selectExpressions: LongColAddLongColumn(col 
3:bigint, col 3:bigint) -> 14:bigint, LongColModuloLongScalar(col 1:int, val 
-257)(children: col 1:smallint) -> 15:int, LongColUnaryMinus(col 1:smallint) -> 
16:smallint, LongColUnaryMinus(col 0:tinyint) -> 17:tinyint, 
LongColAddLongScalar(col 18:int, val 17)(children: LongColUnaryMinus(col 
0:tinyint) -> 18:tinyint) -> 19:int, LongColMultiplyLongColumn(col 3:bigint, 
col 18:bigint)(children: LongColUnaryMinus(col 1:smallint) -> 18:smallint) -> 
20:bigint, LongColModuloLongColumn(col 2:int, col 1:int)(children: col 
1:smallint) -> 18:int, LongColUnaryMinus(col 0:tinyint) -> 21:tinyint, 
LongColModuloLongColumn(col 22:tinyint, col 0:tinyint)(children: 
LongColUnaryMinus(col 0:tinyint) -> 22:tinyint) -> 23:tinyint
                       Statistics: Num rows: 5461 Data size: 65532 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: boolean), _col1 (type: 
bigint), _col2 (type: smallint), _col3 (type: tinyint), _col4 (type: 
timestamp), _col5 (type: string), _col6 (type: bigint), _col7 (type: int), 
_col8 (type: smallint), _col9 (type: tinyint), _col10 (type: int), _col11 
(type: bigint), _col12 (type: int), _col13 (type: tinyint), _col14 (type: 
tinyint)

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out 
b/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out
index 9802ef2..8de1d3b 100644
--- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_8.q.out
@@ -86,7 +86,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [8, 5, 10, 6, 4, 13, 14, 
15, 17, 19, 16, 18, 20, 22]
-                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, col 
23:float) -> 22:double
+                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, 
DoubleColAddDoubleColumn(col 22:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 22:float) -> 23:float) -> 22:dou
 ble
                       Statistics: Num rows: 12288 Data size: 147456 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: timestamp), _col1 (type: 
double), _col2 (type: boolean), _col3 (type: string), _col4 (type: float), 
_col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: 
float), _col9 (type: double), _col10 (type: double), _col11 (type: float), 
_col12 (type: float), _col13 (type: double)
@@ -321,7 +321,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [8, 5, 10, 6, 4, 13, 14, 
15, 17, 19, 16, 18, 20, 22]
-                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, col 
23:float) -> 22:double
+                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 
14:double, DoubleColMultiplyDoubleScalar(col 5:double, val -257.0) -> 
15:double, DoubleColAddDoubleColumn(col 16:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 16:float) -> 17:float, 
DoubleColAddDoubleColumn(col 16:double, col 18:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 16:double, CastLongToDouble(col 3:bigint) 
-> 18:double) -> 19:double, DoubleColUnaryMinus(col 5:double) -> 16:double, 
DoubleScalarSubtractDoubleColumn(val -1.3890000581741333, col 4:float) -> 
18:float, DoubleColUnaryMinus(col 4:float) -> 20:float, 
DoubleColAddDoubleColumn(col 21:double, col 23:double)(children: 
DoubleScalarSubtractDoubleColumn(val -5638.15, col 5:double) -> 21:double, 
DoubleColAddDoubleColumn(col 22:float, col 4:float)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 22:float) -> 23:float) -> 22:dou
 ble
                       Statistics: Num rows: 12288 Data size: 147456 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: timestamp), _col1 (type: 
double), _col2 (type: boolean), _col3 (type: string), _col4 (type: float), 
_col5 (type: double), _col6 (type: double), _col7 (type: double), _col8 (type: 
float), _col9 (type: double), _col10 (type: double), _col11 (type: float), 
_col12 (type: float), _col13 (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out
 
b/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out
index e988760..5e936fc 100644
--- 
a/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/spark_vectorized_dynamic_partition_pruning.q.out
@@ -1617,7 +1617,7 @@ STAGE PLANS:
                       Reduce Sink Vectorization:
                           className: VectorReduceSinkMultiKeyOperator
                           keyColumnNums: [7]
-                          keyExpressions: CastLongToDecimal(col 
6:smallint)(children: col 6:int) -> 7:decimal(10,0)
+                          keyExpressions: CastLongToDecimal(col 
6:smallint)(children: VectorUDFDayOfMonthDate(col 5, field 
DAY_OF_MONTH)(children: CastStringToDate(col 2:string) -> 5:date) -> 6:int) -> 
7:decimal(10,0)
                           native: true
                           nativeConditionsMet: 
hive.vectorized.execution.reducesink.new.enabled IS true, hive.execution.engine 
spark IN [tez, spark] IS true, No PTF TopN IS true, No DISTINCT columns IS 
true, BinarySortableSerDe for keys IS true, LazyBinarySerDe for values IS true
                           valueColumnNums: []

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/vector_between_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vector_between_in.q.out 
b/ql/src/test/results/clientpositive/spark/vector_between_in.q.out
index 78bcd26..8b1a2be 100644
--- a/ql/src/test/results/clientpositive/spark/vector_between_in.q.out
+++ b/ql/src/test/results/clientpositive/spark/vector_between_in.q.out
@@ -1369,7 +1369,7 @@ STAGE PLANS:
                         className: VectorSelectOperator
                         native: true
                         projectedOutputColumnNums: [5]
-                        selectExpressions: VectorUDFAdaptor(cdate BETWEEN 
DATE'1969-12-30' AND DATE'1970-01-02') -> 5:boolean
+                        selectExpressions: LongColumnBetween(col 3:date, left 
-2, right 1) -> 5:boolean
                     Statistics: Num rows: 12289 Data size: 2467616 Basic 
stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -1403,7 +1403,7 @@ STAGE PLANS:
                 featureSupportInUse: [DECIMAL_64]
                 inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                 allNative: false
-                usesVectorUDFAdaptor: true
+                usesVectorUDFAdaptor: false
                 vectorized: true
         Reducer 2 
             Execution mode: vectorized
@@ -1505,7 +1505,7 @@ STAGE PLANS:
                         className: VectorSelectOperator
                         native: true
                         projectedOutputColumnNums: [5]
-                        selectExpressions: VectorUDFAdaptor(cdecimal1 NOT 
BETWEEN -2000 AND 4390.1351351351) -> 5:boolean
+                        selectExpressions: DecimalColumnNotBetween(col 
1:decimal(20,10), left -2000, right 4390.1351351351) -> 5:boolean
                     Statistics: Num rows: 12289 Data size: 2467616 Basic 
stats: COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
@@ -1539,7 +1539,7 @@ STAGE PLANS:
                 featureSupportInUse: [DECIMAL_64]
                 inputFileFormats: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                 allNative: false
-                usesVectorUDFAdaptor: true
+                usesVectorUDFAdaptor: false
                 vectorized: true
         Reducer 2 
             Execution mode: vectorized

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/vectorization_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vectorization_10.q.out 
b/ql/src/test/results/clientpositive/spark/vectorization_10.q.out
index 4de7240..b674c96 100644
--- a/ql/src/test/results/clientpositive/spark/vectorization_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorization_10.q.out
@@ -82,7 +82,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [5, 8, 0, 10, 6, 13, 17, 
16, 18, 20, 21, 19, 23, 24, 26]
-                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: col 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
DoubleColAddDoubleColumn(col 5:double, col 24:double)(children: 
CastLongToDouble(col 
 1:smallint) -> 24:double) -> 25:double) -> 24:double, DoubleColUnaryMinus(col 
25:double)(children: DoubleColUnaryMinus(col 5:double) -> 25:double) -> 
26:double
+                          selectExpressions: DoubleColUnaryMinus(col 5:double) 
-> 13:double, DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 17:double, 
DoubleColModuloDoubleScalar(col 18:double, val 33.0)(children: 
DoubleColAddDoubleColumn(col 5:double, col 16:double)(children: 
CastLongToDouble(col 1:smallint) -> 16:double) -> 18:double) -> 16:double, 
DoubleColUnaryMinus(col 5:double) -> 18:double, DoubleColModuloDoubleColumn(col 
19:double, col 5:double)(children: CastLongToDouble(col 0:tinyint) -> 
19:double) -> 20:double, LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 21:smallint, DoubleColUnaryMinus(col 
5:double) -> 19:double, LongColMultiplyLongColumn(col 3:bigint, col 
22:bigint)(children: LongColModuloLongColumn(col 0:smallint, col 
1:smallint)(children: col 0:tinyint) -> 22:smallint) -> 23:bigint, 
DoubleScalarSubtractDoubleColumn(val 9763215.5639, col 25:double)(children: 
Doubl
 eColAddDoubleColumn(col 5:double, col 24:double)(children: 
CastLongToDouble(col 1:smallint) -> 24:double) -> 25:double) -> 24:double, 
DoubleColUnaryMinus(col 25:double)(children: DoubleColUnaryMinus(col 5:double) 
-> 25:double) -> 26:double
                       Statistics: Num rows: 9557 Data size: 2261694 Basic 
stats: COMPLETE Column stats: NONE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out 
b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out
index 4d3c0b9..d98be43 100644
--- a/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorization_short_regress.q.out
@@ -1636,7 +1636,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [2, 6, 11, 9, 5, 4, 3, 1, 
10, 15, 16, 17, 14, 19, 20, 21, 23, 26, 28, 25, 18, 29]
-                          selectExpressions: LongColAddLongColumn(col 2:int, 
col 1:int)(children: col 1:smallint) -> 15:int, LongColSubtractLongColumn(col 
3:bigint, col 0:bigint)(children: col 0:tinyint) -> 16:bigint, 
LongColUnaryMinus(col 3:bigint) -> 17:bigint, DoubleColUnaryMinus(col 4:float) 
-> 14:float, LongColAddLongColumn(col 18:bigint, col 3:bigint)(children: 
LongColSubtractLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint) 
-> 18:bigint) -> 19:bigint, DoubleColDivideDoubleColumn(col 5:double, col 
5:double) -> 20:double, DoubleColUnaryMinus(col 5:double) -> 21:double, 
LongColMultiplyLongColumn(col 18:bigint, col 22:bigint)(children: col 18:int, 
LongColUnaryMinus(col 3:bigint) -> 22:bigint) -> 23:bigint, 
DoubleColAddDoubleColumn(col 24:double, col 25:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 24:double, CastLongToDouble(col 3:bigint) 
-> 25:double) -> 26:double, DecimalScalarDivideDecimalColumn(val -1.389, col 
27:decimal(3,0))(children: CastLongToDecima
 l(col 0:tinyint) -> 27:decimal(3,0)) -> 28:decimal(8,7), 
DoubleColModuloDoubleColumn(col 24:double, col 5:double)(children: 
CastLongToDouble(col 3:bigint) -> 24:double) -> 25:double, 
LongColUnaryMinus(col 1:smallint) -> 18:smallint, LongColAddLongColumn(col 
1:int, col 22:int)(children: col 1:smallint, LongColAddLongColumn(col 2:int, 
col 1:int)(children: col 1:smallint) -> 22:int) -> 29:int
+                          selectExpressions: LongColAddLongColumn(col 2:int, 
col 1:int)(children: col 1:smallint) -> 15:int, LongColSubtractLongColumn(col 
3:bigint, col 0:bigint)(children: col 0:tinyint) -> 16:bigint, 
LongColUnaryMinus(col 3:bigint) -> 17:bigint, DoubleColUnaryMinus(col 4:float) 
-> 14:float, LongColAddLongColumn(col 18:bigint, col 3:bigint)(children: 
LongColSubtractLongColumn(col 3:bigint, col 0:bigint)(children: col 0:tinyint) 
-> 18:bigint) -> 19:bigint, DoubleColDivideDoubleColumn(col 5:double, col 
5:double) -> 20:double, DoubleColUnaryMinus(col 5:double) -> 21:double, 
LongColMultiplyLongColumn(col 18:bigint, col 22:bigint)(children: 
LongColAddLongColumn(col 2:int, col 1:int)(children: col 1:smallint) -> 18:int, 
LongColUnaryMinus(col 3:bigint) -> 22:bigint) -> 23:bigint, 
DoubleColAddDoubleColumn(col 24:double, col 25:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 24:double, CastLongToDouble(col 3:bigint) 
-> 25:double) -> 26:double, DecimalScalarDivideDecim
 alColumn(val -1.389, col 27:decimal(3,0))(children: CastLongToDecimal(col 
0:tinyint) -> 27:decimal(3,0)) -> 28:decimal(8,7), 
DoubleColModuloDoubleColumn(col 24:double, col 5:double)(children: 
CastLongToDouble(col 3:bigint) -> 24:double) -> 25:double, 
LongColUnaryMinus(col 1:smallint) -> 18:smallint, LongColAddLongColumn(col 
1:int, col 22:int)(children: col 1:smallint, LongColAddLongColumn(col 2:int, 
col 1:int)(children: col 1:smallint) -> 22:int) -> 29:int
                       Statistics: Num rows: 10922 Data size: 2584725 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col8 (type: boolean), _col1 (type: 
string), _col3 (type: timestamp), _col5 (type: float), _col6 (type: bigint), 
_col4 (type: double), _col0 (type: int), _col7 (type: smallint), _col9 (type: 
int), _col10 (type: bigint), _col11 (type: bigint), _col12 (type: float), 
_col13 (type: bigint), _col14 (type: double), _col15 (type: double), _col16 
(type: bigint), _col17 (type: double), _col18 (type: decimal(8,7)), _col19 
(type: double), _col20 (type: smallint), _col21 (type: int)
@@ -1939,7 +1939,7 @@ STAGE PLANS:
                           className: VectorSelectOperator
                           native: true
                           projectedOutputColumnNums: [8, 7, 5, 4, 3, 1, 16, 
17, 15, 18, 19, 21, 20, 22, 23, 25]
-                          selectExpressions: DoubleColDivideDoubleScalar(col 
15:double, val 3569.0)(children: CastLongToDouble(col 3:bigint) -> 15:double) 
-> 16:double, LongScalarSubtractLongColumn(val -257, col 1:int)(children: col 
1:smallint) -> 17:int, DoubleScalarMultiplyDoubleColumn(val -6432.0, col 
4:float) -> 15:float, DoubleColUnaryMinus(col 5:double) -> 18:double, 
DoubleColMultiplyDoubleScalar(col 5:double, val 10.175) -> 19:double, 
DoubleColDivideDoubleColumn(col 20:double, col 4:double)(children: col 
20:float, col 4:float) -> 21:double, DoubleColUnaryMinus(col 4:float) -> 
20:float, LongColModuloLongColumn(col 2:int, col 1:int)(children: col 
1:smallint) -> 22:int, DoubleColUnaryMinus(col 5:double) -> 23:double, 
DoubleColMultiplyDoubleColumn(col 5:double, col 24:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 24:double) -> 25:double
+                          selectExpressions: DoubleColDivideDoubleScalar(col 
15:double, val 3569.0)(children: CastLongToDouble(col 3:bigint) -> 15:double) 
-> 16:double, LongScalarSubtractLongColumn(val -257, col 1:int)(children: col 
1:smallint) -> 17:int, DoubleScalarMultiplyDoubleColumn(val -6432.0, col 
4:float) -> 15:float, DoubleColUnaryMinus(col 5:double) -> 18:double, 
DoubleColMultiplyDoubleScalar(col 5:double, val 10.175) -> 19:double, 
DoubleColDivideDoubleColumn(col 20:double, col 4:double)(children: 
DoubleScalarMultiplyDoubleColumn(val -6432.0, col 4:float) -> 20:float, col 
4:float) -> 21:double, DoubleColUnaryMinus(col 4:float) -> 20:float, 
LongColModuloLongColumn(col 2:int, col 1:int)(children: col 1:smallint) -> 
22:int, DoubleColUnaryMinus(col 5:double) -> 23:double, 
DoubleColMultiplyDoubleColumn(col 5:double, col 24:double)(children: 
DoubleColUnaryMinus(col 5:double) -> 24:double) -> 25:double
                       Statistics: Num rows: 3868 Data size: 915374 Basic 
stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col5 (type: smallint), _col1 (type: 
string), _col2 (type: double), _col3 (type: float), _col4 (type: bigint), _col6 
(type: double), _col7 (type: int), _col8 (type: float), _col9 (type: double), 
_col10 (type: double), _col11 (type: double), _col12 (type: float), _col13 
(type: int), _col14 (type: double), _col15 (type: double)

http://git-wip-us.apache.org/repos/asf/hive/blob/edc53cc0/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out 
b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
index f094fba..3944542 100644
--- a/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorized_timestamp_funcs.q.out
@@ -1296,7 +1296,7 @@ STAGE PLANS:
                 enabled: true
                 enableConditionsMet: hive.vectorized.execution.reduce.enabled 
IS true, hive.execution.engine spark IN [tez, spark] IS true
                 allNative: false
-                usesVectorUDFAdaptor: true
+                usesVectorUDFAdaptor: false
                 vectorized: true
             Reduce Operator Tree:
               Group By Operator
@@ -1318,7 +1318,7 @@ STAGE PLANS:
                       className: VectorSelectOperator
                       native: true
                       projectedOutputColumnNums: [5, 7, 8, 11, 6, 12, 13, 14]
-                      selectExpressions: RoundWithNumDigitsDoubleToDouble(col 
4, decimalPlaces 0)(children: DoubleColDivideLongColumn(col 0:double, col 
1:bigint) -> 4:double) -> 5:double, VectorUDFAdaptor(((_col2 - ((_col3 * _col3) 
/ _col1)) / _col1) BETWEEN 8.97077295279421E19D AND 
8.97077295279422E19D)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, col 
6:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 7:boolean, 
VectorUDFAdaptor(((_col2 - ((_col3 * _col3) / _col1)) / _col1) BETWEEN 
8.97077295279421E19D AND 8.97077295279422E19D)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:d
 ouble, col 3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 
8:boolean, VectorUDFAdaptor(((_col2 - ((_col3 * _col3) / _col1)) / CASE WHEN 
((_col1 = 1L)) THEN (null) ELSE ((_col1 - 1)) END) BETWEEN 9.20684592523616E19D 
AND 9.20684592523617E19D)(children: DoubleColDivideLongColumn(col 4:double, col 
11:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, col 
6:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 6:double) -> 4:double, IfExprNullCondExpr(col 9:boolean, null, 
col 10:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
9:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 10:bigint) -> 
11:bigint) -> 6:double) -> 11:boolean, RoundWithNumDigitsDoubleToDouble(col 4, 
decimalPlaces 3)(children: FuncPowerDoubleToDouble(col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn
 (col 2:double, col 6:double)(children: DoubleColDivideLongColumn(col 4:double, 
col 1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 
3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 4:double) -> 
6:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 12:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 12:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 12:double) -> 4:double) -> 12:double) -> 4:double) -> 
12:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 13:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 13:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(chi
 ldren: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) 
-> 13:double) -> 4:double) -> 13:double) -> 4:double) -> 13:double, 
RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 14:double)(children: DoubleColDivideLongColumn(col 
4:double, col 17:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 14:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 14:double) -> 4:double, IfExprNullCondExpr(col 15:boolean, 
null, col 16:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
15:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 16:bigint) -> 
17:bigint) -> 14:double) -> 4:double) -> 14:double
+                      selectExpressions: RoundWithNumDigitsDoubleToDouble(col 
4, decimalPlaces 0)(children: DoubleColDivideLongColumn(col 0:double, col 
1:bigint) -> 4:double) -> 5:double, DoubleColumnBetween(col 6:double, left 
8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double) -> 6:double) -> 7:boolean, DoubleColumnBetween(col 
6:double, left 8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double) ->
  6:double) -> 8:boolean, DoubleColumnBetween(col 6:double, left 
9.20684592523616E19, right 9.20684592523617E19)(children: 
DoubleColDivideLongColumn(col 4:double, col 11:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 4:double) -> 
6:double) -> 4:double, IfExprNullCondExpr(col 9:boolean, null, col 
10:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 9:boolean, 
LongColSubtractLongScalar(col 1:bigint, val 1) -> 10:bigint) -> 11:bigint) -> 
6:double) -> 11:boolean, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 
3)(children: FuncPowerDoubleToDouble(col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 6:double)(children: 
DoubleColDivideLongColumn(col 4:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, 
 col 3:double) -> 4:double) -> 6:double) -> 4:double) -> 6:double) -> 4:double) 
-> 6:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 12:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 12:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 12:double) -> 4:double) -> 12:double) -> 4:double) -> 
12:double, RoundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 13:double)(children: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 13:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 13:double) -> 4:double) -> 13:double) -> 4:double) -> 
13:double, R
 oundWithNumDigitsDoubleToDouble(col 4, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 14:double)(children: DoubleColDivideLongColumn(col 
4:double, col 17:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 14:double)(children: DoubleColDivideLongColumn(col 4:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 4:double) -> 14:double) -> 4:double, IfExprNullCondExpr(col 15:boolean, 
null, col 16:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 
15:boolean, LongColSubtractLongScalar(col 1:bigint, val 1) -> 16:bigint) -> 
17:bigint) -> 14:double) -> 4:double) -> 14:double
                   Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE 
Column stats: NONE
                   File Output Operator
                     compressed: false

Reply via email to