http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/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
deleted file mode 100644
index 05d5d0a..0000000
--- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out
+++ /dev/null
@@ -1,729 +0,0 @@
-PREHOOK: query: CREATE TEMPORARY FUNCTION runWorker AS 
'org.apache.hadoop.hive.ql.udf.UDFRunWorker'
-PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: runworker
-POSTHOOK: query: CREATE TEMPORARY FUNCTION runWorker AS 
'org.apache.hadoop.hive.ql.udf.UDFRunWorker'
-POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: runworker
-PREHOOK: query: create table mydual(a int)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@mydual
-POSTHOOK: query: create table mydual(a int)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@mydual
-PREHOOK: query: insert into mydual values(1)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@mydual
-POSTHOOK: query: insert into mydual values(1)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: _dummy_database@_dummy_table
-POSTHOOK: Output: default@mydual
-POSTHOOK: Lineage: mydual.a SCRIPT []
-PREHOOK: query: CREATE TABLE over10k(t tinyint,
-           si smallint,
-           i int,
-           b bigint,
-           f float,
-           d double,
-           bo boolean,
-           s string,
-           ts timestamp,
-           `dec` decimal(4,2),
-           bin binary)
-ROW FORMAT DELIMITED FIELDS TERMINATED BY '|'
-STORED AS TEXTFILE
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@over10k
-POSTHOOK: query: CREATE TABLE over10k(t tinyint,
-           si smallint,
-           i int,
-           b bigint,
-           f float,
-           d double,
-           bo boolean,
-           s string,
-           ts timestamp,
-           `dec` decimal(4,2),
-           bin binary)
-ROW FORMAT DELIMITED FIELDS TERMINATED BY '|'
-STORED AS TEXTFILE
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@over10k
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE 
INTO TABLE over10k
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
-PREHOOK: Output: default@over10k
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/over1k' OVERWRITE 
INTO TABLE over10k
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@over10k
-PREHOOK: query: CREATE TABLE over10k_orc_bucketed(t tinyint,
-           si smallint,
-           i int,
-           b bigint,
-           f float,
-           d double,
-           bo boolean,
-           s string,
-           ts timestamp,
-           `dec` decimal(4,2),
-           bin binary) CLUSTERED BY(si) INTO 4 BUCKETS STORED AS ORC
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: query: CREATE TABLE over10k_orc_bucketed(t tinyint,
-           si smallint,
-           i int,
-           b bigint,
-           f float,
-           d double,
-           bo boolean,
-           s string,
-           ts timestamp,
-           `dec` decimal(4,2),
-           bin binary) CLUSTERED BY(si) INTO 4 BUCKETS STORED AS ORC
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@over10k_orc_bucketed
-PREHOOK: query: select distinct si, si%4 from over10k order by si
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k
-#### A masked pattern was here ####
-POSTHOOK: query: select distinct si, si%4 from over10k order by si
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k
-#### A masked pattern was here ####
-NULL   NULL
-256    0
-257    1
-258    2
-259    3
-260    0
-261    1
-262    2
-263    3
-264    0
-265    1
-266    2
-267    3
-268    0
-269    1
-270    2
-271    3
-272    0
-273    1
-274    2
-275    3
-276    0
-277    1
-278    2
-279    3
-280    0
-281    1
-282    2
-283    3
-284    0
-285    1
-286    2
-287    3
-288    0
-289    1
-290    2
-291    3
-292    0
-293    1
-294    2
-295    3
-296    0
-297    1
-298    2
-299    3
-300    0
-301    1
-302    2
-303    3
-304    0
-305    1
-306    2
-307    3
-308    0
-309    1
-310    2
-311    3
-312    0
-313    1
-314    2
-315    3
-316    0
-317    1
-318    2
-319    3
-320    0
-321    1
-322    2
-323    3
-324    0
-325    1
-326    2
-327    3
-328    0
-329    1
-330    2
-331    3
-332    0
-333    1
-334    2
-335    3
-336    0
-337    1
-338    2
-339    3
-340    0
-341    1
-342    2
-343    3
-344    0
-345    1
-346    2
-347    3
-348    0
-349    1
-350    2
-351    3
-352    0
-353    1
-354    2
-355    3
-356    0
-357    1
-358    2
-359    3
-360    0
-361    1
-362    2
-363    3
-364    0
-365    1
-366    2
-367    3
-368    0
-370    2
-371    3
-372    0
-373    1
-374    2
-375    3
-376    0
-377    1
-378    2
-379    3
-380    0
-381    1
-382    2
-383    3
-384    0
-385    1
-386    2
-387    3
-388    0
-389    1
-390    2
-391    3
-392    0
-393    1
-394    2
-395    3
-396    0
-397    1
-398    2
-399    3
-400    0
-401    1
-402    2
-403    3
-404    0
-405    1
-406    2
-407    3
-408    0
-409    1
-410    2
-411    3
-413    1
-414    2
-415    3
-417    1
-418    2
-419    3
-420    0
-421    1
-422    2
-423    3
-424    0
-425    1
-426    2
-427    3
-428    0
-429    1
-430    2
-431    3
-432    0
-433    1
-434    2
-435    3
-436    0
-437    1
-438    2
-439    3
-440    0
-441    1
-442    2
-443    3
-444    0
-445    1
-446    2
-447    3
-448    0
-449    1
-450    2
-451    3
-452    0
-453    1
-454    2
-455    3
-456    0
-457    1
-458    2
-459    3
-460    0
-461    1
-462    2
-463    3
-464    0
-465    1
-466    2
-467    3
-468    0
-469    1
-471    3
-472    0
-473    1
-474    2
-475    3
-476    0
-477    1
-478    2
-479    3
-480    0
-481    1
-482    2
-483    3
-484    0
-485    1
-486    2
-487    3
-488    0
-489    1
-490    2
-491    3
-492    0
-493    1
-494    2
-495    3
-496    0
-497    1
-498    2
-499    3
-500    0
-501    1
-502    2
-503    3
-504    0
-505    1
-506    2
-507    3
-508    0
-509    1
-510    2
-511    3
-PREHOOK: query: insert into over10k_orc_bucketed select * from over10k
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k
-PREHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: query: insert into over10k_orc_bucketed select * from over10k
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k
-POSTHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: Lineage: over10k_orc_bucketed.b SIMPLE 
[(over10k)over10k.FieldSchema(name:b, type:bigint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.bin SIMPLE 
[(over10k)over10k.FieldSchema(name:bin, type:binary, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.bo SIMPLE 
[(over10k)over10k.FieldSchema(name:bo, type:boolean, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.d SIMPLE 
[(over10k)over10k.FieldSchema(name:d, type:double, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.dec SIMPLE 
[(over10k)over10k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.f SIMPLE 
[(over10k)over10k.FieldSchema(name:f, type:float, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.i SIMPLE 
[(over10k)over10k.FieldSchema(name:i, type:int, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.s SIMPLE 
[(over10k)over10k.FieldSchema(name:s, type:string, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.si SIMPLE 
[(over10k)over10k.FieldSchema(name:si, type:smallint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.t SIMPLE 
[(over10k)over10k.FieldSchema(name:t, type:tinyint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.ts SIMPLE 
[(over10k)over10k.FieldSchema(name:ts, type:timestamp, comment:null), ]
-Found 4 items
-#### A masked pattern was here ####
-PREHOOK: query: insert into over10k_orc_bucketed select * from over10k
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k
-PREHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: query: insert into over10k_orc_bucketed select * from over10k
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k
-POSTHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: Lineage: over10k_orc_bucketed.b SIMPLE 
[(over10k)over10k.FieldSchema(name:b, type:bigint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.bin SIMPLE 
[(over10k)over10k.FieldSchema(name:bin, type:binary, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.bo SIMPLE 
[(over10k)over10k.FieldSchema(name:bo, type:boolean, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.d SIMPLE 
[(over10k)over10k.FieldSchema(name:d, type:double, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.dec SIMPLE 
[(over10k)over10k.FieldSchema(name:dec, type:decimal(4,2), comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.f SIMPLE 
[(over10k)over10k.FieldSchema(name:f, type:float, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.i SIMPLE 
[(over10k)over10k.FieldSchema(name:i, type:int, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.s SIMPLE 
[(over10k)over10k.FieldSchema(name:s, type:string, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.si SIMPLE 
[(over10k)over10k.FieldSchema(name:si, type:smallint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.t SIMPLE 
[(over10k)over10k.FieldSchema(name:t, type:tinyint, comment:null), ]
-POSTHOOK: Lineage: over10k_orc_bucketed.ts SIMPLE 
[(over10k)over10k.FieldSchema(name:ts, type:timestamp, comment:null), ]
-Found 8 items
-#### A masked pattern was here ####
-PREHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from 
over10k_orc_bucketed
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select distinct 7 as seven, INPUT__FILE__NAME from 
over10k_orc_bucketed
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-PREHOOK: query: alter table over10k_orc_bucketed set TBLPROPERTIES 
('transactional'='true')
-PREHOOK: type: ALTERTABLE_PROPERTIES
-PREHOOK: Input: default@over10k_orc_bucketed
-PREHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: query: alter table over10k_orc_bucketed set TBLPROPERTIES 
('transactional'='true')
-POSTHOOK: type: ALTERTABLE_PROPERTIES
-POSTHOOK: Input: default@over10k_orc_bucketed
-POSTHOOK: Output: default@over10k_orc_bucketed
-PREHOOK: query: explain select t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by t, si, i
-PREHOOK: type: QUERY
-POSTHOOK: query: explain select t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by t, si, i
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-#### A masked pattern was here ####
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: over10k_orc_bucketed
-                  filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
-                  Statistics: Num rows: 2098 Data size: 41920 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Filter Operator
-                    predicate: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
-                    Statistics: Num rows: 2 Data size: 40 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Select Operator
-                      expressions: t (type: tinyint), si (type: smallint), i 
(type: int)
-                      outputColumnNames: _col0, _col1, _col2
-                      Statistics: Num rows: 2 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col2 (type: int)
-                        sort order: +++
-                        Statistics: Num rows: 2 Data size: 24 Basic stats: 
COMPLETE Column stats: COMPLETE
-            Execution mode: vectorized, llap
-            LLAP IO: may be used (ACID table)
-        Reducer 2 
-            Execution mode: vectorized, llap
-            Reduce Operator Tree:
-              Select Operator
-                expressions: KEY.reducesinkkey0 (type: tinyint), 
KEY.reducesinkkey1 (type: smallint), KEY.reducesinkkey2 (type: int)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 2 Data size: 24 Basic stats: COMPLETE 
Column stats: COMPLETE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: select t, si, i from over10k_orc_bucketed where b = 4294967363 
and t < 100 order by  t, si, i
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by  t, si, i
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
--3     344     65733
--3     344     65733
-5      501     65585
-5      501     65585
-35     463     65646
-35     463     65646
-PREHOOK: query: explain select ROW__ID, t, si, i from over10k_orc_bucketed 
where b = 4294967363 and t < 100 order by ROW__ID
-PREHOOK: type: QUERY
-POSTHOOK: query: explain select ROW__ID, t, si, i from over10k_orc_bucketed 
where b = 4294967363 and t < 100 order by ROW__ID
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-#### A masked pattern was here ####
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: over10k_orc_bucketed
-                  filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
-                  Statistics: Num rows: 2098 Data size: 41920 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Filter Operator
-                    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<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<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)
-            Execution mode: vectorized, llap
-            LLAP IO: may be used (ACID table)
-        Reducer 2 
-            Execution mode: vectorized, llap
-            Reduce Operator Tree:
-              Select Operator
-                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
-                  compressed: false
-                  Statistics: Num rows: 2 Data size: 176 Basic stats: COMPLETE 
Column stats: COMPLETE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by ROW__ID
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by ROW__ID
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-{"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
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-2 depends on stages: Stage-1
-  Stage-0 depends on stages: Stage-2
-  Stage-3 depends on stages: Stage-0
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-#### A masked pattern was here ####
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: over10k_orc_bucketed
-                  filterExpr: ((b = 4294967363L) and (t < 100Y)) (type: 
boolean)
-                  Statistics: Num rows: 2098 Data size: 706986 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Filter Operator
-                    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<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<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
-                        value expressions: _col1 (type: tinyint), _col2 (type: 
smallint), _col5 (type: float), _col6 (type: double), _col7 (type: boolean), 
_col8 (type: string), _col9 (type: timestamp), _col10 (type: decimal(4,2)), 
_col11 (type: binary)
-            Execution mode: vectorized, llap
-            LLAP IO: may be used (ACID table)
-        Reducer 2 
-            Execution mode: vectorized, llap
-            Reduce Operator Tree:
-              Select Operator
-                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
-                  compressed: false
-                  Statistics: Num rows: 2 Data size: 834 Basic stats: COMPLETE 
Column stats: COMPLETE
-                  table:
-                      input format: 
org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-                      serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                      name: default.over10k_orc_bucketed
-                  Write Type: UPDATE
-
-  Stage: Stage-2
-    Dependency Collection
-
-  Stage: Stage-0
-    Move Operator
-      tables:
-          replace: false
-          table:
-              input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
-              output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
-              serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              name: default.over10k_orc_bucketed
-          Write Type: UPDATE
-
-  Stage: Stage-3
-    Stats Work
-      Basic Stats Work:
-
-PREHOOK: query: update over10k_orc_bucketed set i = 0 where b = 4294967363 and 
t < 100
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-PREHOOK: Output: default@over10k_orc_bucketed
-POSTHOOK: query: update over10k_orc_bucketed set i = 0 where b = 4294967363 
and t < 100
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-POSTHOOK: Output: default@over10k_orc_bucketed
-PREHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by ROW__ID
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 
4294967363 and t < 100 order by ROW__ID
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-{"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
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Tez
-#### A masked pattern was here ####
-      Edges:
-        Reducer 2 <- Map 1 (SIMPLE_EDGE)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: over10k_orc_bucketed
-                  Statistics: Num rows: 1227 Data size: 702030 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  Select Operator
-                    expressions: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
-                    outputColumnNames: ROW__ID
-                    Statistics: Num rows: 1227 Data size: 702030 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Group By Operator
-                      aggregations: count()
-                      keys: ROW__ID (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
-                      mode: hash
-                      outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 613 Data size: 51492 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
-                        Statistics: Num rows: 613 Data size: 51492 Basic 
stats: COMPLETE Column stats: COMPLETE
-                        value expressions: _col1 (type: bigint)
-            Execution mode: llap
-            LLAP IO: may be used (ACID table)
-        Reducer 2 
-            Execution mode: llap
-            Reduce Operator Tree:
-              Group By Operator
-                aggregations: count(VALUE._col0)
-                keys: KEY._col0 (type: 
struct<writeid:bigint,bucketid:int,rowid:bigint>)
-                mode: mergepartial
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 613 Data size: 51492 Basic stats: 
COMPLETE Column stats: COMPLETE
-                Filter Operator
-                  predicate: (_col1 > 1L) (type: boolean)
-                  Statistics: Num rows: 204 Data size: 17136 Basic stats: 
COMPLETE Column stats: COMPLETE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 204 Data size: 17136 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    table:
-                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by 
ROW__ID having count(*) > 1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select ROW__ID, count(*) from over10k_orc_bucketed group by 
ROW__ID having count(*) > 1
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-NULL   6
-PREHOOK: query: select ROW__ID, * from over10k_orc_bucketed where ROW__ID is 
null
-PREHOOK: type: QUERY
-PREHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####
-POSTHOOK: query: select ROW__ID, * from over10k_orc_bucketed where ROW__ID is 
null
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@over10k_orc_bucketed
-#### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out 
b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
index c87a0a6..c8b831d 100644
--- a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
@@ -89,6 +89,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
        numFiles                3                   
        numRows                 1500                
        rawDataSize             141000              
@@ -139,6 +140,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 1500                
        rawDataSize             141000              

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out 
b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
index b630223..3266fde 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
@@ -395,6 +395,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -1005,6 +1006,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out 
b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
index 9ae59e6..6634966 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
@@ -29,6 +29,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -75,6 +76,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 1                   
        rawDataSize             8                   
@@ -118,6 +120,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                1                   
        numRows                 1                   
@@ -203,6 +206,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                2                   
        numRows                 2                   
@@ -293,6 +297,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -339,6 +344,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 1                   
        rawDataSize             8                   
@@ -382,6 +388,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                1                   
        numRows                 1                   
@@ -467,6 +474,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                2                   
        numRows                 2                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out 
b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
index 6973ec0..f1ae2a5 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
@@ -1127,6 +1127,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
index 2e02499..daa8d6a 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
@@ -165,6 +165,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -252,6 +253,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -300,6 +302,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -439,6 +442,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -526,6 +530,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -574,6 +579,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -713,6 +719,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -800,6 +807,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -848,6 +856,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
index e8973a3..81f9f87 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
@@ -175,6 +175,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -253,6 +254,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -302,6 +304,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -465,6 +468,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -552,6 +556,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -600,6 +605,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -735,6 +741,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -818,6 +825,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -866,6 +874,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1001,6 +1010,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1063,6 +1073,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1111,6 +1122,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1197,6 +1209,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1245,6 +1258,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
index 2c7decd..5ce2d40 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
@@ -202,6 +202,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -268,6 +269,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -351,6 +353,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -399,6 +402,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -470,6 +474,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
index 054b0d0..942738d 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
@@ -147,6 +147,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -234,6 +235,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -282,6 +284,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -421,6 +424,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -508,6 +512,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -556,6 +561,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
index 5c3fb0f..b389dcc 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
@@ -147,6 +147,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -195,6 +196,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -283,6 +285,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -421,6 +424,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -469,6 +473,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -557,6 +562,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -695,6 +701,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -743,6 +750,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -831,6 +839,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
index 95d3298..612f3ea 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
@@ -163,6 +163,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -211,6 +212,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -299,6 +301,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -437,6 +440,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -485,6 +489,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -573,6 +578,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -711,6 +717,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -759,6 +766,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -847,6 +855,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
index bbe1252..c56c82c 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
@@ -103,6 +103,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 4
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -125,6 +126,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -189,6 +191,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -211,6 +214,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -320,6 +324,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 4
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -342,6 +347,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -406,6 +412,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -428,6 +435,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -537,6 +545,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 4
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -559,6 +568,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -623,6 +633,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -645,6 +656,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
index 53c685c..b892376 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
@@ -180,6 +180,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -228,6 +229,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -316,6 +318,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -364,6 +367,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -505,6 +509,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -553,6 +558,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -641,6 +647,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -689,6 +696,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -830,6 +838,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -878,6 +887,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -966,6 +976,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1014,6 +1025,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out 
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
index 80116ec..4d10634 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
@@ -180,6 +180,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -228,6 +229,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -316,6 +318,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -364,6 +367,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -505,6 +509,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -553,6 +558,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -641,6 +647,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -689,6 +696,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -830,6 +838,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -878,6 +887,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -966,6 +976,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1014,6 +1025,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/bucket2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket2.q.out 
b/ql/src/test/results/clientpositive/llap/bucket2.q.out
index 10fc171..8416a9d 100644
--- a/ql/src/test/results/clientpositive/llap/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket2.q.out
@@ -59,6 +59,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -80,6 +81,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -121,6 +123,7 @@ STAGE PLANS:
                         COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                         bucket_count 2
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -191,6 +194,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -261,66 +265,59 @@ POSTHOOK: query: select * from bucket2_1 tablesample 
(bucket 1 out of 2) s
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bucket2_1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
 10     val_10
-100    val_100
-100    val_100
-104    val_104
-104    val_104
-114    val_114
+105    val_105
+113    val_113
+113    val_113
 116    val_116
-118    val_118
-118    val_118
-12     val_12
-12     val_12
-120    val_120
-120    val_120
+119    val_119
+119    val_119
+119    val_119
 126    val_126
-128    val_128
-128    val_128
-128    val_128
+133    val_133
 134    val_134
 134    val_134
-136    val_136
-138    val_138
-138    val_138
-138    val_138
-138    val_138
+137    val_137
+137    val_137
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
+149    val_149
+149    val_149
+153    val_153
 156    val_156
+157    val_157
 158    val_158
-160    val_160
 162    val_162
+163    val_163
 164    val_164
 164    val_164
-166    val_166
-168    val_168
-170    val_170
-172    val_172
-172    val_172
-174    val_174
-174    val_174
-176    val_176
-176    val_176
+165    val_165
+165    val_165
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+17     val_17
+177    val_177
 178    val_178
-18     val_18
-18     val_18
-180    val_180
-186    val_186
+181    val_181
+187    val_187
+187    val_187
+187    val_187
+19     val_19
 190    val_190
-192    val_192
-194    val_194
-196    val_196
+191    val_191
+191    val_191
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+199    val_199
+199    val_199
+199    val_199
 2      val_2
 20     val_20
-200    val_200
-200    val_200
+201    val_201
 202    val_202
 208    val_208
 208    val_208
@@ -328,70 +325,62 @@ POSTHOOK: Input: default@bucket2_1
 214    val_214
 216    val_216
 216    val_216
-218    val_218
-222    val_222
-224    val_224
-224    val_224
+221    val_221
+221    val_221
 226    val_226
-228    val_228
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
+229    val_229
+229    val_229
+233    val_233
+233    val_233
+237    val_237
+237    val_237
 238    val_238
 238    val_238
-24     val_24
-24     val_24
-242    val_242
-242    val_242
+239    val_239
+239    val_239
 244    val_244
 248    val_248
+249    val_249
 252    val_252
+255    val_255
+255    val_255
 256    val_256
 256    val_256
-258    val_258
-26     val_26
-26     val_26
 260    val_260
-262    val_262
 266    val_266
+27     val_27
 272    val_272
 272    val_272
-274    val_274
-278    val_278
-278    val_278
-28     val_28
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 286    val_286
-288    val_288
-288    val_288
+287    val_287
+289    val_289
+291    val_291
 292    val_292
-296    val_296
-298    val_298
-298    val_298
-298    val_298
 30     val_30
-302    val_302
-306    val_306
+307    val_307
+307    val_307
 308    val_308
 310    val_310
+311    val_311
+311    val_311
+311    val_311
+315    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-322    val_322
-322    val_322
+317    val_317
+317    val_317
+325    val_325
+325    val_325
+327    val_327
+327    val_327
+327    val_327
 332    val_332
 336    val_336
 338    val_338
-34     val_34
+339    val_339
+341    val_341
 342    val_342
 342    val_342
 344    val_344
@@ -401,110 +390,121 @@ POSTHOOK: Input: default@bucket2_1
 348    val_348
 348    val_348
 348    val_348
-356    val_356
+351    val_351
+353    val_353
+353    val_353
 360    val_360
 362    val_362
 364    val_364
-366    val_366
+365    val_365
 368    val_368
-374    val_374
+369    val_369
+369    val_369
+369    val_369
+377    val_377
 378    val_378
-382    val_382
-382    val_382
 384    val_384
 384    val_384
 384    val_384
 386    val_386
 392    val_392
+393    val_393
 394    val_394
 396    val_396
 396    val_396
 396    val_396
-4      val_4
-400    val_400
+397    val_397
+397    val_397
+399    val_399
+399    val_399
 402    val_402
 404    val_404
 404    val_404
-406    val_406
-406    val_406
-406    val_406
-406    val_406
+407    val_407
+409    val_409
+409    val_409
+409    val_409
+41     val_41
+411    val_411
 414    val_414
 414    val_414
-418    val_418
-42     val_42
-42     val_42
-424    val_424
-424    val_424
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+427    val_427
+43     val_43
 430    val_430
 430    val_430
 430    val_430
 432    val_432
-436    val_436
-438    val_438
-438    val_438
-438    val_438
-44     val_44
+435    val_435
+437    val_437
+443    val_443
 444    val_444
 446    val_446
-448    val_448
+449    val_449
 452    val_452
+453    val_453
 454    val_454
 454    val_454
 454    val_454
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
+459    val_459
+459    val_459
+463    val_463
+463    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-470    val_470
+467    val_467
 472    val_472
 478    val_478
 478    val_478
+479    val_479
 480    val_480
 480    val_480
 480    val_480
 482    val_482
+483    val_483
 484    val_484
+485    val_485
 490    val_490
-492    val_492
-492    val_492
-494    val_494
-496    val_496
+491    val_491
+495    val_495
+497    val_497
 498    val_498
 498    val_498
 498    val_498
+51     val_51
+51     val_51
 54     val_54
+57     val_57
 58     val_58
 58     val_58
 64     val_64
-66     val_66
+65     val_65
+67     val_67
+67     val_67
+69     val_69
 70     val_70
 70     val_70
 70     val_70
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-78     val_78
-8      val_8
+77     val_77
 80     val_80
-82     val_82
+83     val_83
+83     val_83
 84     val_84
 84     val_84
+85     val_85
 86     val_86
 90     val_90
 90     val_90
 90     val_90
-92     val_92
 96     val_96
+97     val_97
+97     val_97
 98     val_98
 98     val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/bucket3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket3.q.out 
b/ql/src/test/results/clientpositive/llap/bucket3.q.out
index 9ae5166..0ffba8d 100644
--- a/ql/src/test/results/clientpositive/llap/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket3.q.out
@@ -60,6 +60,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -81,6 +82,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -122,6 +124,7 @@ STAGE PLANS:
                       properties:
                         bucket_count 2
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -211,6 +214,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -293,66 +297,59 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bucket3_1
 POSTHOOK: Input: default@bucket3_1@ds=1
 #### A masked pattern was here ####
-0      val_0   1
-0      val_0   1
-0      val_0   1
 10     val_10  1
-100    val_100 1
-100    val_100 1
-104    val_104 1
-104    val_104 1
-114    val_114 1
+105    val_105 1
+113    val_113 1
+113    val_113 1
 116    val_116 1
-118    val_118 1
-118    val_118 1
-12     val_12  1
-12     val_12  1
-120    val_120 1
-120    val_120 1
+119    val_119 1
+119    val_119 1
+119    val_119 1
 126    val_126 1
-128    val_128 1
-128    val_128 1
-128    val_128 1
+133    val_133 1
 134    val_134 1
 134    val_134 1
-136    val_136 1
-138    val_138 1
-138    val_138 1
-138    val_138 1
-138    val_138 1
+137    val_137 1
+137    val_137 1
 146    val_146 1
 146    val_146 1
-150    val_150 1
-152    val_152 1
-152    val_152 1
+149    val_149 1
+149    val_149 1
+153    val_153 1
 156    val_156 1
+157    val_157 1
 158    val_158 1
-160    val_160 1
 162    val_162 1
+163    val_163 1
 164    val_164 1
 164    val_164 1
-166    val_166 1
-168    val_168 1
-170    val_170 1
-172    val_172 1
-172    val_172 1
-174    val_174 1
-174    val_174 1
-176    val_176 1
-176    val_176 1
+165    val_165 1
+165    val_165 1
+169    val_169 1
+169    val_169 1
+169    val_169 1
+169    val_169 1
+17     val_17  1
+177    val_177 1
 178    val_178 1
-18     val_18  1
-18     val_18  1
-180    val_180 1
-186    val_186 1
+181    val_181 1
+187    val_187 1
+187    val_187 1
+187    val_187 1
+19     val_19  1
 190    val_190 1
-192    val_192 1
-194    val_194 1
-196    val_196 1
+191    val_191 1
+191    val_191 1
+195    val_195 1
+195    val_195 1
+197    val_197 1
+197    val_197 1
+199    val_199 1
+199    val_199 1
+199    val_199 1
 2      val_2   1
 20     val_20  1
-200    val_200 1
-200    val_200 1
+201    val_201 1
 202    val_202 1
 208    val_208 1
 208    val_208 1
@@ -360,70 +357,62 @@ POSTHOOK: Input: default@bucket3_1@ds=1
 214    val_214 1
 216    val_216 1
 216    val_216 1
-218    val_218 1
-222    val_222 1
-224    val_224 1
-224    val_224 1
+221    val_221 1
+221    val_221 1
 226    val_226 1
-228    val_228 1
-230    val_230 1
-230    val_230 1
-230    val_230 1
-230    val_230 1
-230    val_230 1
+229    val_229 1
+229    val_229 1
+233    val_233 1
+233    val_233 1
+237    val_237 1
+237    val_237 1
 238    val_238 1
 238    val_238 1
-24     val_24  1
-24     val_24  1
-242    val_242 1
-242    val_242 1
+239    val_239 1
+239    val_239 1
 244    val_244 1
 248    val_248 1
+249    val_249 1
 252    val_252 1
+255    val_255 1
+255    val_255 1
 256    val_256 1
 256    val_256 1
-258    val_258 1
-26     val_26  1
-26     val_26  1
 260    val_260 1
-262    val_262 1
 266    val_266 1
+27     val_27  1
 272    val_272 1
 272    val_272 1
-274    val_274 1
-278    val_278 1
-278    val_278 1
-28     val_28  1
-280    val_280 1
-280    val_280 1
-282    val_282 1
-282    val_282 1
 284    val_284 1
 286    val_286 1
-288    val_288 1
-288    val_288 1
+287    val_287 1
+289    val_289 1
+291    val_291 1
 292    val_292 1
-296    val_296 1
-298    val_298 1
-298    val_298 1
-298    val_298 1
 30     val_30  1
-302    val_302 1
-306    val_306 1
+307    val_307 1
+307    val_307 1
 308    val_308 1
 310    val_310 1
+311    val_311 1
+311    val_311 1
+311    val_311 1
+315    val_315 1
 316    val_316 1
 316    val_316 1
 316    val_316 1
-318    val_318 1
-318    val_318 1
-318    val_318 1
-322    val_322 1
-322    val_322 1
+317    val_317 1
+317    val_317 1
+325    val_325 1
+325    val_325 1
+327    val_327 1
+327    val_327 1
+327    val_327 1
 332    val_332 1
 336    val_336 1
 338    val_338 1
-34     val_34  1
+339    val_339 1
+341    val_341 1
 342    val_342 1
 342    val_342 1
 344    val_344 1
@@ -433,110 +422,121 @@ POSTHOOK: Input: default@bucket3_1@ds=1
 348    val_348 1
 348    val_348 1
 348    val_348 1
-356    val_356 1
+351    val_351 1
+353    val_353 1
+353    val_353 1
 360    val_360 1
 362    val_362 1
 364    val_364 1
-366    val_366 1
+365    val_365 1
 368    val_368 1
-374    val_374 1
+369    val_369 1
+369    val_369 1
+369    val_369 1
+377    val_377 1
 378    val_378 1
-382    val_382 1
-382    val_382 1
 384    val_384 1
 384    val_384 1
 384    val_384 1
 386    val_386 1
 392    val_392 1
+393    val_393 1
 394    val_394 1
 396    val_396 1
 396    val_396 1
 396    val_396 1
-4      val_4   1
-400    val_400 1
+397    val_397 1
+397    val_397 1
+399    val_399 1
+399    val_399 1
 402    val_402 1
 404    val_404 1
 404    val_404 1
-406    val_406 1
-406    val_406 1
-406    val_406 1
-406    val_406 1
+407    val_407 1
+409    val_409 1
+409    val_409 1
+409    val_409 1
+41     val_41  1
+411    val_411 1
 414    val_414 1
 414    val_414 1
-418    val_418 1
-42     val_42  1
-42     val_42  1
-424    val_424 1
-424    val_424 1
+417    val_417 1
+417    val_417 1
+417    val_417 1
+419    val_419 1
+421    val_421 1
+427    val_427 1
+43     val_43  1
 430    val_430 1
 430    val_430 1
 430    val_430 1
 432    val_432 1
-436    val_436 1
-438    val_438 1
-438    val_438 1
-438    val_438 1
-44     val_44  1
+435    val_435 1
+437    val_437 1
+443    val_443 1
 444    val_444 1
 446    val_446 1
-448    val_448 1
+449    val_449 1
 452    val_452 1
+453    val_453 1
 454    val_454 1
 454    val_454 1
 454    val_454 1
 458    val_458 1
 458    val_458 1
-460    val_460 1
-462    val_462 1
-462    val_462 1
+459    val_459 1
+459    val_459 1
+463    val_463 1
+463    val_463 1
 466    val_466 1
 466    val_466 1
 466    val_466 1
-468    val_468 1
-468    val_468 1
-468    val_468 1
-468    val_468 1
-470    val_470 1
+467    val_467 1
 472    val_472 1
 478    val_478 1
 478    val_478 1
+479    val_479 1
 480    val_480 1
 480    val_480 1
 480    val_480 1
 482    val_482 1
+483    val_483 1
 484    val_484 1
+485    val_485 1
 490    val_490 1
-492    val_492 1
-492    val_492 1
-494    val_494 1
-496    val_496 1
+491    val_491 1
+495    val_495 1
+497    val_497 1
 498    val_498 1
 498    val_498 1
 498    val_498 1
+51     val_51  1
+51     val_51  1
 54     val_54  1
+57     val_57  1
 58     val_58  1
 58     val_58  1
 64     val_64  1
-66     val_66  1
+65     val_65  1
+67     val_67  1
+67     val_67  1
+69     val_69  1
 70     val_70  1
 70     val_70  1
 70     val_70  1
-72     val_72  1
-72     val_72  1
-74     val_74  1
-76     val_76  1
-76     val_76  1
-78     val_78  1
-8      val_8   1
+77     val_77  1
 80     val_80  1
-82     val_82  1
+83     val_83  1
+83     val_83  1
 84     val_84  1
 84     val_84  1
+85     val_85  1
 86     val_86  1
 90     val_90  1
 90     val_90  1
 90     val_90  1
-92     val_92  1
 96     val_96  1
+97     val_97  1
+97     val_97  1
 98     val_98  1
 98     val_98  1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/bucket4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket4.q.out 
b/ql/src/test/results/clientpositive/llap/bucket4.q.out
index 0a1c497..aae2635 100644
--- a/ql/src/test/results/clientpositive/llap/bucket4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket4.q.out
@@ -60,6 +60,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -81,6 +82,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -123,6 +125,7 @@ STAGE PLANS:
                         SORTBUCKETCOLSPREFIX TRUE
                         bucket_count 2
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -194,6 +197,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -264,104 +268,93 @@ POSTHOOK: query: select * from bucket4_1 tablesample 
(bucket 1 out of 2) s
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bucket4_1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
 2      val_2
-4      val_4
-8      val_8
 10     val_10
-12     val_12
-12     val_12
-18     val_18
-18     val_18
+17     val_17
+19     val_19
 20     val_20
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
+27     val_27
 30     val_30
-34     val_34
-42     val_42
-42     val_42
-44     val_44
+41     val_41
+43     val_43
+51     val_51
+51     val_51
 54     val_54
+57     val_57
 58     val_58
 58     val_58
 64     val_64
-66     val_66
+65     val_65
+67     val_67
+67     val_67
+69     val_69
 70     val_70
 70     val_70
 70     val_70
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-78     val_78
+77     val_77
 80     val_80
-82     val_82
+83     val_83
+83     val_83
 84     val_84
 84     val_84
+85     val_85
 86     val_86
 90     val_90
 90     val_90
 90     val_90
-92     val_92
 96     val_96
+97     val_97
+97     val_97
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-104    val_104
-104    val_104
-114    val_114
+105    val_105
+113    val_113
+113    val_113
 116    val_116
-118    val_118
-118    val_118
-120    val_120
-120    val_120
+119    val_119
+119    val_119
+119    val_119
 126    val_126
-128    val_128
-128    val_128
-128    val_128
+133    val_133
 134    val_134
 134    val_134
-136    val_136
-138    val_138
-138    val_138
-138    val_138
-138    val_138
+137    val_137
+137    val_137
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
+149    val_149
+149    val_149
+153    val_153
 156    val_156
+157    val_157
 158    val_158
-160    val_160
 162    val_162
+163    val_163
 164    val_164
 164    val_164
-166    val_166
-168    val_168
-170    val_170
-172    val_172
-172    val_172
-174    val_174
-174    val_174
-176    val_176
-176    val_176
+165    val_165
+165    val_165
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
 178    val_178
-180    val_180
-186    val_186
+181    val_181
+187    val_187
+187    val_187
+187    val_187
 190    val_190
-192    val_192
-194    val_194
-196    val_196
-200    val_200
-200    val_200
+191    val_191
+191    val_191
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+199    val_199
+199    val_199
+199    val_199
+201    val_201
 202    val_202
 208    val_208
 208    val_208
@@ -369,63 +362,60 @@ POSTHOOK: Input: default@bucket4_1
 214    val_214
 216    val_216
 216    val_216
-218    val_218
-222    val_222
-224    val_224
-224    val_224
+221    val_221
+221    val_221
 226    val_226
-228    val_228
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
+229    val_229
+229    val_229
+233    val_233
+233    val_233
+237    val_237
+237    val_237
 238    val_238
 238    val_238
-242    val_242
-242    val_242
+239    val_239
+239    val_239
 244    val_244
 248    val_248
+249    val_249
 252    val_252
+255    val_255
+255    val_255
 256    val_256
 256    val_256
-258    val_258
 260    val_260
-262    val_262
 266    val_266
 272    val_272
 272    val_272
-274    val_274
-278    val_278
-278    val_278
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 286    val_286
-288    val_288
-288    val_288
+287    val_287
+289    val_289
+291    val_291
 292    val_292
-296    val_296
-298    val_298
-298    val_298
-298    val_298
-302    val_302
-306    val_306
+307    val_307
+307    val_307
 308    val_308
 310    val_310
+311    val_311
+311    val_311
+311    val_311
+315    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-322    val_322
-322    val_322
+317    val_317
+317    val_317
+325    val_325
+325    val_325
+327    val_327
+327    val_327
+327    val_327
 332    val_332
 336    val_336
 338    val_338
+339    val_339
+341    val_341
 342    val_342
 342    val_342
 344    val_344
@@ -435,79 +425,89 @@ POSTHOOK: Input: default@bucket4_1
 348    val_348
 348    val_348
 348    val_348
-356    val_356
+351    val_351
+353    val_353
+353    val_353
 360    val_360
 362    val_362
 364    val_364
-366    val_366
+365    val_365
 368    val_368
-374    val_374
+369    val_369
+369    val_369
+369    val_369
+377    val_377
 378    val_378
-382    val_382
-382    val_382
 384    val_384
 384    val_384
 384    val_384
 386    val_386
 392    val_392
+393    val_393
 394    val_394
 396    val_396
 396    val_396
 396    val_396
-400    val_400
+397    val_397
+397    val_397
+399    val_399
+399    val_399
 402    val_402
 404    val_404
 404    val_404
-406    val_406
-406    val_406
-406    val_406
-406    val_406
+407    val_407
+409    val_409
+409    val_409
+409    val_409
+411    val_411
 414    val_414
 414    val_414
-418    val_418
-424    val_424
-424    val_424
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+427    val_427
 430    val_430
 430    val_430
 430    val_430
 432    val_432
-436    val_436
-438    val_438
-438    val_438
-438    val_438
+435    val_435
+437    val_437
+443    val_443
 444    val_444
 446    val_446
-448    val_448
+449    val_449
 452    val_452
+453    val_453
 454    val_454
 454    val_454
 454    val_454
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
+459    val_459
+459    val_459
+463    val_463
+463    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-470    val_470
+467    val_467
 472    val_472
 478    val_478
 478    val_478
+479    val_479
 480    val_480
 480    val_480
 480    val_480
 482    val_482
+483    val_483
 484    val_484
+485    val_485
 490    val_490
-492    val_492
-492    val_492
-494    val_494
-496    val_496
+491    val_491
+495    val_495
+497    val_497
 498    val_498
 498    val_498
 498    val_498

Reply via email to