http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_case.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
index d7e7561..36d71ef 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_case.q.out
@@ -73,8 +73,8 @@ STAGE PLANS:
                       Select Vectorization:
                           className: VectorSelectOperator
                           native: true
-                          projectedOutputColumnNums: [1, 17, 21]
-                          selectExpressions: IfExprColumnCondExpr(col 
13:boolean, col 14:stringcol 16:string)(children: LongColEqualLongScalar(col 
1:smallint, val 418) -> 13:boolean, ConstantVectorExpression(val a) -> 
14:string, IfExprStringScalarStringScalar(col 15:boolean, val b, val 
c)(children: LongColEqualLongScalar(col 1:smallint, val 12205) -> 15:boolean) 
-> 16:string) -> 17:string, IfExprColumnCondExpr(col 15:boolean, col 
18:stringcol 20:string)(children: LongColEqualLongScalar(col 1:smallint, val 
418) -> 15:boolean, ConstantVectorExpression(val a) -> 18:string, 
IfExprStringScalarStringScalar(col 19:boolean, val b, val c)(children: 
LongColEqualLongScalar(col 1:smallint, val 12205) -> 19:boolean) -> 20:string) 
-> 21:string
+                          projectedOutputColumnNums: [1, 17, 22]
+                          selectExpressions: IfExprColumnCondExpr(col 
13:boolean, col 14:stringcol 16:string)(children: LongColEqualLongScalar(col 
1:smallint, val 418) -> 13:boolean, ConstantVectorExpression(val a) -> 
14:string, IfExprStringScalarStringScalar(col 15:boolean, val b, val 
c)(children: LongColEqualLongScalar(col 1:smallint, val 12205) -> 15:boolean) 
-> 16:string) -> 17:string, IfExprColumnCondExpr(col 18:boolean, col 
19:stringcol 21:string)(children: LongColEqualLongScalar(col 1:smallint, val 
418) -> 18:boolean, ConstantVectorExpression(val a) -> 19:string, 
IfExprStringScalarStringScalar(col 20:boolean, val b, val c)(children: 
LongColEqualLongScalar(col 1:smallint, val 12205) -> 20:boolean) -> 21:string) 
-> 22:string
                       Statistics: Num rows: 7 Data size: 2600 Basic stats: 
COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -102,7 +102,7 @@ STAGE PLANS:
                     includeColumns: [1]
                     dataColumns: ctinyint:tinyint, csmallint:smallint, 
cint:int, cbigint:bigint, cfloat:float, cdouble:double, cstring1:string, 
cstring2:string, ctimestamp1:timestamp, ctimestamp2:timestamp, 
cboolean1:boolean, cboolean2:boolean
                     partitionColumnCount: 0
-                    scratchColumnTypeNames: [bigint, string, bigint, string, 
string, string, bigint, string, string]
+                    scratchColumnTypeNames: [bigint, string, bigint, string, 
string, bigint, string, bigint, string, string]
 
   Stage: Stage-0
     Fetch Operator
@@ -310,13 +310,13 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [13, 14]
-                        selectExpressions: IfExprLongScalarLongScalar(col 
14:boolean, val 1, val 0)(children: LongColEqualLongScalar(col 13:int, val 
0)(children: LongColModuloLongScalar(col 2:int, val 2) -> 13:int) -> 
14:boolean) -> 13:int, IfExprLongScalarLongScalar(col 15:boolean, val 1, val 
0)(children: LongColEqualLongScalar(col 14:int, val 1)(children: 
LongColModuloLongScalar(col 2:int, val 2) -> 14:int) -> 15:boolean) -> 14:int
+                        projectedOutputColumnNums: [15, 18]
+                        selectExpressions: IfExprLongScalarLongScalar(col 
14:boolean, val 1, val 0)(children: LongColEqualLongScalar(col 13:int, val 
0)(children: LongColModuloLongScalar(col 2:int, val 2) -> 13:int) -> 
14:boolean) -> 15:int, IfExprLongScalarLongScalar(col 17:boolean, val 1, val 
0)(children: LongColEqualLongScalar(col 16:int, val 1)(children: 
LongColModuloLongScalar(col 2:int, val 2) -> 16:int) -> 17:boolean) -> 18:int
                     Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       aggregations: sum(_col0), sum(_col1)
                       Group By Vectorization:
-                          aggregators: VectorUDAFSumLong(col 13:int) -> 
bigint, VectorUDAFSumLong(col 14:int) -> bigint
+                          aggregators: VectorUDAFSumLong(col 15:int) -> 
bigint, VectorUDAFSumLong(col 18:int) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
                           native: false
@@ -350,7 +350,7 @@ STAGE PLANS:
                     includeColumns: [2]
                     dataColumns: ctinyint:tinyint, csmallint:smallint, 
cint:int, cbigint:bigint, cfloat:float, cdouble:double, cstring1:string, 
cstring2:string, ctimestamp1:timestamp, ctimestamp2:timestamp, 
cboolean1:boolean, cboolean2:boolean
                     partitionColumnCount: 0
-                    scratchColumnTypeNames: [bigint, bigint, bigint]
+                    scratchColumnTypeNames: [bigint, bigint, bigint, bigint, 
bigint, bigint]
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:
@@ -457,13 +457,13 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [13, 14]
-                        selectExpressions: IfExprLongColumnLongScalar(col 
14:boolean, col 2:int, val 0)(children: LongColEqualLongScalar(col 13:int, val 
0)(children: LongColModuloLongScalar(col 2:int, val 2) -> 13:int) -> 
14:boolean) -> 13:int, IfExprLongColumnLongScalar(col 15:boolean, col 2:int, 
val 0)(children: LongColEqualLongScalar(col 14:int, val 1)(children: 
LongColModuloLongScalar(col 2:int, val 2) -> 14:int) -> 15:boolean) -> 14:int
+                        projectedOutputColumnNums: [15, 18]
+                        selectExpressions: IfExprLongColumnLongScalar(col 
14:boolean, col 2:int, val 0)(children: LongColEqualLongScalar(col 13:int, val 
0)(children: LongColModuloLongScalar(col 2:int, val 2) -> 13:int) -> 
14:boolean) -> 15:int, IfExprLongColumnLongScalar(col 17:boolean, col 2:int, 
val 0)(children: LongColEqualLongScalar(col 16:int, val 1)(children: 
LongColModuloLongScalar(col 2:int, val 2) -> 16:int) -> 17:boolean) -> 18:int
                     Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       aggregations: sum(_col0), sum(_col1)
                       Group By Vectorization:
-                          aggregators: VectorUDAFSumLong(col 13:int) -> 
bigint, VectorUDAFSumLong(col 14:int) -> bigint
+                          aggregators: VectorUDAFSumLong(col 15:int) -> 
bigint, VectorUDAFSumLong(col 18:int) -> bigint
                           className: VectorGroupByOperator
                           groupByMode: HASH
                           native: false
@@ -497,7 +497,7 @@ STAGE PLANS:
                     includeColumns: [2]
                     dataColumns: ctinyint:tinyint, csmallint:smallint, 
cint:int, cbigint:bigint, cfloat:float, cdouble:double, cstring1:string, 
cstring2:string, ctimestamp1:timestamp, ctimestamp2:timestamp, 
cboolean1:boolean, cboolean2:boolean
                     partitionColumnCount: 0
-                    scratchColumnTypeNames: [bigint, bigint, bigint]
+                    scratchColumnTypeNames: [bigint, bigint, bigint, bigint, 
bigint, bigint]
         Reducer 2 
             Execution mode: vectorized, llap
             Reduce Vectorization:

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
index cc53f11..d1a9620 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_casts.q.out
@@ -187,8 +187,8 @@ STAGE PLANS:
                       Select Vectorization:
                           className: VectorSelectOperator
                           native: true
-                          projectedOutputColumnNums: [13, 14, 15, 16, 17, 18, 
10, 20, 19, 21, 0, 1, 2, 3, 22, 23, 10, 24, 25, 27, 28, 29, 30, 31, 32, 33, 34, 
4, 5, 35, 36, 37, 38, 39, 5, 41, 43, 45, 47, 48, 49, 51, 54, 55, 8, 56, 57, 26, 
58, 59, 60, 61, 62, 63, 64, 65, 6, 66, 67, 68, 69, 71, 73]
-                          selectExpressions: 
CastLongToBooleanViaLongToLong(col 0:tinyint) -> 13:boolean, 
CastLongToBooleanViaLongToLong(col 1:smallint) -> 14:boolean, 
CastLongToBooleanViaLongToLong(col 2:int) -> 15:boolean, 
CastLongToBooleanViaLongToLong(col 3:bigint) -> 16:boolean, 
CastDoubleToBooleanViaDoubleToLong(col 4:float) -> 17:boolean, 
CastDoubleToBooleanViaDoubleToLong(col 5:double) -> 18:boolean, 
CastLongToBooleanViaLongToLong(col 19:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 19:bigint) -> 20:boolean, 
CastTimestampToBoolean(col 8:timestamp) -> 19:boolean, CastStringToBoolean(col 
6) -> 21:boolean, CastDoubleToLong(col 4:float) -> 22:int, CastDoubleToLong(col 
5:double) -> 23:int, CastTimestampToLong(col 8:timestamp) -> 24:int, 
CastStringToLong(col 6:string) -> 25:int, CastStringToLong(col 
26:string)(children: StringSubstrColStartLen(col 6:string, start 0, length 1) 
-> 26:string) -> 27:int, CastDoubleToLong(col 4:float) -> 28:tinyint, 
CastDoubleToLo
 ng(col 4:float) -> 29:smallint, CastDoubleToLong(col 4:float) -> 30:bigint, 
CastLongToDouble(col 0:tinyint) -> 31:double, CastLongToDouble(col 1:smallint) 
-> 32:double, CastLongToDouble(col 2:int) -> 33:double, CastLongToDouble(col 
3:bigint) -> 34:double, CastLongToDouble(col 10:boolean) -> 35:double, 
CastTimestampToDouble(col 8:timestamp) -> 36:double, CastStringToDouble(col 
6:string) -> 37:double, CastStringToDouble(col 26:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 26:string) -> 
38:double, CastLongToFloatViaLongToDouble(col 2:int) -> 39:float, 
CastMillisecondsLongToTimestamp(col 0:tinyint) -> 41:timestamp, 
CastMillisecondsLongToTimestamp(col 1:smallint) -> 43:timestamp, 
CastMillisecondsLongToTimestamp(col 2:int) -> 45:timestamp, 
CastMillisecondsLongToTimestamp(col 3:bigint) -> 47:timestamp, 
CastDoubleToTimestamp(col 4:float) -> 48:timestamp, CastDoubleToTimestamp(col 
5:double) -> 49:timestamp, CastMillisecondsLongToTimestamp(col 10:boolean) -> 51
 :timestamp, CastMillisecondsLongToTimestamp(col 52:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 52:bigint) -> 54:timestamp, 
CastDateToTimestamp(col 52:date)(children: CastTimestampToDate(col 8:timestamp) 
-> 52:date) -> 55:timestamp, CastStringToTimestamp(col 6:string) -> 
56:timestamp, CastStringToTimestamp(col 26:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 26:string) -> 
57:timestamp, CastLongToString(col 0:tinyint) -> 26:string, 
CastLongToString(col 1:smallint) -> 58:string, CastLongToString(col 2:int) -> 
59:string, CastLongToString(col 3:bigint) -> 60:string, CastFloatToString(col 
4:float) -> 61:string, CastDoubleToString(col 5:double) -> 62:string, 
CastBooleanToStringViaLongToString(col 10:boolean) -> 63:string, 
CastLongToString(col 52:bigint)(children: LongColMultiplyLongScalar(col 
3:bigint, val 0) -> 52:bigint) -> 64:string, CastTimestampToString(col 
8:timestamp) -> 65:string, CastStringGroupToChar(col 6:string, maxLength 
 10) -> 66:char(10), CastStringGroupToVarChar(col 6:string, maxLength 10) -> 
67:varchar(10), CastLongToFloatViaLongToDouble(col 52:int)(children: 
CastDoubleToLong(col 4:float) -> 52:int) -> 68:float, CastLongToDouble(col 
52:int)(children: LongColMultiplyLongScalar(col 2:int, val 2) -> 52:int) -> 
69:double, CastDoubleToString(col 70:double)(children: 
FuncSinDoubleToDouble(col 4:float) -> 70:double) -> 71:string, 
DoubleColAddDoubleColumn(col 70:double, col 72:double)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 70:float, CastLongToDouble(col 
10:boolean) -> 72:double) -> 73:double
+                          projectedOutputColumnNums: [14, 15, 16, 17, 18, 19, 
10, 21, 22, 23, 0, 1, 2, 3, 24, 25, 10, 26, 27, 29, 30, 31, 32, 33, 34, 35, 36, 
4, 5, 37, 38, 39, 41, 42, 5, 44, 46, 48, 50, 51, 52, 54, 58, 60, 8, 61, 63, 64, 
65, 66, 67, 68, 69, 70, 72, 73, 6, 74, 75, 77, 79, 81, 84]
+                          selectExpressions: 
CastLongToBooleanViaLongToLong(col 0:tinyint) -> 14:boolean, 
CastLongToBooleanViaLongToLong(col 1:smallint) -> 15:boolean, 
CastLongToBooleanViaLongToLong(col 2:int) -> 16:boolean, 
CastLongToBooleanViaLongToLong(col 3:bigint) -> 17:boolean, 
CastDoubleToBooleanViaDoubleToLong(col 4:float) -> 18:boolean, 
CastDoubleToBooleanViaDoubleToLong(col 5:double) -> 19:boolean, 
CastLongToBooleanViaLongToLong(col 20:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 20:bigint) -> 21:boolean, 
CastTimestampToBoolean(col 8:timestamp) -> 22:boolean, CastStringToBoolean(col 
6) -> 23:boolean, CastDoubleToLong(col 4:float) -> 24:int, CastDoubleToLong(col 
5:double) -> 25:int, CastTimestampToLong(col 8:timestamp) -> 26:int, 
CastStringToLong(col 6:string) -> 27:int, CastStringToLong(col 
28:string)(children: StringSubstrColStartLen(col 6:string, start 0, length 1) 
-> 28:string) -> 29:int, CastDoubleToLong(col 4:float) -> 30:tinyint, 
CastDoubleToLo
 ng(col 4:float) -> 31:smallint, CastDoubleToLong(col 4:float) -> 32:bigint, 
CastLongToDouble(col 0:tinyint) -> 33:double, CastLongToDouble(col 1:smallint) 
-> 34:double, CastLongToDouble(col 2:int) -> 35:double, CastLongToDouble(col 
3:bigint) -> 36:double, CastLongToDouble(col 10:boolean) -> 37:double, 
CastTimestampToDouble(col 8:timestamp) -> 38:double, CastStringToDouble(col 
6:string) -> 39:double, CastStringToDouble(col 40:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 40:string) -> 
41:double, CastLongToFloatViaLongToDouble(col 2:int) -> 42:float, 
CastMillisecondsLongToTimestamp(col 0:tinyint) -> 44:timestamp, 
CastMillisecondsLongToTimestamp(col 1:smallint) -> 46:timestamp, 
CastMillisecondsLongToTimestamp(col 2:int) -> 48:timestamp, 
CastMillisecondsLongToTimestamp(col 3:bigint) -> 50:timestamp, 
CastDoubleToTimestamp(col 4:float) -> 51:timestamp, CastDoubleToTimestamp(col 
5:double) -> 52:timestamp, CastMillisecondsLongToTimestamp(col 10:boolean) -> 54
 :timestamp, CastMillisecondsLongToTimestamp(col 57:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 57:bigint) -> 58:timestamp, 
CastDateToTimestamp(col 59:date)(children: CastTimestampToDate(col 8:timestamp) 
-> 59:date) -> 60:timestamp, CastStringToTimestamp(col 6:string) -> 
61:timestamp, CastStringToTimestamp(col 62:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 62:string) -> 
63:timestamp, CastLongToString(col 0:tinyint) -> 64:string, 
CastLongToString(col 1:smallint) -> 65:string, CastLongToString(col 2:int) -> 
66:string, CastLongToString(col 3:bigint) -> 67:string, CastFloatToString(col 
4:float) -> 68:string, CastDoubleToString(col 5:double) -> 69:string, 
CastBooleanToStringViaLongToString(col 10:boolean) -> 70:string, 
CastLongToString(col 71:bigint)(children: LongColMultiplyLongScalar(col 
3:bigint, val 0) -> 71:bigint) -> 72:string, CastTimestampToString(col 
8:timestamp) -> 73:string, CastStringGroupToChar(col 6:string, maxLength 
 10) -> 74:char(10), CastStringGroupToVarChar(col 6:string, maxLength 10) -> 
75:varchar(10), CastLongToFloatViaLongToDouble(col 76:int)(children: 
CastDoubleToLong(col 4:float) -> 76:int) -> 77:float, CastLongToDouble(col 
78:int)(children: LongColMultiplyLongScalar(col 2:int, val 2) -> 78:int) -> 
79:double, CastDoubleToString(col 80:double)(children: 
FuncSinDoubleToDouble(col 4:float) -> 80:double) -> 81:string, 
DoubleColAddDoubleColumn(col 82:double, col 83:double)(children: 
CastLongToFloatViaLongToDouble(col 2:int) -> 82:float, CastLongToDouble(col 
10:boolean) -> 83:double) -> 84:double
                       Statistics: Num rows: 6144 Data size: 16362860 Basic 
stats: COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -216,7 +216,7 @@ STAGE PLANS:
                     includeColumns: [0, 1, 2, 3, 4, 5, 6, 8, 10]
                     dataColumns: ctinyint:tinyint, csmallint:smallint, 
cint:int, cbigint:bigint, cfloat:float, cdouble:double, cstring1:string, 
cstring2:string, ctimestamp1:timestamp, ctimestamp2:timestamp, 
cboolean1:boolean, cboolean2:boolean
                     partitionColumnCount: 0
-                    scratchColumnTypeNames: [bigint, bigint, bigint, bigint, 
bigint, bigint, bigint, bigint, bigint, bigint, bigint, bigint, bigint, string, 
bigint, bigint, bigint, bigint, double, double, double, double, double, double, 
double, double, double, timestamp, timestamp, timestamp, timestamp, timestamp, 
timestamp, timestamp, timestamp, timestamp, timestamp, timestamp, timestamp, 
bigint, timestamp, timestamp, timestamp, timestamp, timestamp, string, string, 
string, string, string, string, string, string, string, string, double, double, 
double, string, double, double]
+                    scratchColumnTypeNames: [bigint, bigint, bigint, bigint, 
bigint, bigint, bigint, bigint, bigint, bigint, bigint, bigint, bigint, bigint, 
bigint, string, bigint, bigint, bigint, bigint, double, double, double, double, 
double, double, double, string, double, double, timestamp, timestamp, 
timestamp, timestamp, timestamp, timestamp, timestamp, timestamp, timestamp, 
timestamp, timestamp, timestamp, bigint, timestamp, bigint, timestamp, bigint, 
timestamp, timestamp, string, timestamp, string, string, string, string, 
string, string, string, bigint, string, string, string, string, bigint, double, 
bigint, double, double, string, double, double, double]
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/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 b0e0d70..c4dafee 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
@@ -870,8 +870,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        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
+                        projectedOutputColumnNums: [1, 0, 5, 8, 11, 14, 17, 
20, 22, 24, 27, 30, 33, 36, 39, 42, 45, 48, 51, 54, 57, 60]
+                        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 6:int, col 7:int)(children: 
VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 6:int, 
VectorUDFMonthDate(col 0, field MONTH) -> 7:int) -> 8:boolean, 
LongColEqualLongColumn(col 9:int, col 10:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 9:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 10:int) -> 11:boolean, 
LongColEqualLongColumn(col 12:int, col 13:int)(children: 
VectorUDFDayOfMonthTimestamp(col 1:timestamp, field DAY_OF_MONTH) -> 12:int, 
VectorUDFDayOfMonthDate(col 0, field DAY_OF_MONTH) -> 13:int) -> 14:boolean, 
LongColEqualLongColumn(col 15:int, col 16:int)(children: 
VectorUDFDayOfWeekTimestamp(col 1:timestamp, field DAY_OF_WEEK) -> 15:int, 
VectorUDFDayOfWeekDate(col 0, field DAY_OF
 _WEEK) -> 16:int) -> 17:boolean, LongColEqualLongColumn(col 18:int, col 
19:int)(children: VectorUDFWeekOfYearTimestamp(col 1:timestamp, field 
WEEK_OF_YEAR) -> 18:int, VectorUDFWeekOfYearDate(col 0, field WEEK_OF_YEAR) -> 
19:int) -> 20:boolean, LongColEqualLongColumn(col 21:date, col 
0:date)(children: CastTimestampToDate(col 1:timestamp) -> 21:date) -> 
22:boolean, LongColEqualLongColumn(col 23:date, col 0:date)(children: 
VectorUDFDateTimestamp(col 1:timestamp) -> 23:date, col 0:date) -> 24:boolean, 
LongColEqualLongColumn(col 25:date, col 26:date)(children: 
VectorUDFDateAddColScalar(col 1:timestamp, val 2) -> 25:date, 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 26:date) -> 27:boolean, 
LongColEqualLongColumn(col 28:date, col 29:date)(children: 
VectorUDFDateSubColScalar(col 1:timestamp, val 2) -> 28:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 29:date) -> 30:boolean, 
LongColEqualLongColumn(col 31:int, col 32:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val 200
 0-01-01) -> 31:int, VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 
32:int) -> 33:boolean, LongColEqualLongColumn(col 34:int, col 35:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 34:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 35:int) -> 36:boolean, 
LongColEqualLongColumn(col 37:int, col 38:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 37:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 38:int) -> 39:boolean, 
LongColEqualLongColumn(col 40:int, col 41:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 40:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 41:int) -> 42:boolean, 
LongColEqualLongColumn(col 43:int, col 44:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val 2007-03-14) -> 43:int, 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 44:int) -> 
45:boolean, LongColEqualLongColumn(col 46:int, col 47:int)(children: 
VectorUDFDateDiffColScalar(col 1:timest
 amp, val NULL) -> 46:int, VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 
47:int) -> 48:boolean, LongColEqualLongColumn(col 49:int, col 50:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 49:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 50:int) -> 51:boolean, 
LongColEqualLongColumn(col 52:int, col 53:int)(children: 
VectorUDFDateDiffColScalar(col 1:timestamp, val NULL) -> 52:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 53:int) -> 54:boolean, 
LongColEqualLongColumn(col 55:int, col 56:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2000-01-01) -> 55:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 56:int) -> 57:boolean, 
LongColEqualLongColumn(col 58:int, col 59:int)(children: 
VectorUDFDateDiffColScalar(col 0:date, val 2007-03-14) -> 58:int, 
VectorUDFDateDiffColScalar(col 0:date, val NULL) -> 59:int) -> 60:boolean
                     Statistics: Num rows: 137 Data size: 24112 Basic stats: 
COMPLETE Column stats: COMPLETE
                     File Output Operator
                       compressed: false
@@ -1142,8 +1142,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        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
+                        projectedOutputColumnNums: [0, 3, 4, 6, 8, 11]
+                        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 7:date)(children: 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 7:date) -> 8:int, 
VectorUDFDateDiffColCol(col 9:date, col 10:date)(children: 
VectorUDFDateAddColScalar(col 0:date, val 2) -> 9:date, 
VectorUDFDateSubColScalar(col 0:date, val 2) -> 10:date) -> 11:int
                     Statistics: Num rows: 137 Data size: 24660 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Limit
                       Number of rows: 10

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
index 49322a6..538b69f 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_distinct_gby.q.out
@@ -336,8 +336,8 @@ STAGE PLANS:
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
-                      projectedOutputColumnNums: [0, 1, 5, 4]
-                      selectExpressions: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: CastLongToDouble(col 0:bigint) -> 4:double) 
-> 5:double, 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
+                      projectedOutputColumnNums: [0, 1, 5, 10]
+                      selectExpressions: DoubleColDivideLongColumn(col 
4:double, col 1:bigint)(children: CastLongToDouble(col 0:bigint) -> 4:double) 
-> 5:double, FuncPowerDoubleToDouble(col 9:double)(children: 
DoubleColDivideLongColumn(col 8:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 7:double)(children: 
DoubleColDivideLongColumn(col 6:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 6:double) -> 
7:double) -> 8:double) -> 9:double) -> 10:double
                   Statistics: Num rows: 1 Data size: 32 Basic stats: COMPLETE 
Column stats: COMPLETE
                   File Output Operator
                     compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out
 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out
index 5cd15cb..9106fad 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_semijoin_reduction2.q.out
@@ -274,7 +274,7 @@ STAGE PLANS:
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
-                        predicateExpression: FilterExprAndExpr(children: 
SelectColumnIsNotNull(col 1:decimal(10,1)/DECIMAL_64), 
FilterExprAndExpr(children: FilterDecimalColumnBetweenDynamicValue(col 
9:decimal(10,1), left 0, right 0)(children: ConvertDecimal64ToDecimal(col 
1:decimal(10,1)/DECIMAL_64) -> 9:decimal(10,1)), 
VectorInBloomFilterColDynamicValue(children: ConvertDecimal64ToDecimal(col 
1:decimal(10,1)/DECIMAL_64) -> 9:decimal(10,1))))
+                        predicateExpression: FilterExprAndExpr(children: 
SelectColumnIsNotNull(col 1:decimal(10,1)/DECIMAL_64), 
FilterExprAndExpr(children: FilterDecimalColumnBetweenDynamicValue(col 
9:decimal(10,1), left 0, right 0)(children: ConvertDecimal64ToDecimal(col 
1:decimal(10,1)/DECIMAL_64) -> 9:decimal(10,1)), 
VectorInBloomFilterColDynamicValue(children: ConvertDecimal64ToDecimal(col 
1:decimal(10,1)/DECIMAL_64) -> 10:decimal(10,1))))
                     predicate: ((partkey_decimal BETWEEN 
DynamicValue(RS_7_b_partkey_decimal_min) AND 
DynamicValue(RS_7_b_partkey_decimal_max) and in_bloom_filter(partkey_decimal, 
DynamicValue(RS_7_b_partkey_decimal_bloom_filter))) and partkey_decimal is not 
null) (type: boolean)
                     Statistics: Num rows: 100 Data size: 11200 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
@@ -311,7 +311,7 @@ STAGE PLANS:
                     includeColumns: [1]
                     dataColumns: partkey_bigint:bigint, 
partkey_decimal:decimal(10,1)/DECIMAL_64, partkey_double:double, 
shipdate_date:date, shipdate_ts:timestamp, shipdate_string:string, 
shipdate_char:char(10), shipdate_varchar:varchar(10)
                     partitionColumnCount: 0
-                    scratchColumnTypeNames: [decimal(10,1)]
+                    scratchColumnTypeNames: [decimal(10,1), decimal(10,1)]
         Map 4 
             Map Operator Tree:
                 TableScan

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
index 61a9159..63b42fd 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_math_funcs.q.out
@@ -140,8 +140,8 @@ STAGE PLANS:
                       Select Vectorization:
                           className: VectorSelectOperator
                           native: true
-                          projectedOutputColumnNums: [5, 14, 13, 15, 16, 17, 
19, 18, 20, 21, 22, 24, 23, 25, 26, 27, 28, 29, 31, 32, 30, 33, 34, 35, 36, 37, 
38, 39, 40, 41, 42, 43, 44, 45, 46, 5, 3, 47, 48, 49, 50]
-                          selectExpressions: 
RoundWithNumDigitsDoubleToDouble(col 5, decimalPlaces 2) -> 14:double, 
FuncFloorDoubleToLong(col 5:double) -> 13:bigint, FuncCeilDoubleToLong(col 
5:double) -> 15:bigint, FuncRandNoSeed -> 16:double, FuncRand -> 17:double, 
FuncExpDoubleToDouble(col 18:double)(children: FuncLnDoubleToDouble(col 
5:double) -> 18:double) -> 19:double, FuncLnDoubleToDouble(col 5:double) -> 
18:double, FuncLnDoubleToDouble(col 4:float) -> 20:double, 
FuncLog10DoubleToDouble(col 5:double) -> 21:double, FuncLog2DoubleToDouble(col 
5:double) -> 22:double, FuncLog2DoubleToDouble(col 23:double)(children: 
DoubleColSubtractDoubleScalar(col 5:double, val 15601.0) -> 23:double) -> 
24:double, FuncLog2DoubleToDouble(col 4:float) -> 23:double, 
FuncLog2LongToDouble(col 3:bigint) -> 25:double, FuncLog2LongToDouble(col 
2:int) -> 26:double, FuncLog2LongToDouble(col 1:smallint) -> 27:double, 
FuncLog2LongToDouble(col 0:tinyint) -> 28:double, 
FuncLogWithBaseDoubleToDouble(col 5:doubl
 e) -> 29:double, FuncPowerDoubleToDouble(col 30:double)(children: 
FuncLog2DoubleToDouble(col 5:double) -> 30:double) -> 31:double, 
FuncPowerDoubleToDouble(col 30:double)(children: FuncLog2DoubleToDouble(col 
5:double) -> 30:double) -> 32:double, FuncSqrtDoubleToDouble(col 5:double) -> 
30:double, FuncSqrtLongToDouble(col 3:bigint) -> 33:double, FuncBin(col 
3:bigint) -> 34:string, VectorUDFAdaptor(hex(cdouble)) -> 35:string, 
VectorUDFAdaptor(conv(cbigint, 10, 16)) -> 36:string, FuncAbsDoubleToDouble(col 
5:double) -> 37:double, FuncAbsLongToLong(col 0:tinyint) -> 38:int, 
PosModLongToLong(col 2, divisor 3) -> 39:int, FuncSinDoubleToDouble(col 
5:double) -> 40:double, FuncASinDoubleToDouble(col 5:double) -> 41:double, 
FuncCosDoubleToDouble(col 5:double) -> 42:double, FuncACosDoubleToDouble(col 
5:double) -> 43:double, FuncATanDoubleToDouble(col 5:double) -> 44:double, 
FuncDegreesDoubleToDouble(col 5:double) -> 45:double, 
FuncRadiansDoubleToDouble(col 5:double) -> 46:double, DoubleColUnaryMi
 nus(col 5:double) -> 47:double, FuncSignDoubleToDouble(col 5:double) -> 
48:double, FuncSignLongToDouble(col 3:bigint) -> 49:double, 
FuncCosDoubleToDouble(col 51:double)(children: DoubleColAddDoubleScalar(col 
50:double, val 3.14159)(children: DoubleColUnaryMinus(col 51:double)(children: 
FuncSinDoubleToDouble(col 50:double)(children: FuncLnDoubleToDouble(col 
5:double) -> 50:double) -> 51:double) -> 50:double) -> 51:double) -> 50:double
+                          projectedOutputColumnNums: [5, 15, 16, 17, 18, 19, 
21, 22, 23, 24, 25, 27, 28, 29, 30, 31, 32, 33, 35, 37, 38, 39, 40, 41, 42, 43, 
44, 45, 46, 47, 48, 49, 50, 51, 52, 5, 3, 53, 54, 55, 60]
+                          selectExpressions: 
RoundWithNumDigitsDoubleToDouble(col 5, decimalPlaces 2) -> 15:double, 
FuncFloorDoubleToLong(col 5:double) -> 16:bigint, FuncCeilDoubleToLong(col 
5:double) -> 17:bigint, FuncRandNoSeed -> 18:double, FuncRand -> 19:double, 
FuncExpDoubleToDouble(col 20:double)(children: FuncLnDoubleToDouble(col 
5:double) -> 20:double) -> 21:double, FuncLnDoubleToDouble(col 5:double) -> 
22:double, FuncLnDoubleToDouble(col 4:float) -> 23:double, 
FuncLog10DoubleToDouble(col 5:double) -> 24:double, FuncLog2DoubleToDouble(col 
5:double) -> 25:double, FuncLog2DoubleToDouble(col 26:double)(children: 
DoubleColSubtractDoubleScalar(col 5:double, val 15601.0) -> 26:double) -> 
27:double, FuncLog2DoubleToDouble(col 4:float) -> 28:double, 
FuncLog2LongToDouble(col 3:bigint) -> 29:double, FuncLog2LongToDouble(col 
2:int) -> 30:double, FuncLog2LongToDouble(col 1:smallint) -> 31:double, 
FuncLog2LongToDouble(col 0:tinyint) -> 32:double, 
FuncLogWithBaseDoubleToDouble(col 5:doubl
 e) -> 33:double, FuncPowerDoubleToDouble(col 34:double)(children: 
FuncLog2DoubleToDouble(col 5:double) -> 34:double) -> 35:double, 
FuncPowerDoubleToDouble(col 36:double)(children: FuncLog2DoubleToDouble(col 
5:double) -> 36:double) -> 37:double, FuncSqrtDoubleToDouble(col 5:double) -> 
38:double, FuncSqrtLongToDouble(col 3:bigint) -> 39:double, FuncBin(col 
3:bigint) -> 40:string, VectorUDFAdaptor(hex(cdouble)) -> 41:string, 
VectorUDFAdaptor(conv(cbigint, 10, 16)) -> 42:string, FuncAbsDoubleToDouble(col 
5:double) -> 43:double, FuncAbsLongToLong(col 0:tinyint) -> 44:int, 
PosModLongToLong(col 2, divisor 3) -> 45:int, FuncSinDoubleToDouble(col 
5:double) -> 46:double, FuncASinDoubleToDouble(col 5:double) -> 47:double, 
FuncCosDoubleToDouble(col 5:double) -> 48:double, FuncACosDoubleToDouble(col 
5:double) -> 49:double, FuncATanDoubleToDouble(col 5:double) -> 50:double, 
FuncDegreesDoubleToDouble(col 5:double) -> 51:double, 
FuncRadiansDoubleToDouble(col 5:double) -> 52:double, DoubleColUnaryMi
 nus(col 5:double) -> 53:double, FuncSignDoubleToDouble(col 5:double) -> 
54:double, FuncSignLongToDouble(col 3:bigint) -> 55:double, 
FuncCosDoubleToDouble(col 59:double)(children: DoubleColAddDoubleScalar(col 
58:double, val 3.14159)(children: DoubleColUnaryMinus(col 57:double)(children: 
FuncSinDoubleToDouble(col 56:double)(children: FuncLnDoubleToDouble(col 
5:double) -> 56:double) -> 57:double) -> 58:double) -> 59:double) -> 60:double
                       Statistics: Num rows: 2048 Data size: 1724272 Basic 
stats: COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
index 7a3c714..8a676a7 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out
@@ -366,8 +366,8 @@ STAGE PLANS:
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
-                      projectedOutputColumnNums: [0, 1, 2, 3, 10, 11, 9]
-                      selectExpressions: DoubleColDivideLongColumn(col 
4:double, col 5:bigint) -> 10:double, FuncPowerDoubleToDouble(col 
12:double)(children: DoubleColDivideLongColumn(col 11:double, col 
8:bigint)(children: DoubleColSubtractDoubleColumn(col 6:double, col 
12:double)(children: DoubleColDivideLongColumn(col 11:double, col 
8:bigint)(children: DoubleColMultiplyDoubleColumn(col 7:double, col 7:double) 
-> 11:double) -> 12:double) -> 11:double) -> 12:double) -> 11:double
+                      projectedOutputColumnNums: [0, 1, 2, 3, 10, 15, 9]
+                      selectExpressions: DoubleColDivideLongColumn(col 
4:double, col 5:bigint) -> 10:double, FuncPowerDoubleToDouble(col 
14:double)(children: DoubleColDivideLongColumn(col 13:double, col 
8:bigint)(children: DoubleColSubtractDoubleColumn(col 6:double, col 
12:double)(children: DoubleColDivideLongColumn(col 11:double, col 
8:bigint)(children: DoubleColMultiplyDoubleColumn(col 7:double, col 7:double) 
-> 11:double) -> 12:double) -> 13:double) -> 14:double) -> 15:double
                   Statistics: Num rows: 3 Data size: 444 Basic stats: COMPLETE 
Column stats: COMPLETE
                   Reduce Output Operator
                     key expressions: _col0 (type: tinyint)

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
index 69b3d00..01cc6cd 100644
--- a/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
+++ b/ql/src/test/results/clientpositive/llap/vectorized_timestamp.q.out
@@ -596,8 +596,8 @@ STAGE PLANS:
                   Select Vectorization:
                       className: VectorSelectOperator
                       native: true
-                      projectedOutputColumnNums: [4, 5, 6, 3, 10, 11, 12]
-                      selectExpressions: DoubleColDivideLongColumn(col 
3:double, col 2:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, 
col 4:double)(children: DoubleColDivideLongColumn(col 3:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 3:double) -> 4:double) -> 3:double) -> 4:double, 
DoubleColDivideLongColumn(col 3:double, col 2:bigint)(children: 
DoubleColSubtractDoubleColumn(col 0:double, col 5:double)(children: 
DoubleColDivideLongColumn(col 3:double, col 2:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) -> 3:double) -> 
5:double) -> 3:double) -> 5:double, DoubleColDivideLongColumn(col 3:double, col 
9:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, col 
6:double)(children: DoubleColDivideLongColumn(col 3:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 3:double) -> 6:double) -> 3:double, IfExprNullCondExpr(col 7:boolean, null, 
col 8:bigin
 t)(children: LongColEqualLongScalar(col 2:bigint, val 1) -> 7:boolean, 
LongColSubtractLongScalar(col 2:bigint, val 1) -> 8:bigint) -> 9:bigint) -> 
6:double, FuncPowerDoubleToDouble(col 10:double)(children: 
DoubleColDivideLongColumn(col 3:double, col 2:bigint)(children: 
DoubleColSubtractDoubleColumn(col 0:double, col 10:double)(children: 
DoubleColDivideLongColumn(col 3:double, col 2:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) -> 3:double) -> 
10:double) -> 3:double) -> 10:double) -> 3:double, FuncPowerDoubleToDouble(col 
11:double)(children: DoubleColDivideLongColumn(col 10:double, col 
2:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, col 
11:double)(children: DoubleColDivideLongColumn(col 10:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 10:double) -> 11:double) -> 10:double) -> 11:double) -> 10:double, 
FuncPowerDoubleToDouble(col 12:double)(children: DoubleColDivideLongColumn(col 
11:double, col
  2:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, col 
12:double)(children: DoubleColDivideLongColumn(col 11:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 11:double) -> 12:double) -> 11:double) -> 12:double) -> 11:double, 
FuncPowerDoubleToDouble(col 13:double)(children: DoubleColDivideLongColumn(col 
12:double, col 15:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, 
col 13:double)(children: DoubleColDivideLongColumn(col 12:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 12:double) -> 13:double) -> 12:double, IfExprNullCondExpr(col 9:boolean, 
null, col 14:bigint)(children: LongColEqualLongScalar(col 2:bigint, val 1) -> 
9:boolean, LongColSubtractLongScalar(col 2:bigint, val 1) -> 14:bigint) -> 
15:bigint) -> 13:double) -> 12:double
+                      projectedOutputColumnNums: [6, 10, 17, 22, 27, 32, 40]
+                      selectExpressions: DoubleColDivideLongColumn(col 
5:double, col 2:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, 
col 4:double)(children: DoubleColDivideLongColumn(col 3:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 3:double) -> 4:double) -> 5:double) -> 6:double, 
DoubleColDivideLongColumn(col 9:double, col 2:bigint)(children: 
DoubleColSubtractDoubleColumn(col 0:double, col 8:double)(children: 
DoubleColDivideLongColumn(col 7:double, col 2:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) -> 7:double) -> 
8:double) -> 9:double) -> 10:double, DoubleColDivideLongColumn(col 13:double, 
col 16:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, col 
12:double)(children: DoubleColDivideLongColumn(col 11:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 11:double) -> 12:double) -> 13:double, IfExprNullCondExpr(col 14:boolean, 
null, co
 l 15:bigint)(children: LongColEqualLongScalar(col 2:bigint, val 1) -> 
14:boolean, LongColSubtractLongScalar(col 2:bigint, val 1) -> 15:bigint) -> 
16:bigint) -> 17:double, FuncPowerDoubleToDouble(col 21:double)(children: 
DoubleColDivideLongColumn(col 20:double, col 2:bigint)(children: 
DoubleColSubtractDoubleColumn(col 0:double, col 19:double)(children: 
DoubleColDivideLongColumn(col 18:double, col 2:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) -> 18:double) -> 
19:double) -> 20:double) -> 21:double) -> 22:double, 
FuncPowerDoubleToDouble(col 26:double)(children: DoubleColDivideLongColumn(col 
25:double, col 2:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, 
col 24:double)(children: DoubleColDivideLongColumn(col 23:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 23:double) -> 24:double) -> 25:double) -> 26:double) -> 27:double, 
FuncPowerDoubleToDouble(col 31:double)(children: DoubleColDivideLongColumn
 (col 30:double, col 2:bigint)(children: DoubleColSubtractDoubleColumn(col 
0:double, col 29:double)(children: DoubleColDivideLongColumn(col 28:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 28:double) -> 29:double) -> 30:double) -> 31:double) -> 32:double, 
FuncPowerDoubleToDouble(col 39:double)(children: DoubleColDivideLongColumn(col 
35:double, col 38:bigint)(children: DoubleColSubtractDoubleColumn(col 0:double, 
col 34:double)(children: DoubleColDivideLongColumn(col 33:double, col 
2:bigint)(children: DoubleColMultiplyDoubleColumn(col 1:double, col 1:double) 
-> 33:double) -> 34:double) -> 35:double, IfExprNullCondExpr(col 36:boolean, 
null, col 37:bigint)(children: LongColEqualLongScalar(col 2:bigint, val 1) -> 
36:boolean, LongColSubtractLongScalar(col 2:bigint, val 1) -> 37:bigint) -> 
38:bigint) -> 39:double) -> 40:double
                   Statistics: Num rows: 1 Data size: 56 Basic stats: COMPLETE 
Column stats: COMPLETE
                   File Output Operator
                     compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/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 4373e9a..ac1952a 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
@@ -486,8 +486,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [5, 7, 8, 9, 6, 11, 10, 13, 
14]
-                        selectExpressions: VectorUDFUnixTimeStampString(col 
2:string) -> 5:bigint, VectorUDFYearDate(col 6, field YEAR)(children: 
CastStringToDate(col 2:string) -> 6:date) -> 7:int, VectorUDFMonthDate(col 6, 
field MONTH)(children: CastStringToDate(col 2:string) -> 6:date) -> 8:int, 
VectorUDFDayOfMonthDate(col 6, field DAY_OF_MONTH)(children: 
CastStringToDate(col 2:string) -> 6:date) -> 9:int, 
VectorUDFDayOfMonthString(col 2:string, fieldStart 8, fieldLength 2) -> 6:int, 
VectorUDFWeekOfYearDate(col 10, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 2:string) -> 10:date) -> 11:int, 
VectorUDFHourTimestamp(col 12:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 10:int, 
VectorUDFMinuteTimestamp(col 12:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 13:int, 
VectorUDFSecondTimestamp(col 12:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 12:timestamp) -> 14
 :int
+                        projectedOutputColumnNums: [5, 7, 9, 11, 12, 14, 16, 
18, 20]
+                        selectExpressions: VectorUDFUnixTimeStampString(col 
2:string) -> 5:bigint, VectorUDFYearDate(col 6, field YEAR)(children: 
CastStringToDate(col 2:string) -> 6:date) -> 7:int, VectorUDFMonthDate(col 8, 
field MONTH)(children: CastStringToDate(col 2:string) -> 8:date) -> 9:int, 
VectorUDFDayOfMonthDate(col 10, field DAY_OF_MONTH)(children: 
CastStringToDate(col 2:string) -> 10:date) -> 11:int, 
VectorUDFDayOfMonthString(col 2:string, fieldStart 8, fieldLength 2) -> 12:int, 
VectorUDFWeekOfYearDate(col 13, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 2:string) -> 13:date) -> 14:int, 
VectorUDFHourTimestamp(col 15:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 15:timestamp) -> 16:int, 
VectorUDFMinuteTimestamp(col 17:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 17:timestamp) -> 18:int, 
VectorUDFSecondTimestamp(col 19:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 19:timestamp) -
 > 20:int
                     Statistics: Num rows: 52 Data size: 2080 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
@@ -684,8 +684,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [7, 6, 8, 9, 11, 10, 14, 
15, 16]
-                        selectExpressions: LongColEqualLongColumn(col 
5:bigint, col 6:bigint)(children: VectorUDFUnixTimeStampTimestamp(col 
1:timestamp) -> 5:bigint, VectorUDFUnixTimeStampString(col 2:string) -> 
6:bigint) -> 7:boolean, LongColEqualLongColumn(col 5:int, col 8:int)(children: 
VectorUDFYearTimestamp(col 1:timestamp, field YEAR) -> 5:int, 
VectorUDFYearDate(col 6, field YEAR)(children: CastStringToDate(col 2:string) 
-> 6:date) -> 8:int) -> 6:boolean, LongColEqualLongColumn(col 5:int, col 
9:int)(children: VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 
5:int, VectorUDFMonthDate(col 8, field MONTH)(children: CastStringToDate(col 
2:string) -> 8:date) -> 9:int) -> 8:boolean, LongColEqualLongColumn(col 5:int, 
col 10:int)(children: VectorUDFDayOfMonthTimestamp(col 1:timestamp, field 
DAY_OF_MONTH) -> 5:int, VectorUDFDayOfMonthDate(col 9, field 
DAY_OF_MONTH)(children: CastStringToDate(col 2:string) -> 9:date) -> 10:int) -> 
9:boolean, LongColEqualLongColumn(col 5:int, col
  10:int)(children: VectorUDFDayOfMonthTimestamp(col 1:timestamp, field 
DAY_OF_MONTH) -> 5:int, VectorUDFDayOfMonthString(col 2:string, fieldStart 8, 
fieldLength 2) -> 10:int) -> 11:boolean, LongColEqualLongColumn(col 5:int, col 
12:int)(children: VectorUDFWeekOfYearTimestamp(col 1:timestamp, field 
WEEK_OF_YEAR) -> 5:int, VectorUDFWeekOfYearDate(col 10, field 
WEEK_OF_YEAR)(children: CastStringToDate(col 2:string) -> 10:date) -> 12:int) 
-> 10:boolean, LongColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFHourTimestamp(col 1:timestamp, field HOUR_OF_DAY) -> 5:int, 
VectorUDFHourTimestamp(col 13:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 14:boolean, 
LongColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFMinuteTimestamp(col 1:timestamp, field MINUTE) -> 5:int, 
VectorUDFMinuteTimestamp(col 13:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 15:boolean, 
Lo
 ngColEqualLongColumn(col 5:int, col 12:int)(children: 
VectorUDFSecondTimestamp(col 1:timestamp, field SECOND) -> 5:int, 
VectorUDFSecondTimestamp(col 13:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 13:timestamp) -> 12:int) -> 16:boolean
+                        projectedOutputColumnNums: [7, 11, 15, 19, 22, 26, 30, 
34, 38]
+                        selectExpressions: LongColEqualLongColumn(col 
5:bigint, col 6:bigint)(children: VectorUDFUnixTimeStampTimestamp(col 
1:timestamp) -> 5:bigint, VectorUDFUnixTimeStampString(col 2:string) -> 
6:bigint) -> 7:boolean, LongColEqualLongColumn(col 8:int, col 10:int)(children: 
VectorUDFYearTimestamp(col 1:timestamp, field YEAR) -> 8:int, 
VectorUDFYearDate(col 9, field YEAR)(children: CastStringToDate(col 2:string) 
-> 9:date) -> 10:int) -> 11:boolean, LongColEqualLongColumn(col 12:int, col 
14:int)(children: VectorUDFMonthTimestamp(col 1:timestamp, field MONTH) -> 
12:int, VectorUDFMonthDate(col 13, field MONTH)(children: CastStringToDate(col 
2:string) -> 13:date) -> 14:int) -> 15:boolean, LongColEqualLongColumn(col 
16:int, col 18:int)(children: VectorUDFDayOfMonthTimestamp(col 1:timestamp, 
field DAY_OF_MONTH) -> 16:int, VectorUDFDayOfMonthDate(col 17, field 
DAY_OF_MONTH)(children: CastStringToDate(col 2:string) -> 17:date) -> 18:int) 
-> 19:boolean, LongColEqualLongColumn
 (col 20:int, col 21:int)(children: VectorUDFDayOfMonthTimestamp(col 
1:timestamp, field DAY_OF_MONTH) -> 20:int, VectorUDFDayOfMonthString(col 
2:string, fieldStart 8, fieldLength 2) -> 21:int) -> 22:boolean, 
LongColEqualLongColumn(col 23:int, col 25:int)(children: 
VectorUDFWeekOfYearTimestamp(col 1:timestamp, field WEEK_OF_YEAR) -> 23:int, 
VectorUDFWeekOfYearDate(col 24, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 2:string) -> 24:date) -> 25:int) -> 26:boolean, 
LongColEqualLongColumn(col 27:int, col 29:int)(children: 
VectorUDFHourTimestamp(col 1:timestamp, field HOUR_OF_DAY) -> 27:int, 
VectorUDFHourTimestamp(col 28:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 2:string) -> 28:timestamp) -> 29:int) -> 30:boolean, 
LongColEqualLongColumn(col 31:int, col 33:int)(children: 
VectorUDFMinuteTimestamp(col 1:timestamp, field MINUTE) -> 31:int, 
VectorUDFMinuteTimestamp(col 32:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 2:string) -> 32:timestamp) -> 33
 :int) -> 34:boolean, LongColEqualLongColumn(col 35:int, col 37:int)(children: 
VectorUDFSecondTimestamp(col 1:timestamp, field SECOND) -> 35:int, 
VectorUDFSecondTimestamp(col 36:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 2:string) -> 36:timestamp) -> 37:int) -> 38:boolean
                     Statistics: Num rows: 52 Data size: 1872 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: _col0 (type: boolean)
@@ -882,8 +882,8 @@ STAGE PLANS:
                     Select Vectorization:
                         className: VectorSelectOperator
                         native: true
-                        projectedOutputColumnNums: [2, 4, 5, 6, 3, 8, 7, 10, 
11]
-                        selectExpressions: VectorUDFUnixTimeStampString(col 
0:string) -> 2:bigint, VectorUDFYearDate(col 3, field YEAR)(children: 
CastStringToDate(col 0:string) -> 3:date) -> 4:int, VectorUDFMonthDate(col 3, 
field MONTH)(children: CastStringToDate(col 0:string) -> 3:date) -> 5:int, 
VectorUDFDayOfMonthDate(col 3, field DAY_OF_MONTH)(children: 
CastStringToDate(col 0:string) -> 3:date) -> 6:int, 
VectorUDFDayOfMonthString(col 0:string, fieldStart 8, fieldLength 2) -> 3:int, 
VectorUDFWeekOfYearDate(col 7, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 0:string) -> 7:date) -> 8:int, VectorUDFHourTimestamp(col 
9:timestamp, field HOUR_OF_DAY)(children: CastStringToTimestamp(col 0:string) 
-> 9:timestamp) -> 7:int, VectorUDFMinuteTimestamp(col 9:timestamp, field 
MINUTE)(children: CastStringToTimestamp(col 0:string) -> 9:timestamp) -> 
10:int, VectorUDFSecondTimestamp(col 9:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 0:string) -> 9:timestamp) -> 11:int
+                        projectedOutputColumnNums: [2, 4, 6, 8, 9, 11, 13, 15, 
17]
+                        selectExpressions: VectorUDFUnixTimeStampString(col 
0:string) -> 2:bigint, VectorUDFYearDate(col 3, field YEAR)(children: 
CastStringToDate(col 0:string) -> 3:date) -> 4:int, VectorUDFMonthDate(col 5, 
field MONTH)(children: CastStringToDate(col 0:string) -> 5:date) -> 6:int, 
VectorUDFDayOfMonthDate(col 7, field DAY_OF_MONTH)(children: 
CastStringToDate(col 0:string) -> 7:date) -> 8:int, 
VectorUDFDayOfMonthString(col 0:string, fieldStart 8, fieldLength 2) -> 9:int, 
VectorUDFWeekOfYearDate(col 10, field WEEK_OF_YEAR)(children: 
CastStringToDate(col 0:string) -> 10:date) -> 11:int, 
VectorUDFHourTimestamp(col 12:timestamp, field HOUR_OF_DAY)(children: 
CastStringToTimestamp(col 0:string) -> 12:timestamp) -> 13:int, 
VectorUDFMinuteTimestamp(col 14:timestamp, field MINUTE)(children: 
CastStringToTimestamp(col 0:string) -> 14:timestamp) -> 15:int, 
VectorUDFSecondTimestamp(col 16:timestamp, field SECOND)(children: 
CastStringToTimestamp(col 0:string) -> 16:timestamp) -> 17
 :int
                     Statistics: Num rows: 3 Data size: 120 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
@@ -1359,8 +1359,8 @@ STAGE PLANS:
                   Select Vectorization:
                       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, 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
+                      projectedOutputColumnNums: [5, 10, 15, 23, 29, 35, 41, 
50]
+                      selectExpressions: RoundWithNumDigitsDoubleToDouble(col 
4, decimalPlaces 0)(children: DoubleColDivideLongColumn(col 0:double, col 
1:bigint) -> 4:double) -> 5:double, DoubleColumnBetween(col 9:double, left 
8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 8:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 7:double)(children: 
DoubleColDivideLongColumn(col 6:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 6:double) -> 
7:double) -> 8:double) -> 9:double) -> 10:boolean, DoubleColumnBetween(col 
14:double, left 8.97077295279421E19, right 8.97077295279422E19)(children: 
DoubleColDivideLongColumn(col 13:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 12:double)(children: 
DoubleColDivideLongColumn(col 11:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 11:double) -> 
12:double) -> 13:do
 uble) -> 14:double) -> 15:boolean, DoubleColumnBetween(col 22:double, left 
9.20684592523616E19, right 9.20684592523617E19)(children: 
DoubleColDivideLongColumn(col 18:double, col 21:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 17:double)(children: 
DoubleColDivideLongColumn(col 16:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 16:double) -> 
17:double) -> 18:double, IfExprNullCondExpr(col 19:boolean, null, col 
20:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 19:boolean, 
LongColSubtractLongScalar(col 1:bigint, val 1) -> 20:bigint) -> 21:bigint) -> 
22:double) -> 23:boolean, RoundWithNumDigitsDoubleToDouble(col 28, 
decimalPlaces 3)(children: FuncPowerDoubleToDouble(col 27:double)(children: 
DoubleColDivideLongColumn(col 26:double, col 1:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 25:double)(children: 
DoubleColDivideLongColumn(col 24:double, col 1:bigint)(children: 
DoubleColMultiplyDo
 ubleColumn(col 3:double, col 3:double) -> 24:double) -> 25:double) -> 
26:double) -> 27:double) -> 28:double) -> 29:double, 
RoundWithNumDigitsDoubleToDouble(col 34, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 33:double)(children: DoubleColDivideLongColumn(col 
32:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 31:double)(children: DoubleColDivideLongColumn(col 30:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 30:double) -> 31:double) -> 32:double) -> 33:double) -> 34:double) -> 
35:double, RoundWithNumDigitsDoubleToDouble(col 40, decimalPlaces 3)(children: 
FuncPowerDoubleToDouble(col 39:double)(children: DoubleColDivideLongColumn(col 
38:double, col 1:bigint)(children: DoubleColSubtractDoubleColumn(col 2:double, 
col 37:double)(children: DoubleColDivideLongColumn(col 36:double, col 
1:bigint)(children: DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) 
-> 36:double) -> 37:double) -> 38:double) 
 -> 39:double) -> 40:double) -> 41:double, RoundWithNumDigitsDoubleToDouble(col 
49, decimalPlaces 3)(children: FuncPowerDoubleToDouble(col 48:double)(children: 
DoubleColDivideLongColumn(col 44:double, col 47:bigint)(children: 
DoubleColSubtractDoubleColumn(col 2:double, col 43:double)(children: 
DoubleColDivideLongColumn(col 42:double, col 1:bigint)(children: 
DoubleColMultiplyDoubleColumn(col 3:double, col 3:double) -> 42:double) -> 
43:double) -> 44:double, IfExprNullCondExpr(col 45:boolean, null, col 
46:bigint)(children: LongColEqualLongScalar(col 1:bigint, val 1) -> 45:boolean, 
LongColSubtractLongScalar(col 1:bigint, val 1) -> 46:bigint) -> 47:bigint) -> 
48:double) -> 49:double) -> 50: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/8b968c7e/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
index 9073b6a..c52e3b9 100644
--- 
a/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/vectorized_timestamp_ints_casts.q.out
@@ -72,8 +72,8 @@ STAGE PLANS:
                       Select Vectorization:
                           className: VectorSelectOperator
                           native: true
-                          projectedOutputColumnNums: [15, 17, 19, 21, 22, 23, 
25, 27, 8, 28, 30]
-                          selectExpressions: 
CastMillisecondsLongToTimestamp(col 0:tinyint) -> 15:timestamp, 
CastMillisecondsLongToTimestamp(col 1:smallint) -> 17:timestamp, 
CastMillisecondsLongToTimestamp(col 2:int) -> 19:timestamp, 
CastMillisecondsLongToTimestamp(col 3:bigint) -> 21:timestamp, 
CastDoubleToTimestamp(col 4:float) -> 22:timestamp, CastDoubleToTimestamp(col 
5:double) -> 23:timestamp, CastMillisecondsLongToTimestamp(col 10:boolean) -> 
25:timestamp, CastMillisecondsLongToTimestamp(col 13:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 13:bigint) -> 27:timestamp, 
CastStringToTimestamp(col 6:string) -> 28:timestamp, CastStringToTimestamp(col 
29:string)(children: StringSubstrColStartLen(col 6:string, start 0, length 1) 
-> 29:string) -> 30:timestamp
+                          projectedOutputColumnNums: [15, 17, 19, 21, 22, 23, 
25, 29, 8, 30, 32]
+                          selectExpressions: 
CastMillisecondsLongToTimestamp(col 0:tinyint) -> 15:timestamp, 
CastMillisecondsLongToTimestamp(col 1:smallint) -> 17:timestamp, 
CastMillisecondsLongToTimestamp(col 2:int) -> 19:timestamp, 
CastMillisecondsLongToTimestamp(col 3:bigint) -> 21:timestamp, 
CastDoubleToTimestamp(col 4:float) -> 22:timestamp, CastDoubleToTimestamp(col 
5:double) -> 23:timestamp, CastMillisecondsLongToTimestamp(col 10:boolean) -> 
25:timestamp, CastMillisecondsLongToTimestamp(col 28:bigint)(children: 
LongColMultiplyLongScalar(col 3:bigint, val 0) -> 28:bigint) -> 29:timestamp, 
CastStringToTimestamp(col 6:string) -> 30:timestamp, CastStringToTimestamp(col 
31:string)(children: StringSubstrColStartLen(col 6:string, start 0, length 1) 
-> 31:string) -> 32:timestamp
                       Statistics: Num rows: 6144 Data size: 2703360 Basic 
stats: COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false
@@ -241,8 +241,8 @@ STAGE PLANS:
                       Select Vectorization:
                           className: VectorSelectOperator
                           native: true
-                          projectedOutputColumnNums: [14, 15, 16, 17, 18, 19, 
20, 21, 8, 22, 24]
-                          selectExpressions: CastLongToTimestamp(col 
0:tinyint) -> 14:timestamp, CastLongToTimestamp(col 1:smallint) -> 
15:timestamp, CastLongToTimestamp(col 2:int) -> 16:timestamp, 
CastLongToTimestamp(col 3:bigint) -> 17:timestamp, CastDoubleToTimestamp(col 
4:float) -> 18:timestamp, CastDoubleToTimestamp(col 5:double) -> 19:timestamp, 
CastLongToTimestamp(col 10:boolean) -> 20:timestamp, CastLongToTimestamp(col 
13:bigint)(children: LongColMultiplyLongScalar(col 3:bigint, val 0) -> 
13:bigint) -> 21:timestamp, CastStringToTimestamp(col 6:string) -> 
22:timestamp, CastStringToTimestamp(col 23:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 23:string) -> 
24:timestamp
+                          projectedOutputColumnNums: [14, 15, 16, 17, 18, 19, 
20, 22, 8, 23, 25]
+                          selectExpressions: CastLongToTimestamp(col 
0:tinyint) -> 14:timestamp, CastLongToTimestamp(col 1:smallint) -> 
15:timestamp, CastLongToTimestamp(col 2:int) -> 16:timestamp, 
CastLongToTimestamp(col 3:bigint) -> 17:timestamp, CastDoubleToTimestamp(col 
4:float) -> 18:timestamp, CastDoubleToTimestamp(col 5:double) -> 19:timestamp, 
CastLongToTimestamp(col 10:boolean) -> 20:timestamp, CastLongToTimestamp(col 
21:bigint)(children: LongColMultiplyLongScalar(col 3:bigint, val 0) -> 
21:bigint) -> 22:timestamp, CastStringToTimestamp(col 6:string) -> 
23:timestamp, CastStringToTimestamp(col 24:string)(children: 
StringSubstrColStartLen(col 6:string, start 0, length 1) -> 24:string) -> 
25:timestamp
                       Statistics: Num rows: 6144 Data size: 2703360 Basic 
stats: COMPLETE Column stats: COMPLETE
                       File Output Operator
                         compressed: false

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/orc_struct_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/orc_struct_type_vectorization.q.out 
b/ql/src/test/results/clientpositive/orc_struct_type_vectorization.q.out
index 6c8109c..76de377 100644
--- a/ql/src/test/results/clientpositive/orc_struct_type_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/orc_struct_type_vectorization.q.out
@@ -233,16 +233,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [4]
-                    selectExpressions: VectorUDFStructField(col 
1:struct<f1:int,f2:string>, col 0:int) -> 4:int
+                    projectedOutputColumnNums: [5]
+                    selectExpressions: VectorUDFStructField(col 
1:struct<f1:int,f2:string>, col 0:int) -> 5:int
                 Statistics: Num rows: 341 Data size: 65472 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col0)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 4:int) -> bigint
+                      aggregators: VectorUDAFSumLong(col 5:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 4:int
+                      keyExpressions: col 5:int
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/parquet_complex_types_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/parquet_complex_types_vectorization.q.out 
b/ql/src/test/results/clientpositive/parquet_complex_types_vectorization.q.out
index d48f3c8..7e71479 100644
--- 
a/ql/src/test/results/clientpositive/parquet_complex_types_vectorization.q.out
+++ 
b/ql/src/test/results/clientpositive/parquet_complex_types_vectorization.q.out
@@ -209,16 +209,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [6, 7]
-                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 6:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 7:int
+                    projectedOutputColumnNums: [7, 8]
+                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 7:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 8:int
                 Statistics: Num rows: 341 Data size: 1705 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col1)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 7:int) -> bigint
+                      aggregators: VectorUDAFSumLong(col 8:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 6:int
+                      keyExpressions: col 7:int
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]
@@ -490,16 +490,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [6, 7]
-                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 6:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 7:int
+                    projectedOutputColumnNums: [7, 8]
+                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 7:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 8:int
                 Statistics: Num rows: 341 Data size: 1705 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col1)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 7:int) -> bigint
+                      aggregators: VectorUDAFSumLong(col 8:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 6:int
+                      keyExpressions: col 7:int
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]
@@ -771,16 +771,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [6, 7]
-                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 6:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 7:int
+                    projectedOutputColumnNums: [7, 8]
+                    selectExpressions: ListIndexColScalar(col 2:array<int>, 
col 1:int) -> 7:int, ListIndexColScalar(col 2:array<int>, col 0:int) -> 8:int
                 Statistics: Num rows: 341 Data size: 1705 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col1)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 7:int) -> bigint
+                      aggregators: VectorUDAFSumLong(col 8:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 6:int
+                      keyExpressions: col 7:int
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/parquet_map_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/parquet_map_type_vectorization.q.out 
b/ql/src/test/results/clientpositive/parquet_map_type_vectorization.q.out
index 5322c92..d15d111 100644
--- a/ql/src/test/results/clientpositive/parquet_map_type_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/parquet_map_type_vectorization.q.out
@@ -225,16 +225,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [8, 9, 10]
-                    selectExpressions: VectorUDFMapIndexStringScalar(col 
1:map<string,string>, key: k1) -> 8:string, VectorUDFMapIndexLongScalar(col 
2:map<int,int>, key: 123) -> 9:int, VectorUDFMapIndexDecimalScalar(col 
3:map<double,double>, key: 123.123) -> 10:double
+                    projectedOutputColumnNums: [9, 10, 11]
+                    selectExpressions: VectorUDFMapIndexStringScalar(col 
1:map<string,string>, key: k1) -> 9:string, VectorUDFMapIndexLongScalar(col 
2:map<int,int>, key: 123) -> 10:int, VectorUDFMapIndexDecimalScalar(col 
3:map<double,double>, key: 123.123) -> 11:double
                 Statistics: Num rows: 511 Data size: 3577 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col1), sum(_col2)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 9:int) -> bigint, 
VectorUDAFSumDouble(col 10:double) -> double
+                      aggregators: VectorUDAFSumLong(col 10:int) -> bigint, 
VectorUDAFSumDouble(col 11:double) -> double
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 8:string
+                      keyExpressions: col 9:string
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0, 1]

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/parquet_struct_type_vectorization.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/parquet_struct_type_vectorization.q.out 
b/ql/src/test/results/clientpositive/parquet_struct_type_vectorization.q.out
index 2893a58..5d549be 100644
--- a/ql/src/test/results/clientpositive/parquet_struct_type_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/parquet_struct_type_vectorization.q.out
@@ -233,16 +233,16 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [4]
-                    selectExpressions: VectorUDFStructField(col 
1:struct<f1:int,f2:string>, col 0:int) -> 4:int
+                    projectedOutputColumnNums: [5]
+                    selectExpressions: VectorUDFStructField(col 
1:struct<f1:int,f2:string>, col 0:int) -> 5:int
                 Statistics: Num rows: 341 Data size: 1023 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col0)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 4:int) -> bigint
+                      aggregators: VectorUDAFSumLong(col 5:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
-                      keyExpressions: col 4:int
+                      keyExpressions: col 5:int
                       native: false
                       vectorProcessingMode: HASH
                       projectedOutputColumnNums: [0]

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out 
b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out
index d45655d..3698e9d 100644
--- a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out
+++ b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out
@@ -1504,13 +1504,13 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [3, 4, 0, 14, 17]
-                    selectExpressions: CastLongToDouble(col 3:bigint) -> 
14:double, DoubleColMultiplyDoubleColumn(col 15:double, col 
16:double)(children: CastLongToDouble(col 3:bigint) -> 15:double, 
CastLongToDouble(col 3:bigint) -> 16:double) -> 17:double
+                    projectedOutputColumnNums: [3, 4, 0, 15, 18]
+                    selectExpressions: CastLongToDouble(col 3:bigint) -> 
15:double, DoubleColMultiplyDoubleColumn(col 16:double, col 
17:double)(children: CastLongToDouble(col 3:bigint) -> 16:double, 
CastLongToDouble(col 3:bigint) -> 17:double) -> 18:double
                 Statistics: Num rows: 12288 Data size: 147456 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col0), count(_col0), sum(_col4), 
sum(_col3), count(), sum(_col1), min(_col2)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumLong(col 3:bigint) -> bigint, 
VectorUDAFCount(col 3:bigint) -> bigint, VectorUDAFSumDouble(col 17:double) -> 
double, VectorUDAFSumDouble(col 14:double) -> double, VectorUDAFCountStar(*) -> 
bigint, VectorUDAFSumDouble(col 4:float) -> double, VectorUDAFMinLong(col 
0:tinyint) -> tinyint
+                      aggregators: VectorUDAFSumLong(col 3:bigint) -> bigint, 
VectorUDAFCount(col 3:bigint) -> bigint, VectorUDAFSumDouble(col 18:double) -> 
double, VectorUDAFSumDouble(col 15:double) -> double, VectorUDAFCountStar(*) -> 
bigint, VectorUDAFSumDouble(col 4:float) -> double, VectorUDAFMinLong(col 
0:tinyint) -> tinyint
                       className: VectorGroupByOperator
                       groupByMode: HASH
                       native: false

http://git-wip-us.apache.org/repos/asf/hive/blob/8b968c7e/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out 
b/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out
index 433972e..1dfd429 100644
--- a/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out
+++ b/ql/src/test/results/clientpositive/parquet_vectorization_1.q.out
@@ -75,13 +75,13 @@ STAGE PLANS:
                 Select Vectorization:
                     className: VectorSelectOperator
                     native: true
-                    projectedOutputColumnNums: [0, 4, 2, 5, 13, 16, 14]
-                    selectExpressions: CastLongToDouble(col 0:tinyint) -> 
13:double, DoubleColMultiplyDoubleColumn(col 14:double, col 
15:double)(children: CastLongToDouble(col 0:tinyint) -> 14:double, 
CastLongToDouble(col 0:tinyint) -> 15:double) -> 16:double, 
DoubleColMultiplyDoubleColumn(col 5:double, col 5:double) -> 14:double
+                    projectedOutputColumnNums: [0, 4, 2, 5, 14, 17, 18]
+                    selectExpressions: CastLongToDouble(col 0:tinyint) -> 
14:double, DoubleColMultiplyDoubleColumn(col 15:double, col 
16:double)(children: CastLongToDouble(col 0:tinyint) -> 15:double, 
CastLongToDouble(col 0:tinyint) -> 16:double) -> 17:double, 
DoubleColMultiplyDoubleColumn(col 5:double, col 5:double) -> 18:double
                 Statistics: Num rows: 12288 Data size: 147456 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(_col5), sum(_col4), count(_col0), 
sum(_col1), max(_col0), max(_col2), sum(_col6), sum(_col3), count(_col3), 
count(_col2)
                   Group By Vectorization:
-                      aggregators: VectorUDAFSumDouble(col 16:double) -> 
double, VectorUDAFSumDouble(col 13:double) -> double, VectorUDAFCount(col 
0:tinyint) -> bigint, VectorUDAFSumDouble(col 4:float) -> double, 
VectorUDAFMaxLong(col 0:tinyint) -> tinyint, VectorUDAFMaxLong(col 2:int) -> 
int, VectorUDAFSumDouble(col 14:double) -> double, VectorUDAFSumDouble(col 
5:double) -> double, VectorUDAFCount(col 5:double) -> bigint, 
VectorUDAFCount(col 2:int) -> bigint
+                      aggregators: VectorUDAFSumDouble(col 17:double) -> 
double, VectorUDAFSumDouble(col 14:double) -> double, VectorUDAFCount(col 
0:tinyint) -> bigint, VectorUDAFSumDouble(col 4:float) -> double, 
VectorUDAFMaxLong(col 0:tinyint) -> tinyint, VectorUDAFMaxLong(col 2:int) -> 
int, VectorUDAFSumDouble(col 18:double) -> double, VectorUDAFSumDouble(col 
5:double) -> double, VectorUDAFCount(col 5:double) -> bigint, 
VectorUDAFCount(col 2:int) -> bigint
                       className: VectorGroupByOperator
                       groupByMode: HASH
                       native: false

Reply via email to