You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by dj...@apache.org on 2018/04/30 05:25:38 UTC

[26/36] hive git commit: HIVE-18910 : Migrate to Murmur hash for shuffle and bucketing (Deepak Jaiswal, reviewed by Jasone Dere)

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
new file mode 100644
index 0000000..79d9755
--- /dev/null
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers2.q.out
@@ -0,0 +1,242 @@
+PREHOOK: query: CREATE TABLE test_table(key int, value string) CLUSTERED BY (key) INTO 3 BUCKETS
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@test_table
+POSTHOOK: query: CREATE TABLE test_table(key int, value string) CLUSTERED BY (key) INTO 3 BUCKETS
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@test_table
+PREHOOK: query: explain extended insert overwrite table test_table
+  select * from src
+PREHOOK: type: QUERY
+POSTHOOK: query: explain extended insert overwrite table test_table
+  select * from src
+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 (CUSTOM_SIMPLE_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: src
+                  Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
+                  GatherStats: false
+                  Select Operator
+                    expressions: key (type: string), value (type: string)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
+                    Reduce Output Operator
+                      null sort order: 
+                      sort order: 
+                      Map-reduce partition columns: UDFToInteger(_col0) (type: int)
+                      Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE
+                      tag: -1
+                      value expressions: _col0 (type: string), _col1 (type: string)
+                      auto parallelism: false
+            Execution mode: llap
+            LLAP IO: no inputs
+            Path -> Alias:
+#### A masked pattern was here ####
+            Path -> Partition:
+#### A masked pattern was here ####
+                Partition
+                  base file name: src
+                  input format: org.apache.hadoop.mapred.TextInputFormat
+                  output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                  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'
+                    columns.types string:string
+#### A masked pattern was here ####
+                    name default.src
+                    numFiles 1
+                    numRows 500
+                    rawDataSize 5312
+                    serialization.ddl struct src { string key, string value}
+                    serialization.format 1
+                    serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    totalSize 5812
+#### A masked pattern was here ####
+                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                
+                    input format: org.apache.hadoop.mapred.TextInputFormat
+                    output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                    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'
+                      columns.types string:string
+#### A masked pattern was here ####
+                      name default.src
+                      numFiles 1
+                      numRows 500
+                      rawDataSize 5312
+                      serialization.ddl struct src { string key, string value}
+                      serialization.format 1
+                      serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      totalSize 5812
+#### A masked pattern was here ####
+                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    name: default.src
+                  name: default.src
+            Truncated Path -> Alias:
+              /src [src]
+        Reducer 2 
+            Execution mode: llap
+            Needs Tagging: false
+            Reduce Operator Tree:
+              Select Operator
+                expressions: UDFToInteger(VALUE._col0) (type: int), VALUE._col1 (type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
+                File Output Operator
+                  compressed: false
+                  GlobalTableId: 1
+#### A masked pattern was here ####
+                  NumFilesPerFileSink: 3
+                  Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
+#### A masked pattern was here ####
+                  table:
+                      input format: org.apache.hadoop.mapred.TextInputFormat
+                      output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+                      properties:
+                        COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
+                        bucket_count 3
+                        bucket_field_name key
+                        bucketing_version 2
+                        column.name.delimiter ,
+                        columns key,value
+                        columns.comments 
+                        columns.types int:string
+#### A masked pattern was here ####
+                        name default.test_table
+                        numFiles 0
+                        numRows 0
+                        rawDataSize 0
+                        serialization.ddl struct test_table { i32 key, string value}
+                        serialization.format 1
+                        serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        totalSize 0
+#### A masked pattern was here ####
+                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                      name: default.test_table
+                  TotalFiles: 3
+                  GatherStats: true
+                  MultiFileSpray: true
+                Select Operator
+                  expressions: _col0 (type: int), _col1 (type: string)
+                  outputColumnNames: key, value
+                  Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE
+                  Group By Operator
+                    aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll')
+                    mode: complete
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 1 Data size: 864 Basic stats: COMPLETE Column stats: COMPLETE
+                    Select Operator
+                      expressions: _col0 (type: struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>), _col1 (type: struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>)
+                      outputColumnNames: _col0, _col1
+                      Statistics: Num rows: 1 Data size: 864 Basic stats: COMPLETE Column stats: COMPLETE
+                      File Output Operator
+                        compressed: false
+                        GlobalTableId: 0
+#### A masked pattern was here ####
+                        NumFilesPerFileSink: 1
+                        Statistics: Num rows: 1 Data size: 864 Basic stats: COMPLETE Column stats: COMPLETE
+#### A masked pattern was here ####
+                        table:
+                            input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                            output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                            properties:
+                              columns _col0,_col1
+                              columns.types struct<columntype:string,min:bigint,max:bigint,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>:struct<columntype:string,maxlength:bigint,avglength:double,countnulls:bigint,numdistinctvalues:bigint,ndvbitvector:binary>
+                              escape.delim \
+                              hive.serialization.extend.additional.nesting.levels true
+                              serialization.escape.crlf true
+                              serialization.format 1
+                              serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                            serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                        TotalFiles: 1
+                        GatherStats: false
+                        MultiFileSpray: false
+
+  Stage: Stage-2
+    Dependency Collection
+
+  Stage: Stage-0
+    Move Operator
+      tables:
+          replace: true
+#### A masked pattern was here ####
+          table:
+              input format: org.apache.hadoop.mapred.TextInputFormat
+              output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
+              properties:
+                COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
+                bucket_count 3
+                bucket_field_name key
+                bucketing_version 2
+                column.name.delimiter ,
+                columns key,value
+                columns.comments 
+                columns.types int:string
+#### A masked pattern was here ####
+                name default.test_table
+                numFiles 0
+                numRows 0
+                rawDataSize 0
+                serialization.ddl struct test_table { i32 key, string value}
+                serialization.format 1
+                serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                totalSize 0
+#### A masked pattern was here ####
+              serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+              name: default.test_table
+
+  Stage: Stage-3
+    Stats Work
+      Basic Stats Work:
+#### A masked pattern was here ####
+      Column Stats Desc:
+          Columns: key, value
+          Column Types: int, string
+          Table: default.test_table
+          Is Table Level Stats: true
+
+PREHOOK: query: insert overwrite table test_table
+select * from src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@test_table
+POSTHOOK: query: insert overwrite table test_table
+select * from src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@test_table
+POSTHOOK: Lineage: test_table.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: drop table test_table
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@test_table
+PREHOOK: Output: default@test_table
+POSTHOOK: query: drop table test_table
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@test_table
+POSTHOOK: Output: default@test_table

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucket_num_reducers_acid2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucket_num_reducers_acid2.q.out b/ql/src/test/results/clientpositive/llap/bucket_num_reducers_acid2.q.out
new file mode 100644
index 0000000..8a4b54a
--- /dev/null
+++ b/ql/src/test/results/clientpositive/llap/bucket_num_reducers_acid2.q.out
@@ -0,0 +1,84 @@
+PREHOOK: query: drop table if exists bucket_nr_acid2
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: drop table if exists bucket_nr_acid2
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: create table bucket_nr_acid2 (a int, b int) clustered by (a) into 4 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: create table bucket_nr_acid2 (a int, b int) clustered by (a) into 4 buckets stored as orc TBLPROPERTIES ('transactional'='true')
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@bucket_nr_acid2
+PREHOOK: query: insert into bucket_nr_acid2 values(0,1),(1,1)
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: insert into bucket_nr_acid2 values(0,1),(1,1)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: Lineage: bucket_nr_acid2.a SCRIPT []
+POSTHOOK: Lineage: bucket_nr_acid2.b SCRIPT []
+PREHOOK: query: insert into bucket_nr_acid2 values(2,2),(3,2)
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: insert into bucket_nr_acid2 values(2,2),(3,2)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: Lineage: bucket_nr_acid2.a SCRIPT []
+POSTHOOK: Lineage: bucket_nr_acid2.b SCRIPT []
+PREHOOK: query: insert into bucket_nr_acid2 values(0,3),(1,3)
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: insert into bucket_nr_acid2 values(0,3),(1,3)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: Lineage: bucket_nr_acid2.a SCRIPT []
+POSTHOOK: Lineage: bucket_nr_acid2.b SCRIPT []
+PREHOOK: query: insert into bucket_nr_acid2 values(2,4),(3,4)
+PREHOOK: type: QUERY
+PREHOOK: Input: _dummy_database@_dummy_table
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: insert into bucket_nr_acid2 values(2,4),(3,4)
+POSTHOOK: type: QUERY
+POSTHOOK: Input: _dummy_database@_dummy_table
+POSTHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: Lineage: bucket_nr_acid2.a SCRIPT []
+POSTHOOK: Lineage: bucket_nr_acid2.b SCRIPT []
+PREHOOK: query: update bucket_nr_acid2 set b = -1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_nr_acid2
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: update bucket_nr_acid2 set b = -1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_nr_acid2
+POSTHOOK: Output: default@bucket_nr_acid2
+PREHOOK: query: select * from bucket_nr_acid2 order by a, b
+PREHOOK: type: QUERY
+PREHOOK: Input: default@bucket_nr_acid2
+#### A masked pattern was here ####
+POSTHOOK: query: select * from bucket_nr_acid2 order by a, b
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@bucket_nr_acid2
+#### A masked pattern was here ####
+0	-1
+0	-1
+1	-1
+1	-1
+2	-1
+2	-1
+3	-1
+3	-1
+PREHOOK: query: drop table bucket_nr_acid2
+PREHOOK: type: DROPTABLE
+PREHOOK: Input: default@bucket_nr_acid2
+PREHOOK: Output: default@bucket_nr_acid2
+POSTHOOK: query: drop table bucket_nr_acid2
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Input: default@bucket_nr_acid2
+POSTHOOK: Output: default@bucket_nr_acid2

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
index 61db738..bbd689a 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out
@@ -439,6 +439,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -460,6 +461,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -540,6 +542,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -587,6 +590,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -668,6 +672,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -859,6 +864,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -880,6 +886,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -960,6 +967,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1007,6 +1015,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -1088,6 +1097,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
index d6f541d..633e6b8 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out
@@ -176,6 +176,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -254,6 +255,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -301,6 +303,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -382,6 +385,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -602,6 +606,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -680,6 +685,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -727,6 +733,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -808,6 +815,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -1045,6 +1053,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1123,6 +1132,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1171,6 +1181,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -1219,6 +1230,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -1300,6 +1312,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
index e37a618..e73c2af 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out
@@ -200,6 +200,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -278,6 +279,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -325,6 +327,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -406,6 +409,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -626,6 +630,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -704,6 +709,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -751,6 +757,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -832,6 +839,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
index c8deac4..23ef650 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out
@@ -175,6 +175,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -196,6 +197,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -251,6 +253,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -272,6 +275,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -321,6 +325,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -402,6 +407,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -585,6 +591,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -606,6 +613,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -661,6 +669,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -682,6 +691,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -731,6 +741,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -812,6 +823,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
index 1e87e1a..ad740c841 100644
--- a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out
@@ -134,6 +134,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -209,6 +210,7 @@ STAGE PLANS:
                     properties:
                       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/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
index 21bd171..b435116 100644
--- a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = 1) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [13,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -96,7 +96,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = 16) (type: boolean)
-                  buckets included: [0,] of 16
+                  buckets included: [3,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -158,7 +158,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = 17) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [12,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -220,7 +220,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = 17) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [12,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -282,7 +282,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = 11) (type: boolean)
-                  buckets included: [11,] of 16
+                  buckets included: [5,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -344,7 +344,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key = 1) and (ds = '2008-04-08')) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [13,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -406,7 +406,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key = 1) and (ds = '2008-04-08') and (value = 'One')) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [13,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -468,7 +468,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((value = 'One') and (key = 1) and (ds = '2008-04-08')) (type: boolean)
-                  buckets included: [1,] of 16
+                  buckets included: [13,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -530,7 +530,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key) IN (2, 3) (type: boolean)
-                  buckets included: [2,3,] of 16
+                  buckets included: [4,6,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -592,7 +592,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08')) (type: boolean)
-                  buckets included: [2,3,] of 16
+                  buckets included: [4,6,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -654,7 +654,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08') and (value = 'One')) (type: boolean)
-                  buckets included: [2,3,] of 16
+                  buckets included: [4,6,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -716,7 +716,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (2, 3) and (value = 'One') and (ds = '2008-04-08')) (type: boolean)
-                  buckets included: [2,3,] of 16
+                  buckets included: [4,6,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -900,7 +900,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key = -15) (type: boolean)
-                  buckets included: [1,15,] of 16
+                  buckets included: [6,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -962,6 +962,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) (type: boolean)
+                  buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -1023,6 +1024,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08')) (type: boolean)
+                  buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -1084,6 +1086,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08') and (value = 'One')) (type: boolean)
+                  buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator
@@ -1145,6 +1148,7 @@ STAGE PLANS:
                 TableScan
                   alias: srcbucket_pruned
                   filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One') and (ds = '2008-04-08')) (type: boolean)
+                  buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16
                   Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL
                   GatherStats: false
                   Filter Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
index 49827b4..35dc60e 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out
@@ -252,18 +252,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 2	val_2val_2	1
-4	val_4val_4	1
-8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -274,6 +263,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_4val_4	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -283,6 +282,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -462,6 +462,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+2	val_2val_2	1
+2	val_2val_2	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
@@ -480,22 +492,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
-2	val_2val_2	1
-2	val_2val_2	1
 4	val_4val_4	1
 4	val_4val_4	1
-8	val_8val_8	1
-8	val_8val_8	1
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -514,6 +512,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
+8	val_8val_8	1
 9	val_9val_9	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
@@ -694,6 +694,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+2	val_2val_2	1
+2	val_2val_2	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
@@ -712,22 +724,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
-2	val_2val_2	1
-2	val_2val_2	1
 4	val_4val_4	1
 4	val_4val_4	1
-8	val_8val_8	1
-8	val_8val_8	1
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -746,6 +744,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
+8	val_8val_8	1
 9	val_9val_9	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
@@ -936,18 +936,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 2	val_2val_2	1
-4	val_4val_4	1
-8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -958,6 +947,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_4val_4	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -967,6 +966,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -1156,18 +1156,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
 2	val_2val_2val_2val_2	1
-4	val_4val_4val_4val_4	1
-8	val_8val_8val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -1178,6 +1167,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+4	val_4val_4val_4val_4	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
@@ -1187,6 +1186,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
+8	val_8val_8val_8val_8	1
 9	val_9val_9val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -1376,17 +1376,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-4	val_2val_2	1
-8	val_4val_4	1
 10	val_5val_5	1
 10	val_5val_5	1
 10	val_5val_5	1
@@ -1396,8 +1385,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 10	val_5val_5	1
 10	val_5val_5	1
 10	val_5val_5	1
-16	val_8val_8	1
-18	val_9val_9	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -1408,3 +1395,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_2val_2	1
+8	val_4val_4	1
+16	val_8val_8	1
+18	val_9val_9	1

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
index 56e93ac..9e80eab 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out
@@ -231,16 +231,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -252,6 +242,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -261,7 +262,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -452,16 +452,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -473,6 +463,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -482,7 +483,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -979,16 +979,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -1000,6 +990,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -1009,7 +1010,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -1212,16 +1212,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -1233,6 +1223,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -1242,7 +1243,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
index da28ae4..34890e0 100644
--- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out
@@ -232,15 +232,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -251,6 +242,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -448,15 +448,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -467,6 +458,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -668,15 +668,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -687,6 +678,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
index 25ea4cf..44e5501 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out
@@ -50,9 +50,9 @@ POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 POSTHOOK: Input: default@v1
 #### A masked pattern was here ####
-1
 NULL
 1
+1
 PREHOOK: query: select count(v1.c_int)  from v1 join cbo_t2 on v1.c_int = cbo_t2.c_int
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/cbo_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_views.q.out
index 25ea4cf..44e5501 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_views.q.out
@@ -50,9 +50,9 @@ POSTHOOK: Input: default@cbo_t1
 POSTHOOK: Input: default@cbo_t1@dt=2014
 POSTHOOK: Input: default@v1
 #### A masked pattern was here ####
-1
 NULL
 1
+1
 PREHOOK: query: select count(v1.c_int)  from v1 join cbo_t2 on v1.c_int = cbo_t2.c_int
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/check_constraint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/check_constraint.q.out b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
index d7316de..5b47bb3 100644
--- a/ql/src/test/results/clientpositive/llap/check_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
@@ -39,6 +39,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -206,6 +207,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -423,6 +425,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -573,6 +576,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	totalSize           	0                   
 #### A masked pattern was here ####
@@ -732,6 +736,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -877,6 +882,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1101,6 +1107,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1256,6 +1263,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1611,16 +1619,16 @@ POSTHOOK: query: select * from acid_uami
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uami
 #### A masked pattern was here ####
-8	8.00	val_8
-4	4.00	val_4
 2	2.00	val_2
-0	0.00	val_0
-0	0.00	val_0
-0	0.00	val_0
 9	9.00	val_9
+8	8.00	val_8
 5	5.00	val_5
 5	5.00	val_5
 5	5.00	val_5
+4	4.00	val_4
+0	0.00	val_0
+0	0.00	val_0
+0	0.00	val_0
 10	10.00	val_10
 0	0.00	val_0
 0	0.00	val_0
@@ -1757,16 +1765,16 @@ POSTHOOK: query: select * from acid_uami
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid_uami
 #### A masked pattern was here ####
-114	114.00	val_114
-104	104.00	val_104
-100	100.00	val_100
-10	10.00	val_10
-0	0.00	val_0
 113	113.00	val_113
+105	105.00	val_105
+10	10.00	val_10
+114	114.00	val_114
 111	111.00	val_111
 11	11.00	val_11
-105	105.00	val_105
+104	104.00	val_104
 103	103.00	val_103
+100	100.00	val_100
+0	0.00	val_0
 PREHOOK: query: truncate table acid_uami
 PREHOOK: type: TRUNCATETABLE
 PREHOOK: Output: default@acid_uami
@@ -2109,6 +2117,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2817,6 +2826,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2866,6 +2876,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -3014,6 +3025,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -3373,6 +3385,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	transactional       	true                
 	transactional_properties	insert_only         
@@ -3429,6 +3442,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -3551,6 +3565,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	totalSize           	5                   
 	transactional       	true                

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/cluster.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cluster.q.out b/ql/src/test/results/clientpositive/llap/cluster.q.out
index 33d74ce..c2a8577 100644
--- a/ql/src/test/results/clientpositive/llap/cluster.q.out
+++ b/ql/src/test/results/clientpositive/llap/cluster.q.out
@@ -1064,178 +1064,217 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 10	val_10
+103	val_103
+103	val_103
 104	val_104
 104	val_104
-111	val_111
-114	val_114
-116	val_116
+105	val_105
+11	val_11
 126	val_126
 128	val_128
 128	val_128
 128	val_128
-131	val_131
+129	val_129
+129	val_129
+133	val_133
 134	val_134
 134	val_134
+136	val_136
+143	val_143
+149	val_149
+149	val_149
 152	val_152
 152	val_152
-155	val_155
+153	val_153
+157	val_157
+162	val_162
+166	val_166
 169	val_169
 169	val_169
 169	val_169
 169	val_169
-17	val_17
 170	val_170
-172	val_172
-172	val_172
-178	val_178
-179	val_179
-179	val_179
-189	val_189
-19	val_19
-192	val_192
-194	val_194
-195	val_195
-195	val_195
-199	val_199
-199	val_199
-199	val_199
-20	val_20
-207	val_207
-207	val_207
+174	val_174
+174	val_174
+176	val_176
+176	val_176
+193	val_193
+193	val_193
+193	val_193
+196	val_196
+201	val_201
+205	val_205
+205	val_205
+209	val_209
+209	val_209
 213	val_213
 213	val_213
 218	val_218
+221	val_221
+221	val_221
 223	val_223
 223	val_223
-229	val_229
-229	val_229
 233	val_233
 233	val_233
-235	val_235
+239	val_239
+239	val_239
 24	val_24
 24	val_24
-256	val_256
-256	val_256
-257	val_257
+241	val_241
+242	val_242
+242	val_242
+247	val_247
+248	val_248
 26	val_26
 26	val_26
-265	val_265
-265	val_265
-266	val_266
-27	val_27
-278	val_278
-278	val_278
-280	val_280
-280	val_280
-284	val_284
-291	val_291
-30	val_30
+263	val_263
+272	val_272
+272	val_272
+275	val_275
+285	val_285
+296	val_296
+298	val_298
+298	val_298
+298	val_298
 302	val_302
-305	val_305
-316	val_316
-316	val_316
-316	val_316
-321	val_321
-321	val_321
+307	val_307
+307	val_307
+310	val_310
 323	val_323
-33	val_33
+325	val_325
+325	val_325
 333	val_333
 333	val_333
+335	val_335
 338	val_338
-344	val_344
-344	val_344
-353	val_353
-353	val_353
-356	val_356
-364	val_364
-368	val_368
-369	val_369
-369	val_369
-369	val_369
-37	val_37
-37	val_37
+360	val_360
+362	val_362
+367	val_367
+367	val_367
+375	val_375
 377	val_377
-378	val_378
-386	val_386
+384	val_384
+384	val_384
+384	val_384
 392	val_392
-397	val_397
-397	val_397
-404	val_404
-404	val_404
-407	val_407
-411	val_411
-418	val_418
+399	val_399
+399	val_399
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+402	val_402
+403	val_403
+403	val_403
+403	val_403
+413	val_413
+413	val_413
+417	val_417
+417	val_417
+417	val_417
 419	val_419
-424	val_424
-424	val_424
-430	val_430
-430	val_430
-430	val_430
-432	val_432
-436	val_436
-437	val_437
-448	val_448
-454	val_454
-454	val_454
-454	val_454
-457	val_457
-468	val_468
-468	val_468
-468	val_468
-468	val_468
-477	val_477
+42	val_42
+42	val_42
+427	val_427
+438	val_438
+438	val_438
+438	val_438
+44	val_44
+458	val_458
+458	val_458
+459	val_459
+459	val_459
+466	val_466
+466	val_466
+466	val_466
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+472	val_472
+475	val_475
+478	val_478
+478	val_478
 479	val_479
-490	val_490
-492	val_492
-492	val_492
-493	val_493
+483	val_483
+489	val_489
+489	val_489
+489	val_489
+489	val_489
 495	val_495
 496	val_496
-497	val_497
+5	val_5
+5	val_5
+5	val_5
 57	val_57
-67	val_67
-67	val_67
-8	val_8
-80	val_80
-85	val_85
+58	val_58
+58	val_58
+64	val_64
+66	val_66
+69	val_69
+72	val_72
+72	val_72
+76	val_76
+76	val_76
+77	val_77
 9	val_9
-92	val_92
-97	val_97
-97	val_97
-105	val_105
-11	val_11
+90	val_90
+90	val_90
+90	val_90
+0	val_0
+0	val_0
+0	val_0
 113	val_113
 113	val_113
-136	val_136
+114	val_114
+116	val_116
+118	val_118
+118	val_118
 137	val_137
 137	val_137
 138	val_138
 138	val_138
 138	val_138
 138	val_138
-143	val_143
-150	val_150
+145	val_145
+146	val_146
+146	val_146
+155	val_155
 158	val_158
-160	val_160
-162	val_162
+164	val_164
+164	val_164
 165	val_165
 165	val_165
-166	val_166
-174	val_174
-174	val_174
-177	val_177
-18	val_18
-18	val_18
-180	val_180
+178	val_178
+181	val_181
+183	val_183
 186	val_186
-196	val_196
-197	val_197
-197	val_197
-217	val_217
-217	val_217
-219	val_219
-219	val_219
-226	val_226
+189	val_189
+190	val_190
+191	val_191
+191	val_191
+194	val_194
+195	val_195
+195	val_195
+199	val_199
+199	val_199
+199	val_199
+2	val_2
+207	val_207
+207	val_207
+208	val_208
+208	val_208
+208	val_208
+214	val_214
+216	val_216
+216	val_216
+222	val_222
+224	val_224
+224	val_224
+229	val_229
+229	val_229
 230	val_230
 230	val_230
 230	val_230
@@ -1243,321 +1282,282 @@ POSTHOOK: Input: default@src
 230	val_230
 238	val_238
 238	val_238
-242	val_242
-242	val_242
-248	val_248
-252	val_252
+244	val_244
+258	val_258
 260	val_260
-263	val_263
-274	val_274
-277	val_277
-277	val_277
-277	val_277
-277	val_277
-296	val_296
-307	val_307
-307	val_307
-308	val_308
-325	val_325
-325	val_325
-327	val_327
-327	val_327
-327	val_327
+262	val_262
+266	val_266
+27	val_27
+273	val_273
+273	val_273
+273	val_273
+28	val_28
+284	val_284
+288	val_288
+288	val_288
+30	val_30
+315	val_315
+321	val_321
+321	val_321
+33	val_33
 342	val_342
 342	val_342
-348	val_348
-348	val_348
-348	val_348
-348	val_348
-348	val_348
 35	val_35
 35	val_35
 35	val_35
-351	val_351
-367	val_367
-367	val_367
+364	val_364
+365	val_365
+366	val_366
+368	val_368
+386	val_386
 389	val_389
-393	val_393
 394	val_394
+396	val_396
+396	val_396
+396	val_396
+397	val_397
+397	val_397
 4	val_4
-403	val_403
-403	val_403
-403	val_403
-409	val_409
-409	val_409
-409	val_409
+41	val_41
 414	val_414
 414	val_414
 421	val_421
-427	val_427
-429	val_429
-429	val_429
-435	val_435
-438	val_438
-438	val_438
-438	val_438
-439	val_439
-439	val_439
+444	val_444
+446	val_446
+448	val_448
+452	val_452
+454	val_454
+454	val_454
+454	val_454
 455	val_455
-458	val_458
-458	val_458
 460	val_460
-462	val_462
-462	val_462
-475	val_475
-478	val_478
-478	val_478
-480	val_480
-480	val_480
-480	val_480
-484	val_484
-487	val_487
-53	val_53
-58	val_58
-58	val_58
-66	val_66
-69	val_69
-77	val_77
+463	val_463
+463	val_463
+482	val_482
+492	val_492
+492	val_492
+493	val_493
+65	val_65
 78	val_78
-83	val_83
-83	val_83
-90	val_90
-90	val_90
-90	val_90
-95	val_95
-95	val_95
-103	val_103
-103	val_103
+80	val_80
+97	val_97
+97	val_97
+111	val_111
+12	val_12
+12	val_12
 120	val_120
 120	val_120
-129	val_129
-129	val_129
-133	val_133
-145	val_145
-146	val_146
-146	val_146
-149	val_149
-149	val_149
-15	val_15
-15	val_15
-157	val_157
-181	val_181
-187	val_187
-187	val_187
-187	val_187
-191	val_191
-191	val_191
-2	val_2
-200	val_200
-200	val_200
-201	val_201
-202	val_202
+131	val_131
+150	val_150
+156	val_156
+160	val_160
+163	val_163
+167	val_167
+167	val_167
+167	val_167
+168	val_168
+17	val_17
+175	val_175
+175	val_175
+180	val_180
+20	val_20
 203	val_203
 203	val_203
-208	val_208
-208	val_208
-208	val_208
-214	val_214
-216	val_216
-216	val_216
-222	val_222
-224	val_224
-224	val_224
-228	val_228
+226	val_226
 237	val_237
 237	val_237
-239	val_239
-239	val_239
-241	val_241
-244	val_244
 255	val_255
 255	val_255
-258	val_258
-262	val_262
-273	val_273
-273	val_273
-273	val_273
-275	val_275
-28	val_28
+256	val_256
+256	val_256
+274	val_274
+277	val_277
+277	val_277
+277	val_277
+277	val_277
+281	val_281
+281	val_281
 282	val_282
 282	val_282
-285	val_285
 286	val_286
 287	val_287
-288	val_288
-288	val_288
+289	val_289
 292	val_292
-298	val_298
-298	val_298
-298	val_298
-310	val_310
-311	val_311
-311	val_311
-311	val_311
+308	val_308
+309	val_309
+309	val_309
+318	val_318
+318	val_318
+318	val_318
+327	val_327
+327	val_327
+327	val_327
 332	val_332
-335	val_335
-336	val_336
 339	val_339
-360	val_360
-362	val_362
-373	val_373
-384	val_384
-384	val_384
-384	val_384
-395	val_395
-395	val_395
-396	val_396
-396	val_396
-396	val_396
-402	val_402
-417	val_417
-417	val_417
-417	val_417
-42	val_42
-42	val_42
+34	val_34
+341	val_341
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+356	val_356
+37	val_37
+37	val_37
+374	val_374
+379	val_379
+382	val_382
+382	val_382
+409	val_409
+409	val_409
+409	val_409
+429	val_429
+429	val_429
 43	val_43
-444	val_444
-449	val_449
-453	val_453
-459	val_459
-459	val_459
-47	val_47
+430	val_430
+430	val_430
+430	val_430
+431	val_431
+431	val_431
+431	val_431
+432	val_432
+435	val_435
+437	val_437
+439	val_439
+439	val_439
+443	val_443
+457	val_457
+462	val_462
+462	val_462
+467	val_467
+470	val_470
 481	val_481
-482	val_482
-483	val_483
-485	val_485
-489	val_489
-489	val_489
-489	val_489
-489	val_489
+487	val_487
 494	val_494
-65	val_65
-72	val_72
-72	val_72
+51	val_51
+51	val_51
+70	val_70
+70	val_70
+70	val_70
 74	val_74
-76	val_76
-76	val_76
 82	val_82
-86	val_86
-87	val_87
-96	val_96
-0	val_0
-0	val_0
-0	val_0
-118	val_118
-118	val_118
+83	val_83
+83	val_83
+84	val_84
+84	val_84
 119	val_119
 119	val_119
 119	val_119
-12	val_12
-12	val_12
 125	val_125
 125	val_125
-153	val_153
-156	val_156
-163	val_163
-164	val_164
-164	val_164
-167	val_167
-167	val_167
-167	val_167
-168	val_168
-175	val_175
-175	val_175
-176	val_176
-176	val_176
-183	val_183
-190	val_190
-193	val_193
-193	val_193
-193	val_193
-205	val_205
-205	val_205
-209	val_209
-209	val_209
-221	val_221
-221	val_221
-247	val_247
+15	val_15
+15	val_15
+172	val_172
+172	val_172
+177	val_177
+179	val_179
+179	val_179
+18	val_18
+18	val_18
+187	val_187
+187	val_187
+187	val_187
+19	val_19
+192	val_192
+197	val_197
+197	val_197
+200	val_200
+200	val_200
+202	val_202
+217	val_217
+217	val_217
+219	val_219
+219	val_219
+228	val_228
+235	val_235
 249	val_249
-272	val_272
-272	val_272
-281	val_281
-281	val_281
+252	val_252
+257	val_257
+265	val_265
+265	val_265
+278	val_278
+278	val_278
+280	val_280
+280	val_280
 283	val_283
-289	val_289
+291	val_291
+305	val_305
 306	val_306
-309	val_309
-309	val_309
-315	val_315
+311	val_311
+311	val_311
+311	val_311
+316	val_316
+316	val_316
+316	val_316
 317	val_317
 317	val_317
-318	val_318
-318	val_318
-318	val_318
 322	val_322
 322	val_322
 331	val_331
 331	val_331
-34	val_34
-341	val_341
+336	val_336
+344	val_344
+344	val_344
 345	val_345
-365	val_365
-366	val_366
-374	val_374
-375	val_375
-379	val_379
-382	val_382
-382	val_382
-399	val_399
-399	val_399
+351	val_351
+353	val_353
+353	val_353
+369	val_369
+369	val_369
+369	val_369
+373	val_373
+378	val_378
+393	val_393
+395	val_395
+395	val_395
 400	val_400
-401	val_401
-401	val_401
-401	val_401
-401	val_401
-401	val_401
+404	val_404
+404	val_404
 406	val_406
 406	val_406
 406	val_406
 406	val_406
-41	val_41
-413	val_413
-413	val_413
-431	val_431
-431	val_431
-431	val_431
-44	val_44
-443	val_443
-446	val_446
-452	val_452
-463	val_463
-463	val_463
-466	val_466
-466	val_466
-466	val_466
-467	val_467
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-470	val_470
-472	val_472
+407	val_407
+411	val_411
+418	val_418
+424	val_424
+424	val_424
+436	val_436
+449	val_449
+453	val_453
+468	val_468
+468	val_468
+468	val_468
+468	val_468
+47	val_47
+477	val_477
+480	val_480
+480	val_480
+480	val_480
+484	val_484
+485	val_485
+490	val_490
 491	val_491
+497	val_497
 498	val_498
 498	val_498
 498	val_498
-5	val_5
-5	val_5
-5	val_5
-51	val_51
-51	val_51
+53	val_53
 54	val_54
-64	val_64
-70	val_70
-70	val_70
-70	val_70
-84	val_84
-84	val_84
+67	val_67
+67	val_67
+8	val_8
+85	val_85
+86	val_86
+87	val_87
+92	val_92
+95	val_95
+95	val_95
+96	val_96
 98	val_98
 98	val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
index 63d5902..2a9f339 100644
--- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
@@ -38,6 +38,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -80,6 +81,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -214,6 +216,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -281,6 +284,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -459,6 +463,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -593,6 +598,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -965,6 +971,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -1007,6 +1014,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
index b327bf8..e83a370 100644
--- a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
@@ -25,6 +25,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0