http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
index b59c4bc..49598d1 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out
@@ -128,7 +128,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -139,7 +139,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1')
 SELECT * from 
@@ -238,7 +238,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -249,7 +249,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1')
 SELECT x.key, concat(x.value, x.value) from 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
index 52ef3db..d1c11f4 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out
@@ -120,7 +120,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -131,7 +131,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED 
BY (ds STRING)
 CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS
 PREHOOK: type: CREATETABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
index eaf85c3..72e918f 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
@@ -199,18 +199,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
 2      2       val_2val_2      1
-4      4       val_4val_4      1
-8      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
@@ -221,6 +210,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+4      4       val_4val_4      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
@@ -230,6 +229,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
+8      8       val_8val_8      1
 9      9       val_9val_9      1
 PREHOOK: query: DROP TABLE test_table3
 PREHOOK: type: DROPTABLE
@@ -408,6 +408,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 2      val_2   1
 4      val_4   1
 8      val_8   1
+9      val_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
@@ -427,7 +428,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      val_5   1
 5      val_5   1
 5      val_5   1
-9      val_9   1
 PREHOOK: query: DROP TABLE test_table3
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_table3

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
index 661114d..775cb91 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
@@ -202,18 +202,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-8      val_8val_8      1
-4      val_4val_4      1
 2      val_2val_2      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
-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
@@ -225,6 +214,7 @@ POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 9      val_9val_9      1
+8      val_8val_8      1
 5      val_5val_5      1
 5      val_5val_5      1
 5      val_5val_5      1
@@ -234,6 +224,16 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      val_5val_5      1
 5      val_5val_5      1
 5      val_5val_5      1
+4      val_4val_4      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
+0      val_0val_0      1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
 SELECT a.key, concat(a.value, b.value) 
@@ -396,18 +396,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-8      val_8val_8      1
-4      val_4val_4      1
 2      val_2val_2      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
-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
@@ -419,6 +408,7 @@ POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
 9      val_9val_9      1
+8      val_8val_8      1
 5      val_5val_5      1
 5      val_5val_5      1
 5      val_5val_5      1
@@ -428,3 +418,13 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      val_5val_5      1
 5      val_5val_5      1
 5      val_5val_5      1
+4      val_4val_4      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
+0      val_0val_0      1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
index dae491a..639af48 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
@@ -203,18 +203,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
 2      2       val_2val_2      1
-4      4       val_4val_4      1
-8      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
@@ -225,6 +214,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+4      4       val_4val_4      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
@@ -234,6 +233,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
+8      8       val_8val_8      1
 9      9       val_9val_9      1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -386,18 +386,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
-0      0       val_0val_0      1
 2      2       val_2val_2      1
-4      4       val_4val_4      1
-8      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
@@ -408,6 +397,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+0      0       val_0val_0      1
+4      4       val_4val_4      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
@@ -417,4 +416,5 @@ POSTHOOK: Input: default@test_table3@ds=1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
 5      5       val_5val_5      1
+8      8       val_8val_8      1
 9      9       val_9val_9      1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
index ec06e0e..f7123b9 100644
--- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out
@@ -77,6 +77,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'
@@ -98,6 +99,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'
@@ -148,6 +150,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -196,6 +199,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -375,6 +379,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'
@@ -396,6 +401,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'
@@ -446,6 +452,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -494,6 +501,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out 
b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
index 1a4cf73..401c70e 100644
--- 
a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
+++ 
b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out
@@ -38,6 +38,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                2                   
        numRows                 3                   
        rawDataSize             24                  
@@ -82,6 +83,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                 3                   
        rawDataSize             24                  
@@ -170,6 +172,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                 3                   
@@ -291,6 +294,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
 
b/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
index b327bf8..e83a370 100644
--- 
a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out
+++ 
b/ql/src/test/results/clientpositive/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                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out 
b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
index a347b01..196a3f3 100644
--- a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
+++ b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out
@@ -147,6 +147,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                1                   
        numRows                 1                   
        rawDataSize             7                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/columnstats_infinity.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_infinity.q.out 
b/ql/src/test/results/clientpositive/columnstats_infinity.q.out
index 6b31882..e06ff95 100644
--- a/ql/src/test/results/clientpositive/columnstats_infinity.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_infinity.q.out
@@ -98,6 +98,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 5                   
        rawDataSize             1250                
@@ -157,6 +158,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c1\":\"true\",\"c10\":\"true\",\"c12\":\"true\",\"c13\":\"true\",\"c15\":\"true\",\"c3\":\"true\",\"c4\":\"true\",\"c6\":\"true\",\"c7\":\"true\",\"c9\":\"true\",\"insert_num\":\"true\"}}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 5                   
        rawDataSize             1250                
@@ -276,6 +278,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c1\":\"true\",\"c10\":\"true\",\"c11\":\"true\",\"c12\":\"true\",\"c13\":\"true\",\"c14\":\"true\",\"c15\":\"true\",\"c2\":\"true\",\"c3\":\"true\",\"c4\":\"true\",\"c5\":\"true\",\"c6\":\"true\",\"c7\":\"true\",\"c8\":\"true\",\"c9\":\"true\",\"insert_num\":\"true\"}}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 5                   
        rawDataSize             1250                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
index 7d1b433..602714b 100644
--- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out
@@ -163,6 +163,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns employeeid,employeename
                 columns.comments 
@@ -411,6 +412,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns employeeid,employeename
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
index 9a9223a..6cbcab0 100644
--- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
@@ -135,6 +135,7 @@ STAGE PLANS:
             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             properties:
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
               columns.comments 
@@ -156,6 +157,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
                 columns.comments 
@@ -607,6 +609,7 @@ STAGE PLANS:
             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             properties:
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
               columns.comments 
@@ -628,6 +631,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/combine3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/combine3.q.out 
b/ql/src/test/results/clientpositive/combine3.q.out
index c508166..8a38fe3 100644
--- a/ql/src/test/results/clientpositive/combine3.q.out
+++ b/ql/src/test/results/clientpositive/combine3.q.out
@@ -170,36 +170,36 @@ POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket
 POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket@ds=1
 POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket@ds=11
 #### A masked pattern was here ####
-0      1
-0      1
-0      1
-0      11
-0      11
-0      11
 2      1
 2      11
-4      1
-4      11
-8      1
-8      11
 10     1
 10     11
-12     1
-12     1
-12     11
-12     11
-18     1
-18     1
-18     11
-18     11
+17     1
+17     11
+19     1
+19     11
 20     1
 20     11
-24     1
-24     1
-24     11
-24     11
-26     1
-26     1
+27     1
+27     11
+30     1
+30     11
+41     1
+41     11
+43     1
+43     11
+51     1
+51     1
+51     11
+51     11
+54     1
+54     11
+57     1
+57     11
+58     1
+58     1
+58     11
+58     11
 PREHOOK: query: drop table combine_3_srcpart_seq_rc_bucket
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@combine_3_srcpart_seq_rc_bucket

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/comments.q.out 
b/ql/src/test/results/clientpositive/comments.q.out
index 6f2fa28..898d61c 100644
--- a/ql/src/test/results/clientpositive/comments.q.out
+++ b/ql/src/test/results/clientpositive/comments.q.out
@@ -155,6 +155,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'
@@ -176,6 +177,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'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out 
b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
index 3cca8b8..5619f19 100644
--- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
+++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
@@ -58,6 +58,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'
@@ -79,6 +80,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'
@@ -104,6 +106,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'
@@ -125,6 +128,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'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out 
b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
index e74be62..593ae83 100644
--- 
a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
+++ 
b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out
@@ -27,6 +27,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -73,6 +74,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -119,6 +121,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -172,6 +175,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -218,6 +222,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -263,6 +268,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_like.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like.q.out 
b/ql/src/test/results/clientpositive/create_like.q.out
index 7c26a59..c672a98 100644
--- a/ql/src/test/results/clientpositive/create_like.q.out
+++ b/ql/src/test/results/clientpositive/create_like.q.out
@@ -24,6 +24,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -373,6 +374,7 @@ Table Parameters:
                                    }               
                                  ]                 
                                }                   
+       bucketing_version       2                   
        k1                      v1                  
        k2                      v2                  
 #### A masked pattern was here ####
@@ -534,6 +536,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out 
b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
index e324749..675f5c2 100644
--- a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
+++ b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out
@@ -210,6 +210,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
        key                     value               
        key1                    value1              
        numFiles                0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_like_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_like_view.q.out 
b/ql/src/test/results/clientpositive/create_like_view.q.out
index 25b927b..a955c3f 100644
--- a/ql/src/test/results/clientpositive/create_like_view.q.out
+++ b/ql/src/test/results/clientpositive/create_like_view.q.out
@@ -48,6 +48,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -110,6 +111,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -169,6 +171,7 @@ Table Type:                 EXTERNAL_TABLE
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -291,6 +294,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/create_or_replace_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out 
b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
index 8383951..5871434 100644
--- a/ql/src/test/results/clientpositive/create_or_replace_view.q.out
+++ b/ql/src/test/results/clientpositive/create_or_replace_view.q.out
@@ -36,6 +36,7 @@ Database:             vt
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -124,6 +125,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           2                   
        numRows                 0                   
@@ -220,6 +222,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -293,6 +296,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -389,6 +393,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 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/create_skewed_table1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_skewed_table1.q.out 
b/ql/src/test/results/clientpositive/create_skewed_table1.q.out
index cc647a3..eda8cbd 100644
--- a/ql/src/test/results/clientpositive/create_skewed_table1.q.out
+++ b/ql/src/test/results/clientpositive/create_skewed_table1.q.out
@@ -40,6 +40,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                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -76,6 +77,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                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -113,6 +115,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_table_like_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_table_like_stats.q.out 
b/ql/src/test/results/clientpositive/create_table_like_stats.q.out
index f88c50c..7740fd7 100644
--- a/ql/src/test/results/clientpositive/create_table_like_stats.q.out
+++ b/ql/src/test/results/clientpositive/create_table_like_stats.q.out
@@ -136,6 +136,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/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out 
b/ql/src/test/results/clientpositive/create_view.q.out
index 9be2f55..9016cb2 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -253,6 +253,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -302,6 +303,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -348,6 +350,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
        fear                    factor              
 #### A masked pattern was here ####
                 
@@ -397,6 +400,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        biggest                 loser               
+       bucketing_version       2                   
        fear                    factor              
 #### A masked pattern was here ####
                 
@@ -739,6 +743,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -814,6 +819,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -889,6 +895,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -957,6 +964,7 @@ Database:                   default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1030,6 +1038,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1103,6 +1112,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1183,6 +1193,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1212,18 +1223,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 POSTHOOK: Input: default@view13
 #### A masked pattern was here ####
-0
-0
-0
-0
-0
-5
-5
-5
-5
-10
-10
-15
+1
+8
+8
+16
+16
+18
+18
+21
+21
+21
+21
+24
 PREHOOK: query: CREATE VIEW view14 AS
 SELECT unionsrc1.key as k1, unionsrc1.value as v1,
        unionsrc2.key as k2, unionsrc2.value as v2
@@ -1288,6 +1299,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1400,6 +1412,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -1482,6 +1495,7 @@ Database:                 default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out 
b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
index 71df2b2..b408c6e 100644
--- a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
+++ b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out
@@ -46,6 +46,7 @@ Database:             default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -77,6 +78,7 @@ Database:             default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_view_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out 
b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
index 2cfb815..a337e86 100644
--- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
@@ -65,6 +65,7 @@ Retention:            0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -264,6 +265,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -379,6 +381,7 @@ Retention:                  0
 Table Type:            VIRTUAL_VIEW             
 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/create_view_translate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out 
b/ql/src/test/results/clientpositive/create_view_translate.q.out
index 2365a74..7c746ea 100644
--- a/ql/src/test/results/clientpositive/create_view_translate.q.out
+++ b/ql/src/test/results/clientpositive/create_view_translate.q.out
@@ -32,6 +32,7 @@ Database:             default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -79,6 +80,7 @@ Database:             default
 Retention:             0                        
 Table Type:            VIRTUAL_VIEW             
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_with_constraints.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_with_constraints.q.out 
b/ql/src/test/results/clientpositive/create_with_constraints.q.out
index 07435ca..8897663 100644
--- a/ql/src/test/results/clientpositive/create_with_constraints.q.out
+++ b/ql/src/test/results/clientpositive/create_with_constraints.q.out
@@ -457,6 +457,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -498,6 +499,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -538,6 +540,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -591,6 +594,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -650,6 +654,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -697,6 +702,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -747,6 +753,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -788,6 +795,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -829,6 +837,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -870,6 +879,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -919,6 +929,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -967,6 +978,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1012,6 +1024,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -1055,6 +1068,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1097,6 +1111,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1131,6 +1146,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1165,6 +1181,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1210,6 +1227,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -1253,6 +1271,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1300,6 +1319,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1345,6 +1365,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -1389,6 +1410,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1529,6 +1551,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1562,6 +1585,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1609,6 +1633,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1657,6 +1682,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1698,6 +1724,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1732,6 +1759,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1769,6 +1797,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -1832,6 +1861,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1872,6 +1902,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1925,6 +1956,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -1975,6 +2007,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -2016,6 +2049,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -2054,6 +2088,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -2114,6 +2149,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -2163,6 +2199,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numPartitions           0                   
@@ -2214,6 +2251,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   
@@ -2295,6 +2333,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -2357,6 +2396,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -2403,6 +2443,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -2454,6 +2495,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -2526,6 +2568,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           0                   
        numRows                 0                   
@@ -2600,6 +2643,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\",\"f\":\"true\"}}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 1                   
        rawDataSize             26                  

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/create_with_constraints2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_with_constraints2.q.out 
b/ql/src/test/results/clientpositive/create_with_constraints2.q.out
index eea74d9..9f600b2 100644
--- a/ql/src/test/results/clientpositive/create_with_constraints2.q.out
+++ b/ql/src/test/results/clientpositive/create_with_constraints2.q.out
@@ -54,6 +54,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -95,6 +96,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas.q.out 
b/ql/src/test/results/clientpositive/ctas.q.out
index e659650..891ca8d 100644
--- a/ql/src/test/results/clientpositive/ctas.q.out
+++ b/ql/src/test/results/clientpositive/ctas.q.out
@@ -149,6 +149,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 10                  
        rawDataSize             96                  
@@ -300,6 +301,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 10                  
        rawDataSize             96                  
@@ -451,6 +453,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 10                  
        rawDataSize             120                 
@@ -514,6 +517,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 10                  
        rawDataSize             120                 
@@ -666,6 +670,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 10                  
        rawDataSize             96                  

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/ctas_colname.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out 
b/ql/src/test/results/clientpositive/ctas_colname.q.out
index d2565fc..9f0cf51 100644
--- a/ql/src/test/results/clientpositive/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/ctas_colname.q.out
@@ -99,6 +99,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 20                  
        rawDataSize             620                 
@@ -257,6 +258,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 25                  
        rawDataSize             242                 
@@ -448,6 +450,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 20                  
        rawDataSize             268                 
@@ -619,6 +622,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 25                  
        rawDataSize             309                 
@@ -770,6 +774,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 309                 
        rawDataSize             3891                
@@ -1204,6 +1209,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 5                   
        rawDataSize             45                  
@@ -1339,6 +1345,7 @@ Retention:                0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 5                   
        rawDataSize             35                  

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out 
b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
index ad4402a..16194e4 100644
--- a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
+++ b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
@@ -137,6 +137,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/091fd962/ql/src/test/results/clientpositive/database_location.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/database_location.q.out 
b/ql/src/test/results/clientpositive/database_location.q.out
index a62ba2e..13fd01e 100644
--- a/ql/src/test/results/clientpositive/database_location.q.out
+++ b/ql/src/test/results/clientpositive/database_location.q.out
@@ -43,6 +43,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"name\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -117,6 +118,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"name\":\"true\",\"value\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/decimal_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/decimal_serde.q.out 
b/ql/src/test/results/clientpositive/decimal_serde.q.out
index 43f7ab8..fb74324 100644
--- a/ql/src/test/results/clientpositive/decimal_serde.q.out
+++ b/ql/src/test/results/clientpositive/decimal_serde.q.out
@@ -116,6 +116,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 38                  
        rawDataSize             157                 
@@ -168,6 +169,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 38                  
        rawDataSize             157                 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/default_file_format.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/default_file_format.q.out 
b/ql/src/test/results/clientpositive/default_file_format.q.out
index 9eb7d2d..11909e1 100644
--- a/ql/src/test/results/clientpositive/default_file_format.q.out
+++ b/ql/src/test/results/clientpositive/default_file_format.q.out
@@ -69,6 +69,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -102,6 +103,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -135,6 +137,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -168,6 +171,7 @@ Retention:                  0
 Table Type:            EXTERNAL_TABLE           
 Table Parameters:               
        EXTERNAL                TRUE                
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -197,6 +201,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -230,6 +235,7 @@ Retention:                  0
 Table Type:            EXTERNAL_TABLE           
 Table Parameters:               
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                0                   
        totalSize               0                   
 #### A masked pattern was here ####
@@ -363,6 +369,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -396,6 +403,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -429,6 +437,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -462,6 +471,7 @@ Retention:                  0
 Table Type:            EXTERNAL_TABLE           
 Table Parameters:               
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                0                   
        totalSize               0                   
 #### A masked pattern was here ####
@@ -493,6 +503,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   
@@ -526,6 +537,7 @@ Retention:                  0
 Table Type:            EXTERNAL_TABLE           
 Table Parameters:               
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                0                   
        totalSize               0                   
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/deleteAnalyze.q.out 
b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
index b3ce8bc..be45b75 100644
--- a/ql/src/test/results/clientpositive/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/deleteAnalyze.q.out
@@ -50,6 +50,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 2                   
        rawDataSize             634                 
@@ -116,6 +117,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}}
+       bucketing_version       2                   
        numFiles                0                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/describe_comment_indent.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_comment_indent.q.out 
b/ql/src/test/results/clientpositive/describe_comment_indent.q.out
index 8da5949..d88ed12 100644
--- a/ql/src/test/results/clientpositive/describe_comment_indent.q.out
+++ b/ql/src/test/results/clientpositive/describe_comment_indent.q.out
@@ -56,6 +56,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
        comment                 table comment       
                                two lines           
        numFiles                0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out 
b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
index a4d5127..8bf2019 100644
--- a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
+++ b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out
@@ -49,6 +49,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   
{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}}
+       bucketing_version       2                   
 #### A masked pattern was here ####
        numFiles                0                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/describe_syntax.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_syntax.q.out 
b/ql/src/test/results/clientpositive/describe_syntax.q.out
index a0c6182..79c44de 100644
--- a/ql/src/test/results/clientpositive/describe_syntax.q.out
+++ b/ql/src/test/results/clientpositive/describe_syntax.q.out
@@ -94,6 +94,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           3                   
        numRows                 0                   
@@ -166,6 +167,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                0                   
        numPartitions           3                   
        numRows                 0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/describe_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/describe_table.q.out 
b/ql/src/test/results/clientpositive/describe_table.q.out
index 8f7d0f6..2323685 100644
--- a/ql/src/test/results/clientpositive/describe_table.q.out
+++ b/ql/src/test/results/clientpositive/describe_table.q.out
@@ -177,6 +177,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                4                   
        numPartitions           4                   
        numRows                 2000                
@@ -274,6 +275,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                4                   
        numPartitions           4                   
        numRows                 2000                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out 
b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
index c2226f6..927c27e 100644
--- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
+++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
@@ -160,6 +160,7 @@ STAGE PLANS:
             output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
             properties:
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
               columns.comments 
@@ -181,6 +182,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns 
sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out 
b/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
index 73eab7b..6f553fa 100644
--- a/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidkafkamini_basic.q.out
@@ -245,6 +245,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"fullname":"true","shortname":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns shortname,fullname
                     columns.comments 
@@ -267,6 +268,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"fullname":"true","shortname":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns shortname,fullname
                       columns.comments 
@@ -318,6 +320,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","deleted":"true","language":"true","page":"true","user":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns __time,page,user,language,added,deleted
                     columns.comments 
@@ -356,6 +359,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","deleted":"true","language":"true","page":"true","user":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns __time,page,user,language,added,deleted
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out 
b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
index a87040a..c29f547 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
@@ -85,6 +85,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES cmv_mat_view
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE  {"BASIC_STATS":"true"}
+bucketing_version      2
 druid.datasource       default.cmv_mat_view
 druid.segment.granularity      HOUR
 numFiles       0
@@ -131,6 +132,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES cmv_mat_view2
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE  {"BASIC_STATS":"true"}
+bucketing_version      2
 druid.datasource       default.cmv_mat_view2
 druid.segment.granularity      HOUR
 numFiles       0
@@ -502,6 +504,7 @@ PREHOOK: query: SHOW TBLPROPERTIES cmv_mat_view2
 PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: SHOW TBLPROPERTIES cmv_mat_view2
 POSTHOOK: type: SHOW_TBLPROPERTIES
+bucketing_version      2
 druid.datasource       default.cmv_mat_view2
 druid.segment.granularity      HOUR
 #### A masked pattern was here ####

Reply via email to