http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
index 24b6ad3..1c95272 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_part_llap_io.q.out
@@ -63,7 +63,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 99 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:part:int, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:part:int, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), a 
(type: int), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3
@@ -174,7 +174,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 99 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:part:int, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:part:int, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), a 
(type: int), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3
@@ -287,7 +287,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 1955 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:char(50), 3:c3:varchar(50), 4:b:string, 5:part:int, 
6:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:char(50), 3:c3:varchar(50), 4:b:string, 5:part:int, 
6:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: string), c2 (type: char(50)), c3 (type: varchar(50)), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
@@ -411,7 +411,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 4185 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:date, 2:c2:date, 3:c3:date, 4:c4:date, 5:c5:date, 6:c6:timestamp, 
7:c7:timestamp, 8:c8:timestamp, 9:c9:timestamp, 10:c10:timestamp, 11:b:string, 
12:part:int, 13:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:date, 2:c2:date, 3:c3:date, 4:c4:date, 5:c5:date, 6:c6:timestamp, 
7:c7:timestamp, 8:c8:timestamp, 9:c9:timestamp, 10:c10:timestamp, 11:b:string, 
12:part:int, 13:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: date), c2 (type: date), c3 (type: date), c4 (type: date), c5 (type: 
date), c6 (type: timestamp), c7 (type: timestamp), c8 (type: timestamp), c9 
(type: timestamp), c10 (type: timestamp), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12
@@ -561,7 +561,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 940 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:smallint, 3:c3:int, 4:c4:bigint, 5:c5:tinyint, 
6:c6:smallint, 7:c7:int, 8:c8:bigint, 9:c9:tinyint, 10:c10:smallint, 
11:c11:int, 12:c12:bigint, 13:c13:tinyint, 14:c14:smallint, 15:c15:int, 
16:c16:bigint, 17:c17:tinyint, 18:c18:smallint, 19:c19:int, 20:c20:bigint, 
21:b:string, 22:part:int, 
23:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:smallint, 3:c3:int, 4:c4:bigint, 5:c5:tinyint, 
6:c6:smallint, 7:c7:int, 8:c8:bigint, 9:c9:tinyint, 10:c10:smallint, 
11:c11:int, 12:c12:bigint, 13:c13:tinyint, 14:c14:smallint, 15:c15:int, 
16:c16:bigint, 17:c17:tinyint, 18:c18:smallint, 19:c19:int, 20:c20:bigint, 
21:b:string, 22:part:int, 
23:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: tinyint), c2 (type: smallint), c3 (type: int), c4 (type: bigint), c5 
(type: tinyint), c6 (type: smallint), c7 (type: int), c8 (type: bigint), c9 
(type: tinyint), c10 (type: smallint), c11 (type: int), c12 (type: bigint), c13 
(type: tinyint), c14 (type: smallint), c15 (type: int), c16 (type: bigint), c17 
(type: tinyint), c18 (type: smallint), c19 (type: int), c20 (type: bigint), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21, _col22
@@ -706,7 +706,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 3500 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:float, 3:c3:double, 4:c4:decimal(38,18), 5:c5:float, 
6:c6:double, 7:c7:decimal(38,18), 8:c8:float, 9:c9:double, 
10:c10:decimal(38,18), 11:c11:float, 12:c12:double, 13:c13:decimal(38,18), 
14:c14:float, 15:c15:double, 16:b:string, 17:part:int, 
18:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:float, 3:c3:double, 4:c4:decimal(38,18), 5:c5:float, 
6:c6:double, 7:c7:decimal(38,18), 8:c8:float, 9:c9:double, 
10:c10:decimal(38,18), 11:c11:float, 12:c12:double, 13:c13:decimal(38,18), 
14:c14:float, 15:c15:double, 16:b:string, 17:part:int, 
18:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: decimal(38,18)), c2 (type: float), c3 (type: double), c4 (type: 
decimal(38,18)), c5 (type: float), c6 (type: double), c7 (type: 
decimal(38,18)), c8 (type: float), c9 (type: double), c10 (type: 
decimal(38,18)), c11 (type: float), c12 (type: double), c13 (type: 
decimal(38,18)), c14 (type: float), c15 (type: double), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17
@@ -844,7 +844,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 2260 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:varchar(50), 9:c9:varchar(50), 
10:c10:varchar(50), 11:b:string, 12:part:int, 
13:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:varchar(50), 9:c9:varchar(50), 
10:c10:varchar(50), 11:b:string, 12:part:int, 
13:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: string), c2 (type: string), c3 (type: string), c4 (type: string), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6
@@ -996,7 +996,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 876 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:tinyint, 3:c3:tinyint, 4:c4:tinyint, 5:c5:tinyint, 
6:c6:tinyint, 7:c7:smallint, 8:c8:smallint, 9:c9:smallint, 10:c10:smallint, 
11:c11:smallint, 12:c12:int, 13:c13:int, 14:c14:int, 15:c15:int, 16:c16:bigint, 
17:c17:bigint, 18:c18:bigint, 19:b:string, 20:part:int, 
21:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:tinyint, 3:c3:tinyint, 4:c4:tinyint, 5:c5:tinyint, 
6:c6:tinyint, 7:c7:smallint, 8:c8:smallint, 9:c9:smallint, 10:c10:smallint, 
11:c11:smallint, 12:c12:int, 13:c13:int, 14:c14:int, 15:c15:int, 16:c16:bigint, 
17:c17:bigint, 18:c18:bigint, 19:b:string, 20:part:int, 
21:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: tinyint), c2 (type: tinyint), c3 (type: tinyint), c4 (type: tinyint), c5 
(type: tinyint), c6 (type: tinyint), c7 (type: smallint), c8 (type: smallint), 
c9 (type: smallint), c10 (type: smallint), c11 (type: smallint), c12 (type: 
int), c13 (type: int), c14 (type: int), c15 (type: int), c16 (type: bigint), 
c17 (type: bigint), c18 (type: bigint), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20
@@ -1125,7 +1125,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 1620 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:decimal(38,18), 3:c3:float, 4:b:string, 5:part:int, 
6:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:decimal(38,18), 3:c3:float, 4:b:string, 5:part:int, 
6:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), part (type: int), c1 
(type: decimal(38,18)), c2 (type: decimal(38,18)), c3 (type: float), b (type: 
string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
index 05c0a50..dbf3740 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table.q.out
@@ -84,7 +84,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:c:int, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:c:int, 4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), a (type: int), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2
@@ -248,7 +248,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 600 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:c:int, 4:d:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:c:int, 4:d:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), a (type: int), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2
@@ -474,7 +474,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 720 Basic stats: COMPLETE 
Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:double, 2:c2:double, 3:c3:double, 4:b:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:double, 2:c2:double, 3:c3:double, 4:b:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: double), c2 
(type: double), c3 (type: double), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
@@ -771,7 +771,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 15696 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:char(50), 9:c9:char(5), 10:c10:char(5), 
11:c11:char(5), 12:c12:char(5), 13:c13:varchar(50), 14:c14:varchar(50), 
15:c15:varchar(50), 16:c16:varchar(50), 17:c17:varchar(5), 18:c18:varchar(5), 
19:c19:varchar(5), 20:c20:varchar(5), 21:b:string, 
22:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:char(50), 9:c9:char(5), 10:c10:char(5), 
11:c11:char(5), 12:c12:char(5), 13:c13:varchar(50), 14:c14:varchar(50), 
15:c15:varchar(50), 16:c16:varchar(50), 17:c17:varchar(5), 18:c18:varchar(5), 
19:c19:varchar(5), 20:c20:varchar(5), 21:b:string, 
22:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: string), c2 
(type: string), c3 (type: string), c4 (type: string), c5 (type: char(50)), c6 
(type: char(50)), c7 (type: char(50)), c8 (type: char(50)), c9 (type: char(5)), 
c10 (type: char(5)), c11 (type: char(5)), c12 (type: char(5)), c13 (type: 
varchar(50)), c14 (type: varchar(50)), c15 (type: varchar(50)), c16 (type: 
varchar(50)), c17 (type: varchar(5)), c18 (type: varchar(5)), c19 (type: 
varchar(5)), c20 (type: varchar(5)), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21
@@ -977,7 +977,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 10884 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:char(50), 5:c5:char(50), 
6:c6:char(50), 7:c7:char(7), 8:c8:char(7), 9:c9:char(7), 10:c10:varchar(50), 
11:c11:varchar(50), 12:c12:varchar(50), 13:c13:varchar(7), 14:c14:varchar(7), 
15:c15:varchar(7), 16:b:string, 
17:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:char(50), 5:c5:char(50), 
6:c6:char(50), 7:c7:char(7), 8:c8:char(7), 9:c9:char(7), 10:c10:varchar(50), 
11:c11:varchar(50), 12:c12:varchar(50), 13:c13:varchar(7), 14:c14:varchar(7), 
15:c15:varchar(7), 16:b:string, 
17:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: string), c2 
(type: string), c3 (type: string), c4 (type: char(50)), c5 (type: char(50)), c6 
(type: char(50)), c7 (type: char(7)), c8 (type: char(7)), c9 (type: char(7)), 
c10 (type: varchar(50)), c11 (type: varchar(50)), c12 (type: varchar(50)), c13 
(type: varchar(7)), c14 (type: varchar(7)), c15 (type: varchar(7)), b (type: 
string)
                     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/llap/schema_evol_text_vecrow_table_llap_io.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
index 4119e7a..372c504 100644
--- 
a/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/schema_evol_text_vecrow_table_llap_io.q.out
@@ -63,7 +63,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), a (type: int), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2
@@ -175,7 +175,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 500 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 1:a:int, 
2:b:string, 3:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), a (type: int), b 
(type: string)
                     outputColumnNames: _col0, _col1, _col2
@@ -289,7 +289,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 1935 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:char(50), 3:c3:varchar(50), 4:b:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:char(50), 3:c3:varchar(50), 4:b:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: string), c2 
(type: char(50)), c3 (type: varchar(50)), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
@@ -410,7 +410,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 3340 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:date, 2:c2:date, 3:c3:date, 4:c4:date, 5:c5:date, 6:c6:timestamp, 
7:c7:timestamp, 8:c8:timestamp, 9:c9:timestamp, 10:c10:timestamp, 11:b:string, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:date, 2:c2:date, 3:c3:date, 4:c4:date, 5:c5:date, 6:c6:timestamp, 
7:c7:timestamp, 8:c8:timestamp, 9:c9:timestamp, 10:c10:timestamp, 11:b:string, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: date), c2 
(type: date), c3 (type: date), c4 (type: date), c5 (type: date), c6 (type: 
timestamp), c7 (type: timestamp), c8 (type: timestamp), c9 (type: timestamp), 
c10 (type: timestamp), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11
@@ -557,7 +557,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 920 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:smallint, 3:c3:int, 4:c4:bigint, 5:c5:tinyint, 
6:c6:smallint, 7:c7:int, 8:c8:bigint, 9:c9:tinyint, 10:c10:smallint, 
11:c11:int, 12:c12:bigint, 13:c13:tinyint, 14:c14:smallint, 15:c15:int, 
16:c16:bigint, 17:c17:tinyint, 18:c18:smallint, 19:c19:int, 20:c20:bigint, 
21:b:string, 22:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:smallint, 3:c3:int, 4:c4:bigint, 5:c5:tinyint, 
6:c6:smallint, 7:c7:int, 8:c8:bigint, 9:c9:tinyint, 10:c10:smallint, 
11:c11:int, 12:c12:bigint, 13:c13:tinyint, 14:c14:smallint, 15:c15:int, 
16:c16:bigint, 17:c17:tinyint, 18:c18:smallint, 19:c19:int, 20:c20:bigint, 
21:b:string, 22:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: tinyint), 
c2 (type: smallint), c3 (type: int), c4 (type: bigint), c5 (type: tinyint), c6 
(type: smallint), c7 (type: int), c8 (type: bigint), c9 (type: tinyint), c10 
(type: smallint), c11 (type: int), c12 (type: bigint), c13 (type: tinyint), c14 
(type: smallint), c15 (type: int), c16 (type: bigint), c17 (type: tinyint), c18 
(type: smallint), c19 (type: int), c20 (type: bigint), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19, _col20, _col21
@@ -699,7 +699,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 3580 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:float, 3:c3:double, 4:c4:decimal(38,18), 5:c5:float, 
6:c6:double, 7:c7:decimal(38,18), 8:c8:float, 9:c9:double, 
10:c10:decimal(38,18), 11:c11:float, 12:c12:double, 13:c13:decimal(38,18), 
14:c14:float, 15:c15:double, 16:b:string, 
17:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:float, 3:c3:double, 4:c4:decimal(38,18), 5:c5:float, 
6:c6:double, 7:c7:decimal(38,18), 8:c8:float, 9:c9:double, 
10:c10:decimal(38,18), 11:c11:float, 12:c12:double, 13:c13:decimal(38,18), 
14:c14:float, 15:c15:double, 16:b:string, 
17:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: 
decimal(38,18)), c2 (type: float), c3 (type: double), c4 (type: 
decimal(38,18)), c5 (type: float), c6 (type: double), c7 (type: 
decimal(38,18)), c8 (type: float), c9 (type: double), c10 (type: 
decimal(38,18)), c11 (type: float), c12 (type: double), c13 (type: 
decimal(38,18)), c14 (type: float), c15 (type: double), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16
@@ -834,7 +834,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 2240 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:varchar(50), 9:c9:varchar(50), 
10:c10:varchar(50), 11:b:string, 
12:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:string, 2:c2:string, 3:c3:string, 4:c4:string, 5:c5:char(50), 
6:c6:char(50), 7:c7:char(50), 8:c8:varchar(50), 9:c9:varchar(50), 
10:c10:varchar(50), 11:b:string, 
12:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: string), c2 
(type: string), c3 (type: string), c4 (type: string), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
@@ -983,7 +983,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 856 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:tinyint, 3:c3:tinyint, 4:c4:tinyint, 5:c5:tinyint, 
6:c6:tinyint, 7:c7:smallint, 8:c8:smallint, 9:c9:smallint, 10:c10:smallint, 
11:c11:smallint, 12:c12:int, 13:c13:int, 14:c14:int, 15:c15:int, 16:c16:bigint, 
17:c17:bigint, 18:c18:bigint, 19:b:string, 
20:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:tinyint, 2:c2:tinyint, 3:c3:tinyint, 4:c4:tinyint, 5:c5:tinyint, 
6:c6:tinyint, 7:c7:smallint, 8:c8:smallint, 9:c9:smallint, 10:c10:smallint, 
11:c11:smallint, 12:c12:int, 13:c13:int, 14:c14:int, 15:c15:int, 16:c16:bigint, 
17:c17:bigint, 18:c18:bigint, 19:b:string, 
20:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: tinyint), 
c2 (type: tinyint), c3 (type: tinyint), c4 (type: tinyint), c5 (type: tinyint), 
c6 (type: tinyint), c7 (type: smallint), c8 (type: smallint), c9 (type: 
smallint), c10 (type: smallint), c11 (type: smallint), c12 (type: int), c13 
(type: int), c14 (type: int), c15 (type: int), c16 (type: bigint), c17 (type: 
bigint), c18 (type: bigint), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13, _col14, 
_col15, _col16, _col17, _col18, _col19
@@ -1109,7 +1109,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 1620 Basic stats: 
COMPLETE Column stats: PARTIAL
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:decimal(38,18), 3:c3:float, 4:b:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:insert_num:int, 
1:c1:decimal(38,18), 2:c2:decimal(38,18), 3:c3:float, 4:b:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: insert_num (type: int), c1 (type: 
decimal(38,18)), c2 (type: decimal(38,18)), c3 (type: float), b (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out 
b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
index 88ea24c..0f8c723 100644
--- a/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
+++ b/ql/src/test/results/clientpositive/llap/sqlmerge.q.out
@@ -59,7 +59,7 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: a (type: int)
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
-                    value expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    value expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Map 8 
@@ -90,11 +90,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col4 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     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: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
@@ -102,11 +102,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int)
+                    expressions: _col4 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int)
                     outputColumnNames: _col0, _col1
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     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: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
@@ -115,19 +115,19 @@ STAGE PLANS:
                   predicate: (_col0 = _col5) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col4 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col4
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col4 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: _col4 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
                       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: 1 Data size: 4 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
                 Filter Operator
@@ -146,7 +146,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                 outputColumnNames: _col0
                 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -162,7 +162,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: 
int), 7 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), 7 
(type: int)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -179,7 +179,7 @@ STAGE PLANS:
             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: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out 
b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
index 476670b..5d4bfe7 100644
--- a/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_aggregate_9.q.out
@@ -130,7 +130,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2000 Data size: 212912 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
@@ -261,7 +261,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2000 Data size: 15208 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
@@ -392,7 +392,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2000 Data size: 76040 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/llap/vector_aggregate_without_gby.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out 
b/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
index 5f67488..c99ac8d 100644
--- a/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_aggregate_without_gby.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
                   Statistics: Num rows: 7 Data size: 714 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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/llap/vector_bround.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_bround.q.out 
b/ql/src/test/results/clientpositive/llap/vector_bround.q.out
index cfe90cb..59996d6 100644
--- a/ql/src/test/results/clientpositive/llap/vector_bround.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_bround.q.out
@@ -70,7 +70,7 @@ STAGE PLANS:
                   Statistics: Num rows: 9 Data size: 144 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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/llap/vector_case_when_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_case_when_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_case_when_1.q.out
index bd590e2..7dde2ec 100644
--- a/ql/src/test/results/clientpositive/llap/vector_case_when_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_case_when_1.q.out
@@ -560,7 +560,7 @@ STAGE PLANS:
                   Statistics: Num rows: 101 Data size: 57327 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) = 'D
 ELIVER 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
@@ -935,7 +935,7 @@ STAGE PLANS:
                   Statistics: Num rows: 101 Data size: 57327 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) = 'D
 ELIVER 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/llap/vector_case_when_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out 
b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
index 4900fc2..d8ab3c5 100644
--- a/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_case_when_2.q.out
@@ -400,7 +400,7 @@ STAGE PLANS:
                   Statistics: Num rows: 51 Data size: 16000 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 ((ct
 imestamp2 < 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
@@ -685,7 +685,7 @@ STAGE PLANS:
                   Statistics: Num rows: 51 Data size: 16000 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 ((ct
 imestamp2 < 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/llap/vector_char_varchar_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out
index 83473ad..1a32227 100644
--- a/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out
@@ -56,7 +56,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 564 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:vs:varchar(10), 
1:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:vs:varchar(10), 
1:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: length(vs) (type: int), reverse(vs) (type: 
string)
                     outputColumnNames: _col0, _col1
@@ -204,7 +204,7 @@ STAGE PLANS:
                   Statistics: Num rows: 6 Data size: 564 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:vs:char(10), 
1:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:vs:char(10), 
1:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: length(vs) (type: int), reverse(vs) (type: 
string)
                     outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out 
b/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
index 9dcd970..5279e77 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_3.q.out
@@ -83,7 +83,7 @@ STAGE PLANS:
                   Statistics: Num rows: 5 Data size: 40 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -154,7 +154,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 48 Basic stats: COMPLETE 
Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:member:bigint, 
1:attr:bigint, 2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:member:bigint, 
1:attr:bigint, 2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: member (type: bigint), attr (type: bigint)
                     outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out 
b/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
index 5c3093f..409c68c 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_4.q.out
@@ -55,7 +55,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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/llap/vector_complex_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out 
b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
index d211358..f2277c1 100644
--- a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
@@ -93,7 +93,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 10872 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: str (type: string), mp (type: 
map<string,string>), lst (type: array<string>), strct (type: 
struct<a:string,b:string>), val (type: string)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4
@@ -175,7 +175,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 552 Basic stats: COMPLETE 
Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: str (type: string)
                     outputColumnNames: _col0
@@ -257,7 +257,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 9768 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: strct (type: struct<a:string,b:string>), mp 
(type: map<string,string>), lst (type: array<string>)
                     outputColumnNames: _col0, _col1, _col2
@@ -339,7 +339,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 6312 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: lst (type: array<string>), str (type: string)
                     outputColumnNames: _col0, _col1
@@ -421,7 +421,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 3312 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: mp (type: map<string,string>), str (type: 
string)
                     outputColumnNames: _col0, _col1
@@ -503,7 +503,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 1800 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: strct (type: struct<a:string,b:string>), str 
(type: string)
                     outputColumnNames: _col0, _col1
@@ -586,7 +586,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 1800 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: strct.b (type: string), str (type: string)
                     outputColumnNames: _col0, _col1
@@ -677,7 +677,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 3440 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: str (type: string), mp (type: 
map<string,string>), lst (type: array<string>), strct (type: 
struct<a:string,b:string>)
                     outputColumnNames: _col0, _col1, _col2, _col3
@@ -719,7 +719,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 1900 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -758,7 +758,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 Data size: 1900 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -797,7 +797,7 @@ STAGE PLANS:
                   Statistics: Num rows: 500 Data size: 43500 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:key:string, 
1:value:string, 
2:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:key:string, 
1:value:string, 2:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: key (type: string)
                     outputColumnNames: _col0
@@ -926,7 +926,7 @@ STAGE PLANS:
                   Statistics: Num rows: 13503 Data size: 15460932 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     Select Vectorization:
                         className: VectorSelectOperator
@@ -1145,7 +1145,7 @@ STAGE PLANS:
                   Statistics: Num rows: 13503 Data size: 4721072 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: str (type: string), val (type: string)
                     outputColumnNames: str, val
@@ -1287,7 +1287,7 @@ STAGE PLANS:
                   Statistics: Num rows: 13503 Data size: 7697400 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:str:string, 
1:mp:map<string,string>, 2:lst:array<string>, 
3:strct:struct<a:string,b:string>, 4:val:string, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: strct.b (type: string), val (type: string)
                     outputColumnNames: _col0, _col1

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
index 87cc02a..2a77c39 100644
--- a/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_date_1.q.out
@@ -113,7 +113,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 336 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
@@ -278,7 +278,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 336 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
@@ -443,7 +443,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 168 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
@@ -608,7 +608,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 168 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
@@ -771,7 +771,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 336 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
@@ -938,7 +938,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 336 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
@@ -1050,7 +1050,7 @@ STAGE PLANS:
                   Statistics: Num rows: 3 Data size: 168 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/llap/vector_decimal_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_1.q.out 
b/ql/src/test/results/clientpositive/llap/vector_decimal_1.q.out
index f4863b7..5107015 100644
--- a/ql/src/test/results/clientpositive/llap/vector_decimal_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_decimal_1.q.out
@@ -72,7 +72,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -189,7 +189,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -306,7 +306,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -423,7 +423,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -540,7 +540,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -657,7 +657,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -774,7 +774,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -891,7 +891,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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
@@ -1008,7 +1008,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 Basic stats: COMPLETE 
Column stats: COMPLETE
                   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/llap/vector_decimal_10_0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out 
b/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out
index 51c0854..5e835cd 100644
--- a/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_decimal_10_0.q.out
@@ -62,7 +62,7 @@ STAGE PLANS:
                   Statistics: Num rows: 2 Data size: 224 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
@@ -178,7 +178,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1 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

Reply via email to