http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out 
b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
index 8866890..edc8f74 100644
--- a/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
+++ b/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
@@ -147,7 +147,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -357,7 +357,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -400,7 +400,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -615,7 +615,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -771,7 +771,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -986,7 +986,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -1204,7 +1204,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -1424,7 +1424,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -1461,7 +1461,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -1640,7 +1640,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -1682,7 +1682,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -2257,7 +2257,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -2471,7 +2471,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -2754,7 +2754,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -2972,7 +2972,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -3009,7 +3009,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -3264,7 +3264,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -3477,7 +3477,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: p_mfgr (type: string), p_brand (type: 
string), p_retailprice (type: double)
                     outputColumnNames: p_mfgr, p_brand, p_retailprice
@@ -3756,7 +3756,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -4211,7 +4211,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string)
                     sort order: +
@@ -4524,7 +4524,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string)
                     sort order: +
@@ -4832,7 +4832,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -5150,7 +5150,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -5477,7 +5477,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++
@@ -5774,7 +5774,7 @@ STAGE PLANS:
                   Statistics: Num rows: 26 Data size: 16042 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:p_partkey:int, 
1:p_name:string, 2:p_mfgr:string, 3:p_brand:string, 4:p_type:string, 
5:p_size:int, 6:p_container:string, 7:p_retailprice:double, 8:p_comment:string, 
9:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: p_mfgr (type: string), p_name (type: 
string)
                     sort order: ++

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out 
b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
index b7d5b40..92a04dd 100644
--- 
a/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
+++ 
b/ql/src/test/results/clientpositive/tez/acid_vectorization_original_tez.q.out
@@ -521,11 +521,11 @@ STAGE PLANS:
                     predicate: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
                     Statistics: Num rows: 2 Data size: 40 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), t (type: tinyint), si 
(type: smallint), i (type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), t (type: tinyint), si (type: 
smallint), i (type: int)
                       outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 2 Data size: 176 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
-                        key expressions: _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Statistics: Num rows: 2 Data size: 176 Basic stats: 
COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: tinyint), _col2 (type: 
smallint), _col3 (type: int)
@@ -534,7 +534,7 @@ STAGE PLANS:
             Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: 
tinyint), VALUE._col1 (type: smallint), VALUE._col2 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: tinyint), 
VALUE._col1 (type: smallint), VALUE._col2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE 
Column stats: COMPLETE
                 File Output Operator
@@ -559,12 +559,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from 
over10k_orc_bucketed where b = 42
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-{"transactionid":0,"bucketid":536870912,"rowid":36}    -3      344     65733
-{"transactionid":0,"bucketid":536870912,"rowid":300}   -3      344     65733
-{"transactionid":0,"bucketid":536936448,"rowid":82}    5       501     65585
-{"transactionid":0,"bucketid":536936448,"rowid":344}   5       501     65585
-{"transactionid":0,"bucketid":537067520,"rowid":211}   35      463     65646
-{"transactionid":0,"bucketid":537067520,"rowid":488}   35      463     65646
+{"writeid":0,"bucketid":536870912,"rowid":36}  -3      344     65733
+{"writeid":0,"bucketid":536870912,"rowid":300} -3      344     65733
+{"writeid":0,"bucketid":536936448,"rowid":82}  5       501     65585
+{"writeid":0,"bucketid":536936448,"rowid":344} 5       501     65585
+{"writeid":0,"bucketid":537067520,"rowid":211} 35      463     65646
+{"writeid":0,"bucketid":537067520,"rowid":488} 35      463     65646
 PREHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 
4294967363 and t < 100
 PREHOOK: type: QUERY
 POSTHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 
4294967363 and t < 100
@@ -593,11 +593,11 @@ STAGE PLANS:
                     predicate: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
                     Statistics: Num rows: 2 Data size: 674 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), t (type: tinyint), si 
(type: smallint), f (type: float), d (type: double), bo (type: boolean), s 
(type: string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: 
binary)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), t (type: tinyint), si (type: 
smallint), f (type: float), d (type: double), bo (type: boolean), s (type: 
string), ts (type: timestamp), dec (type: decimal(4,2)), bin (type: binary)
                       outputColumnNames: _col0, _col1, _col2, _col5, _col6, 
_col7, _col8, _col9, _col10, _col11
                       Statistics: Num rows: 2 Data size: 834 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
-                        key expressions: _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) 
(type: int)
                         Statistics: Num rows: 2 Data size: 834 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -607,7 +607,7 @@ STAGE PLANS:
             Execution mode: vectorized
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: 
tinyint), VALUE._col1 (type: smallint), 0 (type: int), 4294967363L (type: 
bigint), VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 
(type: boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), 
VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: tinyint), 
VALUE._col1 (type: smallint), 0 (type: int), 4294967363L (type: bigint), 
VALUE._col3 (type: float), VALUE._col4 (type: double), VALUE._col5 (type: 
boolean), VALUE._col6 (type: string), VALUE._col7 (type: timestamp), 
VALUE._col8 (type: decimal(4,2)), VALUE._col9 (type: binary)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
                 Statistics: Num rows: 2 Data size: 834 Basic stats: COMPLETE 
Column stats: COMPLETE
                 File Output Operator
@@ -654,12 +654,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from 
over10k_orc_bucketed where b = 42
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-{"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":0}  -3      
344     0
-{"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":1}  -3      
344     0
-{"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":0}  5       
501     0
-{"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":1}  5       
501     0
-{"transactionid":### Masked txnid ###,"bucketid":537067520,"rowid":0}  35      
463     0
-{"transactionid":### Masked txnid ###,"bucketid":537067520,"rowid":1}  35      
463     0
+{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":0}      -3      
344     0
+{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":1}      -3      
344     0
+{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":0}      5       
501     0
+{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":1}      5       
501     0
+{"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":0}      35      
463     0
+{"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":1}      35      
463     0
 PREHOOK: query: explain select ROW__ID, count(*) from over10k_orc_bucketed 
group by ROW__ID having count(*) > 1
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select ROW__ID, count(*) from over10k_orc_bucketed 
group by ROW__ID having count(*) > 1
@@ -682,26 +682,26 @@ STAGE PLANS:
                   alias: over10k_orc_bucketed
                   Statistics: Num rows: 2098 Data size: 622340 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Select Operator
-                    expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: ROW__ID
                     Statistics: Num rows: 2098 Data size: 622340 Basic stats: 
COMPLETE Column stats: COMPLETE
                     Group By Operator
                       aggregations: count()
-                      keys: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1049 Data size: 88116 Basic stats: 
COMPLETE Column stats: COMPLETE
                       Reduce Output Operator
-                        key expressions: _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
-                        Map-reduce partition columns: _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        Map-reduce partition columns: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         Statistics: Num rows: 1049 Data size: 88116 Basic 
stats: COMPLETE Column stats: COMPLETE
                         value expressions: _col1 (type: bigint)
         Reducer 2 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: count(VALUE._col0)
-                keys: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                keys: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 1049 Data size: 88116 Basic stats: 
COMPLETE Column stats: COMPLETE
@@ -742,12 +742,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from 
over10k_orc_bucketed where b = 42
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over10k_orc_bucketed
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-{"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":0}  -3      
344     0
-{"transactionid":### Masked txnid ###,"bucketid":536870912,"rowid":1}  -3      
344     0
-{"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":0}  5       
501     0
-{"transactionid":### Masked txnid ###,"bucketid":536936448,"rowid":1}  5       
501     0
-{"transactionid":### Masked txnid ###,"bucketid":537067520,"rowid":0}  35      
463     0
-{"transactionid":### Masked txnid ###,"bucketid":537067520,"rowid":1}  35      
463     0
+{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":0}      -3      
344     0
+{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":1}      -3      
344     0
+{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":0}      5       
501     0
+{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":1}      5       
501     0
+{"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":0}      35      
463     0
+{"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":1}      35      
463     0
 PREHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by 
ROW__ID having count(*) > 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over10k_orc_bucketed

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out 
b/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out
index 7f2216d..b8a1f90 100644
--- a/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out
+++ b/ql/src/test/results/clientpositive/tez/vectorization_limit.q.out
@@ -100,7 +100,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 146796 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator
@@ -248,7 +248,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 110096 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: ctinyint (type: tinyint), (cdouble + 1.0D) 
(type: double)
                     outputColumnNames: _col0, _col1
@@ -412,7 +412,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 36696 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: ctinyint (type: tinyint)
                     outputColumnNames: ctinyint
@@ -569,7 +569,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 110096 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: ctinyint (type: tinyint), cdouble (type: 
double)
                     outputColumnNames: ctinyint, cdouble
@@ -769,7 +769,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 110096 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Filter Operator
                     Filter Vectorization:
                         className: VectorFilterOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_aggregate_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_aggregate_9.q.out 
b/ql/src/test/results/clientpositive/vector_aggregate_9.q.out
index 99d23b1..6cf99bb 100644
--- a/ql/src/test/results/clientpositive/vector_aggregate_9.q.out
+++ b/ql/src/test/results/clientpositive/vector_aggregate_9.q.out
@@ -124,7 +124,7 @@ STAGE PLANS:
             Statistics: Num rows: 2000 Data size: 918712 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dc (type: decimal(38,18))
               outputColumnNames: dc
@@ -226,7 +226,7 @@ STAGE PLANS:
             Statistics: Num rows: 2000 Data size: 918712 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: d (type: double)
               outputColumnNames: d
@@ -328,7 +328,7 @@ STAGE PLANS:
             Statistics: Num rows: 2000 Data size: 918712 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:tinyint, 1:si:smallint, 
2:i:int, 3:b:bigint, 4:f:float, 5:d:double, 6:dc:decimal(38,18), 7:bo:boolean, 
8:s:string, 9:s2:string, 10:ts:timestamp, 11:ts2:timestamp, 12:dt:date, 
13:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: ts (type: timestamp)
               outputColumnNames: ts

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_aggregate_without_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vector_aggregate_without_gby.q.out 
b/ql/src/test/results/clientpositive/vector_aggregate_without_gby.q.out
index eab3b7a..4d2b0dc 100644
--- a/ql/src/test/results/clientpositive/vector_aggregate_without_gby.q.out
+++ b/ql/src/test/results/clientpositive/vector_aggregate_without_gby.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
             Statistics: Num rows: 7 Data size: 714 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:id:int, 1:dt:int, 
2:greg_dt:string, 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:id:int, 1:dt:int, 
2:greg_dt:string, 3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_bround.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_bround.q.out 
b/ql/src/test/results/clientpositive/vector_bround.q.out
index 57fb16f..644902b 100644
--- a/ql/src/test/results/clientpositive/vector_bround.q.out
+++ b/ql/src/test/results/clientpositive/vector_bround.q.out
@@ -67,7 +67,7 @@ STAGE PLANS:
             Statistics: Num rows: 9 Data size: 128 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:v0:double, 1:v1:double, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:v0:double, 1:v1:double, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: bround(v0) (type: double), bround(v1, 1) (type: 
double)
               outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_case_when_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_case_when_1.q.out 
b/ql/src/test/results/clientpositive/vector_case_when_1.q.out
index f80f477..f17c462 100644
--- a/ql/src/test/results/clientpositive/vector_case_when_1.q.out
+++ b/ql/src/test/results/clientpositive/vector_case_when_1.q.out
@@ -528,7 +528,7 @@ STAGE PLANS:
             Statistics: Num rows: 101 Data size: 78920 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:l_orderkey:int, 
1:l_partkey:int, 2:l_suppkey:int, 3:l_linenumber:int, 4:l_quantity:int, 
5:l_extendedprice:double, 6:l_discount:double, 7:l_tax:decimal(10,2), 
8:l_returnflag:char(1), 9:l_linestatus:char(1), 10:l_shipdate:date, 
11:l_commitdate:date, 12:l_receiptdate:date, 13:l_shipinstruct:varchar(20), 
14:l_shipmode:char(10), 15:l_comment:string, 
16:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:l_orderkey:int, 
1:l_partkey:int, 2:l_suppkey:int, 3:l_linenumber:int, 4:l_quantity:int, 
5:l_extendedprice:double, 6:l_discount:double, 7:l_tax:decimal(10,2), 
8:l_returnflag:char(1), 9:l_linestatus:char(1), 10:l_shipdate:date, 
11:l_commitdate:date, 12:l_receiptdate:date, 13:l_shipinstruct:varchar(20), 
14:l_shipmode:char(10), 15:l_comment:string, 
16:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: l_quantity (type: int), CASE WHEN ((l_quantity = 
1)) THEN ('Single') WHEN ((l_quantity = 2)) THEN ('Two') WHEN ((l_quantity < 
10)) THEN ('Some') WHEN ((l_quantity < 100)) THEN ('Many') ELSE ('Huge number') 
END (type: string), CASE WHEN ((l_quantity = 1)) THEN ('Single') WHEN 
((l_quantity = 2)) THEN ('Two') WHEN ((l_quantity < 10)) THEN ('Some') WHEN 
((l_quantity < 100)) THEN ('Many') ELSE (null) END (type: string), CASE WHEN 
((l_quantity = 1)) THEN ('Single') WHEN ((l_quantity = 2)) THEN ('Two') WHEN 
((l_quantity < 10)) THEN ('Some') WHEN ((l_quantity < 100)) THEN (null) ELSE 
(null) END (type: string), if((l_shipmode = 'SHIP      '), date_add(l_shipdate, 
10), date_add(l_shipdate, 5)) (type: date), CASE WHEN ((l_returnflag = 'N')) 
THEN ((l_extendedprice * (1.0D - l_discount))) ELSE (0) END (type: double), 
CASE WHEN ((l_returnflag = 'N')) THEN ((l_extendedprice * (1.0D - l_discount))) 
ELSE (0.0D) END (type: double), if((UDFToString(l_shipinstruct) = 'DELIVER
  IN PERSON'), null, l_tax) (type: decimal(10,2)), 
if((UDFToString(l_shipinstruct) = 'TAKE BACK RETURN'), l_tax, null) (type: 
decimal(10,2)), if((UDFToString(l_shipinstruct) = 'DELIVER IN PERSON'), 0, 
l_tax) (type: decimal(12,2)), if((UDFToString(l_shipinstruct) = 'TAKE BACK 
RETURN'), l_tax, 0) (type: decimal(12,2)), if((UDFToString(l_shipinstruct) = 
'DELIVER IN PERSON'), 0, l_tax) (type: decimal(10,2)), 
if((UDFToString(l_shipinstruct) = 'TAKE BACK RETURN'), l_tax, 0) (type: 
decimal(10,2)), if((l_partkey > 30), CAST( l_receiptdate AS TIMESTAMP), CAST( 
l_commitdate AS TIMESTAMP)) (type: timestamp), if((l_suppkey > 10000), 
datediff(l_receiptdate, l_commitdate), null) (type: int), if((l_suppkey > 
10000), null, datediff(l_receiptdate, l_commitdate)) (type: int), 
if(((l_suppkey % 500) > 100), DATE'2009-01-01', DATE'2009-12-31') (type: date)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16
@@ -877,7 +877,7 @@ STAGE PLANS:
             Statistics: Num rows: 101 Data size: 78920 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:l_orderkey:int, 
1:l_partkey:int, 2:l_suppkey:int, 3:l_linenumber:int, 4:l_quantity:int, 
5:l_extendedprice:double, 6:l_discount:double, 7:l_tax:decimal(10,2), 
8:l_returnflag:char(1), 9:l_linestatus:char(1), 10:l_shipdate:date, 
11:l_commitdate:date, 12:l_receiptdate:date, 13:l_shipinstruct:varchar(20), 
14:l_shipmode:char(10), 15:l_comment:string, 
16:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:l_orderkey:int, 
1:l_partkey:int, 2:l_suppkey:int, 3:l_linenumber:int, 4:l_quantity:int, 
5:l_extendedprice:double, 6:l_discount:double, 7:l_tax:decimal(10,2), 
8:l_returnflag:char(1), 9:l_linestatus:char(1), 10:l_shipdate:date, 
11:l_commitdate:date, 12:l_receiptdate:date, 13:l_shipinstruct:varchar(20), 
14:l_shipmode:char(10), 15:l_comment:string, 
16:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: l_quantity (type: int), CASE WHEN ((l_quantity = 
1)) THEN ('Single') WHEN ((l_quantity = 2)) THEN ('Two') WHEN ((l_quantity < 
10)) THEN ('Some') WHEN ((l_quantity < 100)) THEN ('Many') ELSE ('Huge number') 
END (type: string), CASE WHEN ((l_quantity = 1)) THEN ('Single') WHEN 
((l_quantity = 2)) THEN ('Two') WHEN ((l_quantity < 10)) THEN ('Some') WHEN 
((l_quantity < 100)) THEN ('Many') ELSE (null) END (type: string), CASE WHEN 
((l_quantity = 1)) THEN ('Single') WHEN ((l_quantity = 2)) THEN ('Two') WHEN 
((l_quantity < 10)) THEN ('Some') WHEN ((l_quantity < 100)) THEN (null) ELSE 
(null) END (type: string), if((l_shipmode = 'SHIP      '), date_add(l_shipdate, 
10), date_add(l_shipdate, 5)) (type: date), CASE WHEN ((l_returnflag = 'N')) 
THEN ((l_extendedprice * (1.0D - l_discount))) ELSE (0) END (type: double), 
CASE WHEN ((l_returnflag = 'N')) THEN ((l_extendedprice * (1.0D - l_discount))) 
ELSE (0.0D) END (type: double), if((UDFToString(l_shipinstruct) = 'DELIVER
  IN PERSON'), null, l_tax) (type: decimal(10,2)), 
if((UDFToString(l_shipinstruct) = 'TAKE BACK RETURN'), l_tax, null) (type: 
decimal(10,2)), if((UDFToString(l_shipinstruct) = 'DELIVER IN PERSON'), 0, 
l_tax) (type: decimal(12,2)), if((UDFToString(l_shipinstruct) = 'TAKE BACK 
RETURN'), l_tax, 0) (type: decimal(12,2)), if((UDFToString(l_shipinstruct) = 
'DELIVER IN PERSON'), 0, l_tax) (type: decimal(10,2)), 
if((UDFToString(l_shipinstruct) = 'TAKE BACK RETURN'), l_tax, 0) (type: 
decimal(10,2)), if((l_partkey > 30), CAST( l_receiptdate AS TIMESTAMP), CAST( 
l_commitdate AS TIMESTAMP)) (type: timestamp), if((l_suppkey > 10000), 
datediff(l_receiptdate, l_commitdate), null) (type: int), if((l_suppkey > 
10000), null, datediff(l_receiptdate, l_commitdate)) (type: int), 
if(((l_suppkey % 500) > 100), DATE'2009-01-01', DATE'2009-12-31') (type: date)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, _col15, 
_col16

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_case_when_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_case_when_2.q.out 
b/ql/src/test/results/clientpositive/vector_case_when_2.q.out
index 69347ce..89c16b0 100644
--- a/ql/src/test/results/clientpositive/vector_case_when_2.q.out
+++ b/ql/src/test/results/clientpositive/vector_case_when_2.q.out
@@ -368,7 +368,7 @@ STAGE PLANS:
             Statistics: Num rows: 51 Data size: 12384 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdate:date, 
1:ctimestamp1:timestamp, 2:stimestamp1:string, 3:ctimestamp2:timestamp, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdate:date, 
1:ctimestamp1:timestamp, 2:stimestamp1:string, 3:ctimestamp2:timestamp, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: ctimestamp1 (type: timestamp), ctimestamp2 (type: 
timestamp), CASE WHEN ((ctimestamp2 <= TIMESTAMP'1800-12-31 00:00:00.0')) THEN 
('1800s or Earlier') WHEN ((ctimestamp2 < TIMESTAMP'1900-01-01 00:00:00.0')) 
THEN ('1900s') WHEN (ctimestamp2 BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND 
TIMESTAMP'2010-12-31 23:59:59.999999999') THEN ('Late 2000s') WHEN 
((ctimestamp2 <= TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN ('Early 
2010s') ELSE ('Unknown') END (type: string), CASE WHEN ((ctimestamp2 <= 
TIMESTAMP'2000-12-31 23:59:59.999999999')) THEN ('Old') WHEN ((ctimestamp2 < 
TIMESTAMP'2006-01-01 00:00:00.0')) THEN ('Early 2000s') WHEN (ctimestamp2 
BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND TIMESTAMP'2010-12-31 
23:59:59.999999999') THEN ('Late 2000s') WHEN ((ctimestamp2 <= 
TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN ('Early 2010s') ELSE (null) END 
(type: string), CASE WHEN ((ctimestamp2 <= TIMESTAMP'2000-12-31 
23:59:59.999999999')) THEN ('Old') WHEN ((ctimesta
 mp2 < TIMESTAMP'2006-01-01 00:00:00.0')) THEN ('Early 2000s') WHEN 
(ctimestamp2 BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND TIMESTAMP'2010-12-31 
23:59:59.999999999') THEN ('Late 2000s') WHEN ((ctimestamp2 <= 
TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN (null) ELSE (null) END (type: 
string), if((ctimestamp1 < TIMESTAMP'1974-10-04 17:21:03.989'), 
year(ctimestamp1), year(ctimestamp2)) (type: int), CASE WHEN ((stimestamp1 like 
'%19%')) THEN (stimestamp1) ELSE (TIMESTAMP'2018-03-08 23:04:59.0') END (type: 
string), if((ctimestamp1 = TIMESTAMP'2021-09-24 03:18:32.413655165'), null, 
minute(ctimestamp1)) (type: int), if(((ctimestamp2 >= TIMESTAMP'5344-10-04 
18:40:08.165') and (ctimestamp2 < TIMESTAMP'6631-11-13 16:31:29.702202248')), 
minute(ctimestamp1), null) (type: int), if(((UDFToDouble(ctimestamp1) % 500.0D) 
> 100.0D), date_add(cdate, 1), date_add(cdate, 365)) (type: date), stimestamp1 
(type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10
@@ -627,7 +627,7 @@ STAGE PLANS:
             Statistics: Num rows: 51 Data size: 12384 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdate:date, 
1:ctimestamp1:timestamp, 2:stimestamp1:string, 3:ctimestamp2:timestamp, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdate:date, 
1:ctimestamp1:timestamp, 2:stimestamp1:string, 3:ctimestamp2:timestamp, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: ctimestamp1 (type: timestamp), ctimestamp2 (type: 
timestamp), CASE WHEN ((ctimestamp2 <= TIMESTAMP'1800-12-31 00:00:00.0')) THEN 
('1800s or Earlier') WHEN ((ctimestamp2 < TIMESTAMP'1900-01-01 00:00:00.0')) 
THEN ('1900s') WHEN (ctimestamp2 BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND 
TIMESTAMP'2010-12-31 23:59:59.999999999') THEN ('Late 2000s') WHEN 
((ctimestamp2 <= TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN ('Early 
2010s') ELSE ('Unknown') END (type: string), CASE WHEN ((ctimestamp2 <= 
TIMESTAMP'2000-12-31 23:59:59.999999999')) THEN ('Old') WHEN ((ctimestamp2 < 
TIMESTAMP'2006-01-01 00:00:00.0')) THEN ('Early 2000s') WHEN (ctimestamp2 
BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND TIMESTAMP'2010-12-31 
23:59:59.999999999') THEN ('Late 2000s') WHEN ((ctimestamp2 <= 
TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN ('Early 2010s') ELSE (null) END 
(type: string), CASE WHEN ((ctimestamp2 <= TIMESTAMP'2000-12-31 
23:59:59.999999999')) THEN ('Old') WHEN ((ctimesta
 mp2 < TIMESTAMP'2006-01-01 00:00:00.0')) THEN ('Early 2000s') WHEN 
(ctimestamp2 BETWEEN TIMESTAMP'2006-01-01 00:00:00.0' AND TIMESTAMP'2010-12-31 
23:59:59.999999999') THEN ('Late 2000s') WHEN ((ctimestamp2 <= 
TIMESTAMP'2015-12-31 23:59:59.999999999')) THEN (null) ELSE (null) END (type: 
string), if((ctimestamp1 < TIMESTAMP'1974-10-04 17:21:03.989'), 
year(ctimestamp1), year(ctimestamp2)) (type: int), CASE WHEN ((stimestamp1 like 
'%19%')) THEN (stimestamp1) ELSE (TIMESTAMP'2018-03-08 23:04:59.0') END (type: 
string), if((ctimestamp1 = TIMESTAMP'2021-09-24 03:18:32.413655165'), null, 
minute(ctimestamp1)) (type: int), if(((ctimestamp2 >= TIMESTAMP'5344-10-04 
18:40:08.165') and (ctimestamp2 < TIMESTAMP'6631-11-13 16:31:29.702202248')), 
minute(ctimestamp1), null) (type: int), if(((UDFToDouble(ctimestamp1) % 500.0D) 
> 100.0D), date_add(cdate, 1), date_add(cdate, 365)) (type: date), stimestamp1 
(type: string)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_coalesce_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_coalesce_3.q.out 
b/ql/src/test/results/clientpositive/vector_coalesce_3.q.out
index 061d35a..94a8af3 100644
--- a/ql/src/test/results/clientpositive/vector_coalesce_3.q.out
+++ b/ql/src/test/results/clientpositive/vector_coalesce_3.q.out
@@ -98,7 +98,7 @@ STAGE PLANS:
             Statistics: Num rows: 5 Data size: 32 Basic stats: COMPLETE Column 
stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:member:bigint, 
1:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:member:bigint, 
1:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: member (type: bigint)
               outputColumnNames: _col0

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_coalesce_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_coalesce_4.q.out 
b/ql/src/test/results/clientpositive/vector_coalesce_4.q.out
index 088d884..f359b22 100644
--- a/ql/src/test/results/clientpositive/vector_coalesce_4.q.out
+++ b/ql/src/test/results/clientpositive/vector_coalesce_4.q.out
@@ -49,7 +49,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 8 Basic stats: COMPLETE Column 
stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:a:int, 1:b:int, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:a:int, 1:b:int, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: COALESCE(a,b) (type: int), a (type: int), b (type: 
int)
               outputColumnNames: _col0, _col1, _col2

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_date_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_date_1.q.out 
b/ql/src/test/results/clientpositive/vector_date_1.q.out
index 8e9ba2c..affd786 100644
--- a/ql/src/test/results/clientpositive/vector_date_1.q.out
+++ b/ql/src/test/results/clientpositive/vector_date_1.q.out
@@ -107,7 +107,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dt1 (type: date), dt2 (type: date), (dt1 = dt1) 
(type: boolean), (dt1 <> dt2) (type: boolean), (dt1 <= dt1) (type: boolean), 
(dt1 <= dt2) (type: boolean), (dt1 < dt2) (type: boolean), (dt2 >= dt2) (type: 
boolean), (dt2 >= dt1) (type: boolean), (dt2 > dt1) (type: boolean)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
@@ -246,7 +246,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dt1 (type: date), dt2 (type: date), (dt1 <> dt1) 
(type: boolean), (dt1 = dt2) (type: boolean), (dt1 < dt1) (type: boolean), (dt1 
>= dt2) (type: boolean), (dt1 > dt2) (type: boolean), (dt2 > dt2) (type: 
boolean), (dt2 <= dt1) (type: boolean), (dt2 < dt1) (type: boolean)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9
@@ -385,7 +385,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dt1 (type: date), (dt1 <> DATE'1970-01-01') (type: 
boolean), (dt1 >= DATE'1970-01-01') (type: boolean), (dt1 > DATE'1970-01-01') 
(type: boolean), (dt1 <= DATE'2100-01-01') (type: boolean), (dt1 < 
DATE'2100-01-01') (type: boolean)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
@@ -524,7 +524,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dt1 (type: date), (dt1 = DATE'1970-01-01') (type: 
boolean), (dt1 <= DATE'1970-01-01') (type: boolean), (dt1 < DATE'1970-01-01') 
(type: boolean), (dt1 >= DATE'2100-01-01') (type: boolean), (dt1 > 
DATE'2100-01-01') (type: boolean)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
@@ -661,7 +661,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -805,7 +805,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -913,7 +913,7 @@ STAGE PLANS:
             Statistics: Num rows: 3 Data size: 224 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dt1:date, 1:dt2:date, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_1.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_1.q.out
index ffd32f6..d4d4705 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_1.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_1.q.out
@@ -66,7 +66,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToBoolean(t) (type: boolean)
               outputColumnNames: _col0
@@ -157,7 +157,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToByte(t) (type: tinyint)
               outputColumnNames: _col0
@@ -248,7 +248,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToShort(t) (type: smallint)
               outputColumnNames: _col0
@@ -339,7 +339,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToInteger(t) (type: int)
               outputColumnNames: _col0
@@ -430,7 +430,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToLong(t) (type: bigint)
               outputColumnNames: _col0
@@ -521,7 +521,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToFloat(t) (type: float)
               outputColumnNames: _col0
@@ -612,7 +612,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToDouble(t) (type: double)
               outputColumnNames: _col0
@@ -703,7 +703,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: UDFToString(t) (type: string)
               outputColumnNames: _col0
@@ -794,7 +794,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 336 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:t:decimal(4,2), 
1:u:decimal(5,0), 2:v:decimal(10,0), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: CAST( t AS TIMESTAMP) (type: timestamp)
               outputColumnNames: _col0

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
index bc5208c..acb62df 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_10_0.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
             Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(10,0), 
1:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(10,0), 
1:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dec (type: decimal(10,0))
               outputColumnNames: _col0
@@ -146,7 +146,7 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 280 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(10,0)/DECIMAL_64, 
1:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(10,0)/DECIMAL_64, 
1:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: dec (type: decimal(10,0))
               outputColumnNames: _col0

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_6.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_6.q.out
index 8896459..2bc955a 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_6.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_6.q.out
@@ -129,7 +129,7 @@ STAGE PLANS:
             Statistics: Num rows: 27 Data size: 2572 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:key:decimal(10,5), 1:value:int, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:key:decimal(10,5), 1:value:int, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: key (type: decimal(10,5)), value (type: int)
               outputColumnNames: _col0, _col1
@@ -244,7 +244,7 @@ STAGE PLANS:
             Statistics: Num rows: 27 Data size: 3020 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:key:decimal(17,4), 1:value:int, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:key:decimal(17,4), 1:value:int, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: key (type: decimal(17,4)), value (type: int)
               outputColumnNames: _col0, _col1
@@ -511,7 +511,7 @@ STAGE PLANS:
             Statistics: Num rows: 27 Data size: 2572 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:key:decimal(10,5), 1:value:int, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:key:decimal(10,5), 1:value:int, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: (key + 5.5) (type: decimal(11,5)), (value * 11) 
(type: int)
               outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
index 8244871..c17951a 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_aggregate.q.out
@@ -65,7 +65,7 @@ STAGE PLANS:
             Statistics: Num rows: 12289 Data size: 2165060 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 3:cint:int, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 3:cint:int, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: cdecimal1 (type: decimal(20,10)), cdecimal2 (type: 
decimal(23,14)), cint (type: int)
               outputColumnNames: cdecimal1, cdecimal2, cint
@@ -206,7 +206,7 @@ STAGE PLANS:
             Statistics: Num rows: 12289 Data size: 2165060 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 3:cint:int, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 3:cint:int, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: cdecimal1 (type: decimal(20,10)), cdecimal2 (type: 
decimal(23,14)), cint (type: int)
               outputColumnNames: cdecimal1, cdecimal2, cint
@@ -381,7 +381,7 @@ STAGE PLANS:
             Statistics: Num rows: 12289 Data size: 346472 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(11,5)/DECIMAL_64, 2:cdecimal2:decimal(16,0)/DECIMAL_64, 
3:cint:int, 4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(11,5)/DECIMAL_64, 2:cdecimal2:decimal(16,0)/DECIMAL_64, 
3:cint:int, 4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: cdecimal1 (type: decimal(11,5)), cdecimal2 (type: 
decimal(16,0)), cint (type: int)
               outputColumnNames: cdecimal1, cdecimal2, cint
@@ -541,7 +541,7 @@ STAGE PLANS:
             Statistics: Num rows: 12289 Data size: 346472 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(11,5)/DECIMAL_64, 2:cdecimal2:decimal(16,0)/DECIMAL_64, 
3:cint:int, 4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(11,5)/DECIMAL_64, 2:cdecimal2:decimal(16,0)/DECIMAL_64, 
3:cint:int, 4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Select Operator
               expressions: cdecimal1 (type: decimal(11,5)), cdecimal2 (type: 
decimal(16,0)), cint (type: int)
               outputColumnNames: cdecimal1, cdecimal2, cint

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_cast.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
index 55a8a46..7bd2af4 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_cast.q.out
@@ -19,7 +19,7 @@ STAGE PLANS:
             Statistics: Num rows: 12288 Data size: 2641964 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -138,7 +138,7 @@ STAGE PLANS:
             Statistics: Num rows: 12288 Data size: 1333293 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:csmallint:smallint, 2:cint:int, 3:cbigint:bigint, 4:cfloat:float, 
5:cdouble:double, 6:cstring1:string, 7:cstring2:string, 
8:ctimestamp1:timestamp, 9:ctimestamp2:timestamp, 10:cboolean1:boolean, 
11:cboolean2:boolean, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
index 6bbe813..2e4edc5 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_expressions.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
             Statistics: Num rows: 12289 Data size: 2128368 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(20,10), 2:cdecimal2:decimal(23,14), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -199,7 +199,7 @@ STAGE PLANS:
             Statistics: Num rows: 12288 Data size: 2127808 Basic stats: 
COMPLETE Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(10,3), 2:cdecimal2:decimal(7,2), 
3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:cdouble:double, 
1:cdecimal1:decimal(10,3), 2:cdecimal2:decimal(7,2), 
3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out 
b/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
index 6fb0c34..cf8e3df 100644
--- a/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
@@ -121,7 +121,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 234976 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(22,2), 
1:value_dec:decimal(22,2), 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(22,2), 
1:value_dec:decimal(22,2), 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -351,7 +351,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 234976 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(22,2), 
1:value_dec:decimal(22,2), 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(22,2), 
1:value_dec:decimal(22,2), 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -657,7 +657,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11234 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(14,2)/DECIMAL_64, 
1:value_dec:decimal(14,2)/DECIMAL_64, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(14,2)/DECIMAL_64, 
1:value_dec:decimal(14,2)/DECIMAL_64, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -782,7 +782,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11234 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(14,2)/DECIMAL_64, 
1:value_dec:decimal(14,2)/DECIMAL_64, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(14,2)/DECIMAL_64, 
1:value_dec:decimal(14,2)/DECIMAL_64, 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -907,7 +907,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11234 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(14,2), 
1:value_dec:decimal(14,2), 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(14,2), 
1:value_dec:decimal(14,2), 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator
@@ -1033,7 +1033,7 @@ STAGE PLANS:
             Statistics: Num rows: 1049 Data size: 11234 Basic stats: COMPLETE 
Column stats: NONE
             TableScan Vectorization:
                 native: true
-                vectorizationSchemaColumns: [0:dec:decimal(14,2), 
1:value_dec:decimal(14,2), 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                vectorizationSchemaColumns: [0:dec:decimal(14,2), 
1:value_dec:decimal(14,2), 
2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
             Filter Operator
               Filter Vectorization:
                   className: VectorFilterOperator

Reply via email to