http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out 
b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
index 11a99db..64e5b17 100644
--- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
@@ -504,11 +504,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)
@@ -518,7 +518,7 @@ STAGE PLANS:
             Execution mode: vectorized, llap
             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
@@ -543,12 +543,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
 #### A masked pattern was here ####
-{"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
@@ -577,11 +577,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
@@ -592,7 +592,7 @@ STAGE PLANS:
             Execution mode: vectorized, llap
             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
@@ -639,12 +639,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
 #### A masked pattern was here ####
-{"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
@@ -667,19 +667,19 @@ 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)
             Execution mode: llap
@@ -689,7 +689,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: 1049 Data size: 88116 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out 
b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
index 4a8192d..f49ecb0 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction_3.q.out
@@ -64,7 +64,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 
@@ -108,11 +108,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
@@ -120,11 +120,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
@@ -133,19 +133,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
@@ -164,7 +164,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
@@ -180,7 +180,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
@@ -197,7 +197,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
@@ -658,7 +658,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)
         Reducer 3 
@@ -676,11 +676,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col5) and (_col5 > 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 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: 8 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: 8 Basic stats: 
COMPLETE Column stats: NONE
@@ -688,11 +688,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col5) and (_col5 <= 8)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 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: 8 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: 8 Basic stats: 
COMPLETE Column stats: NONE
@@ -701,19 +701,19 @@ STAGE PLANS:
                   predicate: (_col0 = _col5) (type: boolean)
                   Statistics: Num rows: 1 Data size: 8 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: 8 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: 8 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: 8 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
                 Filter Operator
@@ -732,7 +732,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: 8 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -748,7 +748,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: 8 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -765,7 +765,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: 8 Basic stats: COMPLETE 
Column stats: NONE
@@ -1149,7 +1149,7 @@ POSTHOOK: Lineage: customer.name SIMPLE 
[(new_customer_stage)stage.FieldSchema(n
 POSTHOOK: Lineage: customer.sk EXPRESSION 
[(new_customer_stage)stage.FieldSchema(name:name, type:string, comment:null), ]
 POSTHOOK: Lineage: customer.source_pk SIMPLE 
[(new_customer_stage)stage.FieldSchema(name:source_pk, type:int, comment:null), 
]
 POSTHOOK: Lineage: customer.state SIMPLE 
[(new_customer_stage)stage.FieldSchema(name:state, type:string, comment:null), ]
-POSTHOOK: Lineage: merge_tmp_table.val EXPRESSION 
[(customer)customer.FieldSchema(name:ROW__ID, 
type:struct<transactionId:bigint,bucketId:int,rowId:bigint>, comment:), ]
+POSTHOOK: Lineage: merge_tmp_table.val EXPRESSION 
[(customer)customer.FieldSchema(name:ROW__ID, 
type:struct<writeId:bigint,bucketId:int,rowId:bigint>, comment:), ]
 PREHOOK: query: select * from customer order by source_pk, is_current
 PREHOOK: type: QUERY
 PREHOOK: Input: type2_scd_helper@customer

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out 
b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
index 7498485..6a97736 100644
--- 
a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
@@ -99,11 +99,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
                     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: _col0
                       Statistics: Num rows: 5 Data size: 469 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: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
@@ -113,7 +113,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 5 Data size: 469 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -194,11 +194,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1355 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), ds (type: string)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), ds (type: string)
                       outputColumnNames: _col0, _col3
                       Statistics: Num rows: 5 Data size: 2170 Basic stats: 
COMPLETE Column stats: PARTIAL
                       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: 5 Data size: 2170 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -209,7 +209,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), VALUE._col1 (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), VALUE._col1 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 5 Data size: 2170 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator
@@ -385,11 +385,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
                     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: _col0
                       Statistics: Num rows: 5 Data size: 469 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: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
@@ -399,7 +399,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 5 Data size: 469 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -480,11 +480,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1355 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), ds (type: string)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), ds (type: string)
                       outputColumnNames: _col0, _col3
                       Statistics: Num rows: 5 Data size: 2170 Basic stats: 
COMPLETE Column stats: PARTIAL
                       Reduce Output Operator
-                        key expressions: _col3 (type: string), 
'_bucket_number' (type: string), _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col3 (type: string), 
'_bucket_number' (type: string), _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +++
                         Map-reduce partition columns: _col3 (type: string)
                         Statistics: Num rows: 5 Data size: 2170 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -494,7 +494,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), KEY._col3 (type: string), KEY.'_bucket_number' (type: 
string)
+                expressions: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), KEY._col3 (type: string), KEY.'_bucket_number' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3, '_bucket_number'
                 Statistics: Num rows: 5 Data size: 1790 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator
@@ -680,11 +680,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
                     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: _col0
                       Statistics: Num rows: 5 Data size: 469 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: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
@@ -694,7 +694,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string), 11 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string), 11 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 5 Data size: 469 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -776,11 +776,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 455 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), hr (type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), hr (type: int)
                       outputColumnNames: _col0, _col4
                       Statistics: Num rows: 5 Data size: 1740 Basic stats: 
COMPLETE Column stats: PARTIAL
                       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: 5 Data size: 1740 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -791,7 +791,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string), VALUE._col2 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string), VALUE._col2 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 5 Data size: 1740 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator
@@ -902,11 +902,11 @@ STAGE PLANS:
                     predicate: (value = 'bar') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), ds (type: string), hr 
(type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), ds (type: string), hr (type: 
int)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
                       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: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
@@ -917,7 +917,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: 
string), VALUE._col1 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: string), 
VALUE._col1 (type: int)
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 5 Data size: 1409 Basic stats: PARTIAL 
Column stats: PARTIAL
                 File Output Operator
@@ -1100,11 +1100,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
                     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: _col0
                       Statistics: Num rows: 5 Data size: 469 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: 5 Data size: 469 Basic stats: 
COMPLETE Column stats: NONE
@@ -1114,7 +1114,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY.reducesinkkey0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string), 11 (type: int)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string), 11 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
                 Statistics: Num rows: 5 Data size: 469 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -1196,11 +1196,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 455 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), hr (type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), hr (type: int)
                       outputColumnNames: _col0, _col4
                       Statistics: Num rows: 5 Data size: 1740 Basic stats: 
COMPLETE Column stats: PARTIAL
                       Reduce Output Operator
-                        key expressions: '2008-04-08' (type: string), _col4 
(type: int), '_bucket_number' (type: string), _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: '2008-04-08' (type: string), _col4 
(type: int), '_bucket_number' (type: string), _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: ++++
                         Map-reduce partition columns: '2008-04-08' (type: 
string), _col4 (type: int)
                         Statistics: Num rows: 5 Data size: 1740 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -1210,7 +1210,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 
'bar' (type: string), '2008-04-08' (type: string), KEY._col4 (type: int), 
KEY.'_bucket_number' (type: string)
+                expressions: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' 
(type: string), '2008-04-08' (type: string), KEY._col4 (type: int), 
KEY.'_bucket_number' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
'_bucket_number'
                 Statistics: Num rows: 5 Data size: 1360 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator
@@ -1322,11 +1322,11 @@ STAGE PLANS:
                     predicate: (value = 'bar') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), ds (type: string), hr 
(type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), ds (type: string), hr (type: 
int)
                       outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
                       Reduce Output Operator
-                        key expressions: _col1 (type: string), _col2 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col1 (type: string), _col2 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: ++++
                         Map-reduce partition columns: _col1 (type: string), 
_col2 (type: int)
                         Statistics: Num rows: 5 Data size: 1409 Basic stats: 
PARTIAL Column stats: PARTIAL
@@ -1336,7 +1336,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), KEY._col1 (type: 
string), KEY._col2 (type: int), KEY.'_bucket_number' (type: string)
+                expressions: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), KEY._col1 (type: string), 
KEY._col2 (type: int), KEY.'_bucket_number' (type: string)
                 outputColumnNames: _col0, _col1, _col2, '_bucket_number'
                 Statistics: Num rows: 5 Data size: 1409 Basic stats: PARTIAL 
Column stats: PARTIAL
                 File Output Operator
@@ -1520,11 +1520,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1860 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), key (type: string), ds 
(type: string), hr (type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), key (type: string), ds 
(type: string), hr (type: int)
                       outputColumnNames: _col0, _col1, _col3, _col4
                       Statistics: Num rows: 5 Data size: 2675 Basic stats: 
COMPLETE Column stats: PARTIAL
                       Reduce Output Operator
-                        key expressions: _col3 (type: string), _col4 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col3 (type: string), _col4 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: ++++
                         Map-reduce partition columns: _col3 (type: string), 
_col4 (type: int)
                         Statistics: Num rows: 5 Data size: 2675 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -1535,7 +1535,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), VALUE._col1 (type: 
string), VALUE._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: 
int), KEY.'_bucket_number' (type: string)
+                expressions: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col1 (type: string), 
VALUE._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int), 
KEY.'_bucket_number' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
'_bucket_number'
                 Statistics: Num rows: 5 Data size: 3165 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator
@@ -1618,11 +1618,11 @@ STAGE PLANS:
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1860 Basic stats: 
COMPLETE Column stats: PARTIAL
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), key (type: string), ds 
(type: string), hr (type: int)
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), key (type: string), ds 
(type: string), hr (type: int)
                       outputColumnNames: _col0, _col1, _col3, _col4
                       Statistics: Num rows: 5 Data size: 2675 Basic stats: 
COMPLETE Column stats: PARTIAL
                       Reduce Output Operator
-                        key expressions: _col3 (type: string), _col4 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                        key expressions: _col3 (type: string), _col4 (type: 
int), '_bucket_number' (type: string), _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: ++++
                         Map-reduce partition columns: _col3 (type: string), 
_col4 (type: int)
                         Statistics: Num rows: 5 Data size: 2675 Basic stats: 
COMPLETE Column stats: PARTIAL
@@ -1633,7 +1633,7 @@ STAGE PLANS:
             Execution mode: llap
             Reduce Operator Tree:
               Select Operator
-                expressions: KEY._col0 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), VALUE._col1 (type: 
string), VALUE._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: 
int), KEY.'_bucket_number' (type: string)
+                expressions: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col1 (type: string), 
VALUE._col2 (type: string), KEY._col3 (type: string), KEY._col4 (type: int), 
KEY.'_bucket_number' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
'_bucket_number'
                 Statistics: Num rows: 5 Data size: 3165 Basic stats: COMPLETE 
Column stats: PARTIAL
                 File Output Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out 
b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
index cc12709..352f6ba 100644
--- a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
+++ b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
@@ -3238,11 +3238,11 @@ STAGE PLANS:
                     predicate: (((de = 109.23) or (de = 119.23)) and 
enforce_constraint(vc is not null)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 328 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc 
(type: varchar(128))
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc (type: 
varchar(128))
                       outputColumnNames: _col0, _col1, _col3
                       Statistics: Num rows: 1 Data size: 328 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: 328 Basic stats: 
COMPLETE Column stats: NONE
@@ -3253,7 +3253,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), 3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), 
3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 328 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -3331,11 +3331,11 @@ STAGE PLANS:
                     predicate: ((de = 3.14) and enforce_constraint(i is not 
null) and enforce_constraint(vc is not null)) (type: boolean)
                     Statistics: Num rows: 1 Data size: 328 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc 
(type: varchar(128))
+                      expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc (type: 
varchar(128))
                       outputColumnNames: _col0, _col1, _col3
                       Statistics: Num rows: 1 Data size: 328 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: 328 Basic stats: 
COMPLETE Column stats: NONE
@@ -3346,7 +3346,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), 3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), 
3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 328 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -4157,7 +4157,7 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: key (type: int)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
-                    value expressions: value (type: string), ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    value expressions: value (type: string), ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Map 7 
@@ -4188,11 +4188,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
@@ -4200,11 +4200,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) 
and enforce_constraint(_col0 is not null)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), 
_col2 (type: string)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), _col2 
(type: string)
                     outputColumnNames: _col0, _col1, _col3
                     Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
@@ -4225,7 +4225,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: 206 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -4241,7 +4241,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), '1' (type: string), VALUE._col1 (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), '1' 
(type: string), VALUE._col1 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -4395,7 +4395,7 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: key (type: int)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
-                    value expressions: value (type: string), ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    value expressions: value (type: string), ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Map 8 
@@ -4426,11 +4426,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col0
                     Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
@@ -4438,11 +4438,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 3) and (_col6 >= 5) 
and enforce_constraint(_col0 is not null)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), 
_col2 (type: string)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), _col2 
(type: string)
                     outputColumnNames: _col0, _col1, _col3
                     Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
@@ -4451,19 +4451,19 @@ STAGE PLANS:
                   predicate: (_col0 = _col6) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col5
                     Statistics: Num rows: 1 Data size: 206 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
                 Filter Operator
@@ -4482,7 +4482,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: 206 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -4498,7 +4498,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), '1' (type: string), VALUE._col1 (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), '1' 
(type: string), VALUE._col1 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -4515,7 +4515,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: 206 Basic stats: COMPLETE 
Column stats: NONE
@@ -4709,7 +4709,7 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: key (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 7 
@@ -4740,11 +4740,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (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
@@ -4752,19 +4752,19 @@ STAGE PLANS:
                   predicate: (_col0 = _col6) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col5
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: _col5 (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
@@ -4783,7 +4783,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
@@ -4800,7 +4800,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
@@ -4979,7 +4979,7 @@ STAGE PLANS:
                     sort order: +
                     Map-reduce partition columns: key (type: int)
                     Statistics: Num rows: 1 Data size: 188 Basic stats: 
COMPLETE Column stats: NONE
-                    value expressions: value (type: string), ROW__ID (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    value expressions: value (type: string), ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Map 7 
@@ -5010,11 +5010,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 3) and 
enforce_constraint(_col0 is not null)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), 
_col2 (type: string)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), _col0 (type: int), _col2 
(type: string)
                     outputColumnNames: _col0, _col1, _col3
                     Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
@@ -5023,19 +5023,19 @@ STAGE PLANS:
                   predicate: (_col0 = _col6) (type: boolean)
                   Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col5
                     Statistics: Num rows: 1 Data size: 206 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       mode: hash
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 1 Data size: 206 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: 206 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col1 (type: bigint)
                 Filter Operator
@@ -5054,7 +5054,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), '1' (type: string), VALUE._col1 (type: string)
+                expressions: KEY.reducesinkkey0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), '1' 
(type: string), VALUE._col1 (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
                 Statistics: Num rows: 1 Data size: 206 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
@@ -5071,7 +5071,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: 206 Basic stats: COMPLETE 
Column stats: NONE
@@ -5247,7 +5247,7 @@ STAGE PLANS:
                       sort order: +
                       Map-reduce partition columns: key (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 5 
@@ -5280,11 +5280,11 @@ STAGE PLANS:
                   predicate: ((_col0 = _col6) and (_col6 < 5)) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (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
@@ -5292,26 +5292,26 @@ STAGE PLANS:
                   predicate: (_col0 = _col6) (type: boolean)
                   Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
-                    expressions: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                    expressions: _col5 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
                     outputColumnNames: _col5
                     Statistics: Num rows: 1 Data size: 4 Basic stats: COMPLETE 
Column stats: NONE
                     Group By Operator
                       aggregations: count()
-                      keys: _col5 (type: 
struct<transactionid:bigint,bucketid:int,rowid:bigint>)
+                      keys: _col5 (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)
         Reducer 3 
             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
@@ -5328,7 +5328,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/llap_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid.q.out 
b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
index e77af75..dbf531c 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid.q.out
@@ -104,7 +104,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
@@ -248,7 +248,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
@@ -295,7 +295,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: 
KEY.reducesinkkey0:struct<transactionid:bigint,bucketid:int,rowid:bigint>, 
VALUE._col1:float, VALUE._col2:double, VALUE._col3:smallint
+                    dataColumns: 
KEY.reducesinkkey0:struct<writeid:bigint,bucketid:int,rowid:bigint>, 
VALUE._col1:float, VALUE._col2:double, VALUE._col3:smallint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, bigint]
             Reduce Operator Tree:
@@ -358,7 +358,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out 
b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
index efcc3c0..37c213b 100644
--- a/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_acid_fast.q.out
@@ -98,7 +98,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
@@ -242,7 +242,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true
@@ -289,7 +289,7 @@ STAGE PLANS:
                 vectorized: true
                 rowBatchContext:
                     dataColumnCount: 4
-                    dataColumns: 
KEY.reducesinkkey0:struct<transactionid:bigint,bucketid:int,rowid:bigint>, 
VALUE._col1:float, VALUE._col2:double, VALUE._col3:smallint
+                    dataColumns: 
KEY.reducesinkkey0:struct<writeid:bigint,bucketid:int,rowid:bigint>, 
VALUE._col1:float, VALUE._col2:double, VALUE._col3:smallint
                     partitionColumnCount: 0
                     scratchColumnTypeNames: [bigint, bigint]
             Reduce Operator Tree:
@@ -352,7 +352,7 @@ STAGE PLANS:
             Map Operator Tree:
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:cint:int, 
1:cbigint:bigint, 2:cfloat:float, 3:cdouble:double, 4:csmallint:smallint, 
5:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                     Filter Vectorization:
                         className: VectorFilterOperator
                         native: true

http://git-wip-us.apache.org/repos/asf/hive/blob/8f93ca0b/ql/src/test/results/clientpositive/llap/llap_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_partitioned.q.out 
b/ql/src/test/results/clientpositive/llap/llap_partitioned.q.out
index 5397839..799062e 100644
--- a/ql/src/test/results/clientpositive/llap/llap_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_partitioned.q.out
@@ -1637,7 +1637,7 @@ STAGE PLANS:
                   Statistics: Num rows: 12288 Data size: 1884148 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:csmallint:smallint, 
1:cint:int, 2:cbigint:bigint, 3:cfloat:float, 4:cdouble:double, 
5:cstring1:string, 6:cchar1:char(255), 7:cvchar1:varchar(255), 
8:cboolean1:boolean, 9:cboolean2:boolean, 10:ctinyint:tinyint, 
11:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:csmallint:smallint, 
1:cint:int, 2:cbigint:bigint, 3:cfloat:float, 4:cdouble:double, 
5:cstring1:string, 6:cchar1:char(255), 7:cvchar1:varchar(255), 
8:cboolean1:boolean, 9:cboolean2:boolean, 10:ctinyint:tinyint, 
11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
@@ -1699,7 +1699,7 @@ STAGE PLANS:
                   Statistics: Num rows: 10 Data size: 2640 Basic stats: 
COMPLETE Column stats: COMPLETE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:csmallint:smallint, 
1:cint:int, 2:cbigint:bigint, 3:cfloat:float, 4:cdouble:double, 
5:cstring1:string, 6:cchar1:char(255), 7:cvchar1:varchar(255), 
8:cboolean1:boolean, 9:cboolean2:boolean, 10:ctinyint:tinyint, 
11:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:csmallint:smallint, 
1:cint:int, 2:cbigint:bigint, 3:cfloat:float, 4:cdouble:double, 
5:cstring1:string, 6:cchar1:char(255), 7:cvchar1:varchar(255), 
8:cboolean1:boolean, 9:cboolean2:boolean, 10:ctinyint:tinyint, 
11:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Reduce Output Operator
                     key expressions: ctinyint (type: tinyint)
                     sort order: +
@@ -2090,7 +2090,7 @@ STAGE PLANS:
                   Statistics: Num rows: 1509 Data size: 984410 Basic stats: 
COMPLETE Column stats: NONE
                   TableScan Vectorization:
                       native: true
-                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:cint:int, 2:cchar1:char(255), 3:cvchar1:varchar(255), 
4:ROW__ID:struct<transactionid:bigint,bucketid:int,rowid:bigint>]
+                      vectorizationSchemaColumns: [0:ctinyint:tinyint, 
1:cint:int, 2:cchar1:char(255), 3:cvchar1:varchar(255), 
4:ROW__ID:struct<writeid:bigint,bucketid:int,rowid:bigint>]
                   Select Operator
                     expressions: ctinyint (type: tinyint), cint (type: int), 
cchar1 (type: char(255)), cvchar1 (type: varchar(255))
                     outputColumnNames: ctinyint, cint, cchar1, cvchar1

Reply via email to