http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/row__id.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/row__id.q.out 
b/ql/src/test/results/clientpositive/row__id.q.out
deleted file mode 100644
index afc94dc..0000000
--- a/ql/src/test/results/clientpositive/row__id.q.out
+++ /dev/null
@@ -1,162 +0,0 @@
-PREHOOK: query: drop table if exists hello_acid
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table if exists hello_acid
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table hello_acid (key int, value int)
-partitioned by (load_date date)
-clustered by(key) into 3 buckets
-stored as orc tblproperties ('transactional'='true')
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@hello_acid
-POSTHOOK: query: create table hello_acid (key int, value int)
-partitioned by (load_date date)
-clustered by(key) into 3 buckets
-stored as orc tblproperties ('transactional'='true')
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@hello_acid
-PREHOOK: query: insert into hello_acid partition (load_date='2016-03-01') 
values (1, 1)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@hello_acid@load_date=2016-03-01
-POSTHOOK: query: insert into hello_acid partition (load_date='2016-03-01') 
values (1, 1)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: _dummy_database@_dummy_table
-POSTHOOK: Output: default@hello_acid@load_date=2016-03-01
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-01).key SCRIPT []
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-01).value SCRIPT []
-PREHOOK: query: insert into hello_acid partition (load_date='2016-03-02') 
values (2, 2)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@hello_acid@load_date=2016-03-02
-POSTHOOK: query: insert into hello_acid partition (load_date='2016-03-02') 
values (2, 2)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: _dummy_database@_dummy_table
-POSTHOOK: Output: default@hello_acid@load_date=2016-03-02
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-02).key SCRIPT []
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-02).value SCRIPT []
-PREHOOK: query: insert into hello_acid partition (load_date='2016-03-03') 
values (3, 3)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@hello_acid@load_date=2016-03-03
-POSTHOOK: query: insert into hello_acid partition (load_date='2016-03-03') 
values (3, 3)
-POSTHOOK: type: QUERY
-POSTHOOK: Input: _dummy_database@_dummy_table
-POSTHOOK: Output: default@hello_acid@load_date=2016-03-03
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-03).key SCRIPT []
-POSTHOOK: Lineage: hello_acid PARTITION(load_date=2016-03-03).value SCRIPT []
-PREHOOK: query: explain
-select tid from (select row__id.writeid as tid from hello_acid) sub order by 
tid
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select tid from (select row__id.writeid as tid from hello_acid) sub order by 
tid
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: hello_acid
-            Statistics: Num rows: 77 Data size: 19370 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: ROW__ID.writeid (type: bigint)
-              outputColumnNames: _col0
-              Statistics: Num rows: 77 Data size: 19370 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: _col0 (type: bigint)
-                sort order: +
-                Statistics: Num rows: 77 Data size: 19370 Basic stats: 
COMPLETE Column stats: NONE
-      Reduce Operator Tree:
-        Select Operator
-          expressions: KEY.reducesinkkey0 (type: bigint)
-          outputColumnNames: _col0
-          Statistics: Num rows: 77 Data size: 19370 Basic stats: COMPLETE 
Column stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 77 Data size: 19370 Basic stats: COMPLETE 
Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: select tid from (select row__id.writeid as tid from 
hello_acid) sub order by tid
-PREHOOK: type: QUERY
-PREHOOK: Input: default@hello_acid
-PREHOOK: Input: default@hello_acid@load_date=2016-03-01
-PREHOOK: Input: default@hello_acid@load_date=2016-03-02
-PREHOOK: Input: default@hello_acid@load_date=2016-03-03
-#### A masked pattern was here ####
-POSTHOOK: query: select tid from (select row__id.writeid as tid from 
hello_acid) sub order by tid
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@hello_acid
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-01
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-02
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-03
-#### A masked pattern was here ####
-1
-2
-3
-PREHOOK: query: explain
-select tid from (select row__id.writeid as tid from hello_acid) sub where tid 
= 3
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select tid from (select row__id.writeid as tid from hello_acid) sub where tid 
= 3
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: hello_acid
-            Statistics: Num rows: 77 Data size: 19370 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: (ROW__ID.writeid = 3) (type: boolean)
-              Statistics: Num rows: 38 Data size: 9559 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: ROW__ID.writeid (type: bigint)
-                outputColumnNames: _col0
-                Statistics: Num rows: 38 Data size: 9559 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 38 Data size: 9559 Basic stats: 
COMPLETE Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: select tid from (select row__id.writeid as tid from 
hello_acid) sub where tid = 3
-PREHOOK: type: QUERY
-PREHOOK: Input: default@hello_acid
-PREHOOK: Input: default@hello_acid@load_date=2016-03-01
-PREHOOK: Input: default@hello_acid@load_date=2016-03-02
-PREHOOK: Input: default@hello_acid@load_date=2016-03-03
-#### A masked pattern was here ####
-POSTHOOK: query: select tid from (select row__id.writeid as tid from 
hello_acid) sub where tid = 3
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@hello_acid
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-01
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-02
-POSTHOOK: Input: default@hello_acid@load_date=2016-03-03
-#### A masked pattern was here ####
-3

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample1.q.out 
b/ql/src/test/results/clientpositive/sample1.q.out
index 6d58658..09b9ac7 100644
--- a/ql/src/test/results/clientpositive/sample1.q.out
+++ b/ql/src/test/results/clientpositive/sample1.q.out
@@ -55,6 +55,7 @@ STAGE PLANS:
                       properties:
                         COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                         bucket_count -1
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value,dt,hr
                         columns.comments 
@@ -126,6 +127,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'
@@ -193,6 +195,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,dt,hr
                 columns.comments 
@@ -236,6 +239,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value,dt,hr
                     columns.comments 
@@ -266,6 +270,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value,dt,hr
               columns.comments 
@@ -287,6 +292,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,dt,hr
                 columns.comments 
@@ -323,6 +329,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value,dt,hr
                     columns.comments 
@@ -353,6 +360,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value,dt,hr
               columns.comments 
@@ -374,6 +382,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,dt,hr
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample2.q.out 
b/ql/src/test/results/clientpositive/sample2.q.out
index 164ce43..17e5491 100644
--- a/ql/src/test/results/clientpositive/sample2.q.out
+++ b/ql/src/test/results/clientpositive/sample2.q.out
@@ -54,6 +54,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 
@@ -101,6 +102,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -123,6 +125,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -192,6 +195,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 
@@ -235,6 +239,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 
@@ -265,6 +270,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 
@@ -286,6 +292,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 
@@ -322,6 +329,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 
@@ -352,6 +360,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 
@@ -373,6 +382,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 
@@ -421,88 +431,36 @@ order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
 2      val_2
 2      val_3
-4      val_4
-4      val_5
 6      val_7
 6      val_7
-8      val_8
-8      val_9
 10     val_10
 10     val_11
-12     val_12
-12     val_12
-12     val_13
-16     val_17
-16     val_17
-18     val_18
-18     val_18
 20     val_20
 20     val_21
 20     val_21
-22     val_23
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
 30     val_30
 30     val_31
-32     val_33
-34     val_34
 40     val_41
 40     val_41
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-44     val_44
 46     val_47
 48     val_49
 48     val_49
-50     val_51
-52     val_53
-52     val_53
-52     val_53
-52     val_53
 54     val_54
-56     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
 60     val_61
-62     val_63
-62     val_63
 64     val_64
-66     val_66
 68     val_69
 70     val_70
 70     val_70
 70     val_70
 70     val_71
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-76     val_77
-76     val_77
-76     val_77
-78     val_78
-78     val_79
 80     val_80
 80     val_81
-82     val_82
-82     val_83
-82     val_83
 84     val_84
 84     val_84
 86     val_86
@@ -510,116 +468,41 @@ POSTHOOK: Input: default@dest1
 90     val_90
 90     val_90
 90     val_90
-92     val_92
-94     val_95
 96     val_96
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-102    val_103
-104    val_104
-104    val_104
-104    val_105
-104    val_105
-104    val_105
 106    val_107
 110    val_111
-114    val_114
-114    val_115
-114    val_115
-114    val_115
 116    val_116
 116    val_117
-118    val_118
-118    val_118
-118    val_119
-118    val_119
-118    val_119
-120    val_120
-120    val_120
-120    val_121
-122    val_123
-122    val_123
-122    val_123
 126    val_126
 126    val_127
 126    val_127
-128    val_128
-128    val_128
-128    val_128
-128    val_129
-128    val_129
 132    val_133
 132    val_133
 134    val_134
 134    val_134
 134    val_135
-136    val_136
-136    val_137
-138    val_138
-138    val_138
-138    val_138
-138    val_138
-138    val_139
-138    val_139
 140    val_141
-144    val_145
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
-152    val_153
-152    val_153
-152    val_153
 156    val_156
 156    val_157
 156    val_157
 158    val_158
-160    val_160
-160    val_161
 162    val_162
 162    val_163
 164    val_164
 164    val_164
 164    val_165
 164    val_165
-166    val_166
-168    val_168
-168    val_169
-170    val_170
-170    val_171
-172    val_172
-172    val_172
-172    val_173
-174    val_174
-174    val_174
-174    val_175
-174    val_175
-176    val_176
-176    val_176
 178    val_178
 178    val_179
 178    val_179
-180    val_180
 182    val_183
 184    val_185
-186    val_186
 190    val_190
-192    val_192
-192    val_193
-194    val_194
-196    val_196
-196    val_197
-196    val_197
-196    val_197
-200    val_200
-200    val_200
 202    val_202
-204    val_205
 206    val_207
 206    val_207
 206    val_207
@@ -631,37 +514,19 @@ POSTHOOK: Input: default@dest1
 216    val_216
 216    val_216
 216    val_217
-218    val_218
-222    val_222
-222    val_223
-224    val_224
-224    val_224
-224    val_225
 226    val_226
 226    val_227
 226    val_227
 226    val_227
 226    val_227
-228    val_228
-228    val_229
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
 238    val_238
 238    val_238
 238    val_239
 240    val_241
-242    val_242
-242    val_242
-242    val_243
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-246    val_247
-246    val_247
 248    val_248
 248    val_249
 252    val_252
@@ -670,53 +535,23 @@ POSTHOOK: Input: default@dest1
 256    val_256
 256    val_256
 256    val_257
-258    val_258
-258    val_259
 260    val_260
 260    val_261
 260    val_261
-262    val_262
-262    val_263
-262    val_263
-264    val_265
-264    val_265
 266    val_266
-268    val_269
 272    val_272
 272    val_272
 272    val_273
-274    val_274
-274    val_275
 276    val_277
-278    val_278
-278    val_278
-278    val_279
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 284    val_285
 284    val_285
 286    val_286
 286    val_287
-288    val_288
-288    val_288
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-298    val_298
-298    val_298
-298    val_298
-300    val_301
-300    val_301
-302    val_302
-302    val_303
 304    val_305
-306    val_306
-306    val_307
 308    val_308
 308    val_309
 308    val_309
@@ -724,29 +559,17 @@ POSTHOOK: Input: default@dest1
 310    val_311
 310    val_311
 310    val_311
-314    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-318    val_319
-322    val_322
-322    val_322
-322    val_323
 324    val_325
 326    val_327
-328    val_329
-328    val_329
-330    val_331
 332    val_332
 334    val_335
 336    val_336
 336    val_337
 338    val_338
 338    val_339
-340    val_341
 342    val_342
 342    val_342
 342    val_343
@@ -761,26 +584,14 @@ POSTHOOK: Input: default@dest1
 348    val_349
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
-358    val_359
 360    val_360
 360    val_361
 362    val_362
 364    val_364
 364    val_365
-366    val_366
 368    val_368
-374    val_374
-374    val_375
-376    val_377
 378    val_378
 378    val_379
-382    val_382
-382    val_382
-382    val_383
-382    val_383
 384    val_384
 384    val_384
 384    val_384
@@ -791,9 +602,6 @@ POSTHOOK: Input: default@dest1
 386    val_387
 386    val_387
 388    val_389
-390    val_391
-390    val_391
-390    val_391
 392    val_392
 392    val_393
 392    val_393
@@ -801,8 +609,6 @@ POSTHOOK: Input: default@dest1
 396    val_396
 396    val_396
 396    val_396
-398    val_399
-400    val_400
 402    val_402
 402    val_403
 402    val_403
@@ -812,24 +618,12 @@ POSTHOOK: Input: default@dest1
 404    val_405
 404    val_405
 404    val_405
-406    val_406
-406    val_406
-406    val_406
-406    val_406
-406    val_407
 408    val_409
 408    val_409
 410    val_411
-412    val_413
-412    val_413
 414    val_414
 414    val_414
 414    val_415
-416    val_417
-418    val_418
-424    val_424
-424    val_424
-424    val_425
 426    val_427
 428    val_429
 430    val_430
@@ -838,24 +632,12 @@ POSTHOOK: Input: default@dest1
 430    val_431
 432    val_432
 432    val_433
-436    val_436
-436    val_437
-438    val_438
-438    val_438
-438    val_438
-438    val_439
-438    val_439
 440    val_441
 440    val_441
-442    val_443
 444    val_444
 446    val_446
 446    val_447
 446    val_447
-448    val_448
-448    val_449
-450    val_451
-450    val_451
 452    val_452
 454    val_454
 454    val_454
@@ -864,22 +646,9 @@ POSTHOOK: Input: default@dest1
 454    val_455
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
-462    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-468    val_469
-468    val_469
-468    val_469
-470    val_470
-470    val_471
 472    val_472
 474    val_475
 474    val_475
@@ -898,19 +667,9 @@ POSTHOOK: Input: default@dest1
 482    val_483
 484    val_484
 484    val_485
-486    val_487
 488    val_489
 490    val_490
 490    val_491
-492    val_492
-492    val_492
-492    val_493
-492    val_493
-494    val_494
-494    val_495
-494    val_495
-496    val_496
-496    val_497
 498    val_498
 498    val_498
 498    val_498

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample3.q.out 
b/ql/src/test/results/clientpositive/sample3.q.out
index bfa2c74..3bbb729 100644
--- a/ql/src/test/results/clientpositive/sample3.q.out
+++ b/ql/src/test/results/clientpositive/sample3.q.out
@@ -48,192 +48,221 @@ FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s 
SORT BY key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 #### A masked pattern was here ####
-0
-0
-0
-0
-0
-10
-10
-100
-100
-100
-100
-105
-105
-105
-110
-120
-120
-120
+1
+103
+103
+122
+122
+122
 125
 125
 125
-135
-135
-135
-140
-145
-15
-15
-15
-15
-150
+133
+133
+147
+147
 155
-160
-160
+16
+16
+161
+161
+161
+161
+162
+162
+163
 165
 165
 165
-170
-170
-175
-175
-175
-175
-180
-185
-190
-195
-195
-20
-20
-20
-200
-200
-205
-205
-205
-215
+18
+18
+194
+196
+196
+196
+196
+21
+21
+21
+21
+222
+222
 230
 230
 230
 230
 230
-235
-235
+237
+237
+238
+238
+238
+24
+24
 240
-245
-245
-255
-255
+246
+246
+256
+256
+256
 260
 260
 260
-265
-265
-265
+264
+264
+273
+273
+273
+273
 275
 275
 275
-280
-280
-285
-285
-295
-295
-30
-30
-300
-300
+276
+278
+278
+278
+288
+288
+289
+289
+296
+296
+302
+302
 305
 305
-310
-310
-310
-310
-315
-325
-325
-330
+311
+311
+311
+32
+323
+323
+33
+33
+332
 335
 335
 335
-340
-345
+344
+344
+344
 35
 35
 35
 35
 35
 35
+352
+352
 355
 355
-360
-360
-365
-375
-375
-375
-375
-375
-375
-385
-385
-390
-390
-390
-395
-395
-395
-395
-40
-40
-400
+362
+366
+369
+369
+369
+369
+37
+37
+373
+373
+379
+379
+391
+391
+393
+393
+393
+397
+397
 405
+407
+407
+407
+407
+41
 410
-415
+411
+411
+416
 425
-430
-430
-430
-430
+43
+432
+432
 435
 435
-440
-440
+436
+436
+439
+439
+439
+439
+441
 450
 450
+453
+453
+454
+454
+454
+454
+454
 455
 455
 455
 460
+466
+466
+466
+469
+469
+469
+469
+469
+469
 470
 470
-475
-475
-480
-480
-480
-480
-480
-485
-485
-485
-490
-490
-495
-495
-5
-5
-5
-5
-50
-60
-65
-65
-65
-70
-70
-70
-70
-75
-80
-80
-85
-85
-90
-90
-90
-95
-95
+481
+481
+484
+484
+492
+492
+492
+492
+493
+494
+494
+494
+498
+498
+498
+51
+51
+51
+52
+52
+52
+52
+53
+53
+54
+61
+68
+69
+69
+72
+72
+8
+8
+87
+87
+87
+89
+89
+89
+91
+93
+93
+93
+96

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample4.q.out 
b/ql/src/test/results/clientpositive/sample4.q.out
index ff97dd0..6c993c8 100644
--- a/ql/src/test/results/clientpositive/sample4.q.out
+++ b/ql/src/test/results/clientpositive/sample4.q.out
@@ -54,6 +54,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 
@@ -101,6 +102,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -123,6 +125,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -192,6 +195,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 
@@ -235,6 +239,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 
@@ -265,6 +270,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 
@@ -286,6 +292,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 
@@ -322,6 +329,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 
@@ -352,6 +360,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 
@@ -373,6 +382,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 
@@ -421,88 +431,36 @@ order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
 2      val_2
 2      val_3
-4      val_4
-4      val_5
 6      val_7
 6      val_7
-8      val_8
-8      val_9
 10     val_10
 10     val_11
-12     val_12
-12     val_12
-12     val_13
-16     val_17
-16     val_17
-18     val_18
-18     val_18
 20     val_20
 20     val_21
 20     val_21
-22     val_23
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
 30     val_30
 30     val_31
-32     val_33
-34     val_34
 40     val_41
 40     val_41
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-44     val_44
 46     val_47
 48     val_49
 48     val_49
-50     val_51
-52     val_53
-52     val_53
-52     val_53
-52     val_53
 54     val_54
-56     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
 60     val_61
-62     val_63
-62     val_63
 64     val_64
-66     val_66
 68     val_69
 70     val_70
 70     val_70
 70     val_70
 70     val_71
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-76     val_77
-76     val_77
-76     val_77
-78     val_78
-78     val_79
 80     val_80
 80     val_81
-82     val_82
-82     val_83
-82     val_83
 84     val_84
 84     val_84
 86     val_86
@@ -510,116 +468,41 @@ POSTHOOK: Input: default@dest1
 90     val_90
 90     val_90
 90     val_90
-92     val_92
-94     val_95
 96     val_96
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-102    val_103
-104    val_104
-104    val_104
-104    val_105
-104    val_105
-104    val_105
 106    val_107
 110    val_111
-114    val_114
-114    val_115
-114    val_115
-114    val_115
 116    val_116
 116    val_117
-118    val_118
-118    val_118
-118    val_119
-118    val_119
-118    val_119
-120    val_120
-120    val_120
-120    val_121
-122    val_123
-122    val_123
-122    val_123
 126    val_126
 126    val_127
 126    val_127
-128    val_128
-128    val_128
-128    val_128
-128    val_129
-128    val_129
 132    val_133
 132    val_133
 134    val_134
 134    val_134
 134    val_135
-136    val_136
-136    val_137
-138    val_138
-138    val_138
-138    val_138
-138    val_138
-138    val_139
-138    val_139
 140    val_141
-144    val_145
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
-152    val_153
-152    val_153
-152    val_153
 156    val_156
 156    val_157
 156    val_157
 158    val_158
-160    val_160
-160    val_161
 162    val_162
 162    val_163
 164    val_164
 164    val_164
 164    val_165
 164    val_165
-166    val_166
-168    val_168
-168    val_169
-170    val_170
-170    val_171
-172    val_172
-172    val_172
-172    val_173
-174    val_174
-174    val_174
-174    val_175
-174    val_175
-176    val_176
-176    val_176
 178    val_178
 178    val_179
 178    val_179
-180    val_180
 182    val_183
 184    val_185
-186    val_186
 190    val_190
-192    val_192
-192    val_193
-194    val_194
-196    val_196
-196    val_197
-196    val_197
-196    val_197
-200    val_200
-200    val_200
 202    val_202
-204    val_205
 206    val_207
 206    val_207
 206    val_207
@@ -631,37 +514,19 @@ POSTHOOK: Input: default@dest1
 216    val_216
 216    val_216
 216    val_217
-218    val_218
-222    val_222
-222    val_223
-224    val_224
-224    val_224
-224    val_225
 226    val_226
 226    val_227
 226    val_227
 226    val_227
 226    val_227
-228    val_228
-228    val_229
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
 238    val_238
 238    val_238
 238    val_239
 240    val_241
-242    val_242
-242    val_242
-242    val_243
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-246    val_247
-246    val_247
 248    val_248
 248    val_249
 252    val_252
@@ -670,53 +535,23 @@ POSTHOOK: Input: default@dest1
 256    val_256
 256    val_256
 256    val_257
-258    val_258
-258    val_259
 260    val_260
 260    val_261
 260    val_261
-262    val_262
-262    val_263
-262    val_263
-264    val_265
-264    val_265
 266    val_266
-268    val_269
 272    val_272
 272    val_272
 272    val_273
-274    val_274
-274    val_275
 276    val_277
-278    val_278
-278    val_278
-278    val_279
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 284    val_285
 284    val_285
 286    val_286
 286    val_287
-288    val_288
-288    val_288
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-298    val_298
-298    val_298
-298    val_298
-300    val_301
-300    val_301
-302    val_302
-302    val_303
 304    val_305
-306    val_306
-306    val_307
 308    val_308
 308    val_309
 308    val_309
@@ -724,29 +559,17 @@ POSTHOOK: Input: default@dest1
 310    val_311
 310    val_311
 310    val_311
-314    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-318    val_319
-322    val_322
-322    val_322
-322    val_323
 324    val_325
 326    val_327
-328    val_329
-328    val_329
-330    val_331
 332    val_332
 334    val_335
 336    val_336
 336    val_337
 338    val_338
 338    val_339
-340    val_341
 342    val_342
 342    val_342
 342    val_343
@@ -761,26 +584,14 @@ POSTHOOK: Input: default@dest1
 348    val_349
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
-358    val_359
 360    val_360
 360    val_361
 362    val_362
 364    val_364
 364    val_365
-366    val_366
 368    val_368
-374    val_374
-374    val_375
-376    val_377
 378    val_378
 378    val_379
-382    val_382
-382    val_382
-382    val_383
-382    val_383
 384    val_384
 384    val_384
 384    val_384
@@ -791,9 +602,6 @@ POSTHOOK: Input: default@dest1
 386    val_387
 386    val_387
 388    val_389
-390    val_391
-390    val_391
-390    val_391
 392    val_392
 392    val_393
 392    val_393
@@ -801,8 +609,6 @@ POSTHOOK: Input: default@dest1
 396    val_396
 396    val_396
 396    val_396
-398    val_399
-400    val_400
 402    val_402
 402    val_403
 402    val_403
@@ -812,24 +618,12 @@ POSTHOOK: Input: default@dest1
 404    val_405
 404    val_405
 404    val_405
-406    val_406
-406    val_406
-406    val_406
-406    val_406
-406    val_407
 408    val_409
 408    val_409
 410    val_411
-412    val_413
-412    val_413
 414    val_414
 414    val_414
 414    val_415
-416    val_417
-418    val_418
-424    val_424
-424    val_424
-424    val_425
 426    val_427
 428    val_429
 430    val_430
@@ -838,24 +632,12 @@ POSTHOOK: Input: default@dest1
 430    val_431
 432    val_432
 432    val_433
-436    val_436
-436    val_437
-438    val_438
-438    val_438
-438    val_438
-438    val_439
-438    val_439
 440    val_441
 440    val_441
-442    val_443
 444    val_444
 446    val_446
 446    val_447
 446    val_447
-448    val_448
-448    val_449
-450    val_451
-450    val_451
 452    val_452
 454    val_454
 454    val_454
@@ -864,22 +646,9 @@ POSTHOOK: Input: default@dest1
 454    val_455
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
-462    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-468    val_469
-468    val_469
-468    val_469
-470    val_470
-470    val_471
 472    val_472
 474    val_475
 474    val_475
@@ -898,19 +667,9 @@ POSTHOOK: Input: default@dest1
 482    val_483
 484    val_484
 484    val_485
-486    val_487
 488    val_489
 490    val_490
 490    val_491
-492    val_492
-492    val_492
-492    val_493
-492    val_493
-494    val_494
-494    val_495
-494    val_495
-496    val_496
-496    val_497
 498    val_498
 498    val_498
 498    val_498

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample5.q.out 
b/ql/src/test/results/clientpositive/sample5.q.out
index 6d50ff5..6bfb366 100644
--- a/ql/src/test/results/clientpositive/sample5.q.out
+++ b/ql/src/test/results/clientpositive/sample5.q.out
@@ -55,6 +55,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 
@@ -102,6 +103,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -124,6 +126,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -193,6 +196,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 
@@ -236,6 +240,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 
@@ -266,6 +271,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 
@@ -287,6 +293,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 
@@ -323,6 +330,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 
@@ -353,6 +361,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 
@@ -374,6 +383,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 
@@ -422,192 +432,221 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 SORT BY key, 
value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
-10     val_10
-10     val_11
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-105    val_105
-105    val_106
-105    val_106
-110    val_111
-120    val_120
-120    val_120
-120    val_121
+1      val_2
+103    val_103
+103    val_103
+122    val_123
+122    val_123
+122    val_123
 125    val_125
 125    val_125
 125    val_126
-135    val_136
-135    val_136
-135    val_136
-140    val_141
-145    val_145
-15     val_15
-15     val_15
-15     val_16
-15     val_16
-150    val_150
+133    val_133
+133    val_134
+147    val_148
+147    val_148
 155    val_155
-160    val_160
-160    val_161
+16     val_17
+16     val_17
+161    val_162
+161    val_162
+161    val_162
+161    val_162
+162    val_162
+162    val_163
+163    val_163
 165    val_165
 165    val_165
 165    val_166
-170    val_170
-170    val_171
-175    val_175
-175    val_175
-175    val_176
-175    val_176
-180    val_180
-185    val_186
-190    val_190
-195    val_195
-195    val_195
-20     val_20
-20     val_21
-20     val_21
-200    val_200
-200    val_200
-205    val_205
-205    val_205
-205    val_206
-215    val_216
+18     val_18
+18     val_18
+194    val_194
+196    val_196
+196    val_197
+196    val_197
+196    val_197
+21     val_22
+21     val_22
+21     val_22
+21     val_22
+222    val_222
+222    val_223
 230    val_230
 230    val_230
 230    val_230
 230    val_230
 230    val_230
-235    val_235
-235    val_236
+237    val_237
+237    val_237
+238    val_238
+238    val_238
+238    val_239
+24     val_24
+24     val_24
 240    val_241
-245    val_246
-245    val_246
-255    val_255
-255    val_255
+246    val_247
+246    val_247
+256    val_256
+256    val_256
+256    val_257
 260    val_260
 260    val_261
 260    val_261
-265    val_265
-265    val_265
-265    val_266
+264    val_265
+264    val_265
+273    val_273
+273    val_273
+273    val_273
+273    val_274
 275    val_275
 275    val_276
 275    val_276
-280    val_280
-280    val_280
-285    val_285
-285    val_286
-295    val_296
-295    val_296
-30     val_30
-30     val_31
-300    val_301
-300    val_301
+276    val_277
+278    val_278
+278    val_278
+278    val_279
+288    val_288
+288    val_288
+289    val_289
+289    val_290
+296    val_296
+296    val_297
+302    val_302
+302    val_303
 305    val_305
 305    val_306
-310    val_310
-310    val_311
-310    val_311
-310    val_311
-315    val_315
-325    val_325
-325    val_325
-330    val_331
+311    val_311
+311    val_311
+311    val_311
+32     val_33
+323    val_323
+323    val_324
+33     val_33
+33     val_34
+332    val_332
 335    val_335
 335    val_336
 335    val_336
-340    val_341
-345    val_345
+344    val_344
+344    val_344
+344    val_345
 35     val_35
 35     val_35
 35     val_35
 35     val_36
 35     val_36
 35     val_36
+352    val_353
+352    val_353
 355    val_356
 355    val_356
-360    val_360
-360    val_361
-365    val_365
-375    val_375
-375    val_376
-375    val_376
-375    val_376
-375    val_376
-375    val_376
-385    val_386
-385    val_386
-390    val_391
-390    val_391
-390    val_391
-395    val_395
-395    val_395
-395    val_396
-395    val_396
-40     val_41
-40     val_41
-400    val_400
+362    val_362
+366    val_366
+369    val_369
+369    val_369
+369    val_369
+369    val_370
+37     val_37
+37     val_37
+373    val_373
+373    val_374
+379    val_379
+379    val_380
+391    val_392
+391    val_392
+393    val_393
+393    val_394
+393    val_394
+397    val_397
+397    val_397
 405    val_406
+407    val_407
+407    val_408
+407    val_408
+407    val_408
+41     val_41
 410    val_411
-415    val_416
+411    val_411
+411    val_412
+416    val_417
 425    val_426
-430    val_430
-430    val_430
-430    val_430
-430    val_431
+43     val_43
+432    val_432
+432    val_433
 435    val_435
 435    val_436
-440    val_441
-440    val_441
+436    val_436
+436    val_437
+439    val_439
+439    val_439
+439    val_440
+439    val_440
+441    val_442
 450    val_451
 450    val_451
+453    val_453
+453    val_454
+454    val_454
+454    val_454
+454    val_454
+454    val_455
+454    val_455
 455    val_455
 455    val_456
 455    val_456
 460    val_460
+466    val_466
+466    val_466
+466    val_466
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+469    val_470
 470    val_470
 470    val_471
-475    val_475
-475    val_476
-480    val_480
-480    val_480
-480    val_480
-480    val_481
-480    val_481
-485    val_485
-485    val_486
-485    val_486
-490    val_490
-490    val_491
-495    val_495
-495    val_496
-5      val_5
-5      val_5
-5      val_5
-5      val_6
-50     val_51
-60     val_61
-65     val_65
-65     val_66
-65     val_66
-70     val_70
-70     val_70
-70     val_70
-70     val_71
-75     val_76
-80     val_80
-80     val_81
-85     val_85
-85     val_86
-90     val_90
-90     val_90
-90     val_90
-95     val_95
-95     val_95
+481    val_481
+481    val_482
+484    val_484
+484    val_485
+492    val_492
+492    val_492
+492    val_493
+492    val_493
+493    val_493
+494    val_494
+494    val_495
+494    val_495
+498    val_498
+498    val_498
+498    val_498
+51     val_51
+51     val_51
+51     val_52
+52     val_53
+52     val_53
+52     val_53
+52     val_53
+53     val_53
+53     val_54
+54     val_54
+61     val_62
+68     val_69
+69     val_69
+69     val_70
+72     val_72
+72     val_72
+8      val_8
+8      val_9
+87     val_87
+87     val_88
+87     val_88
+89     val_90
+89     val_90
+89     val_90
+91     val_92
+93     val_94
+93     val_94
+93     val_94
+96     val_96

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample6.q.out 
b/ql/src/test/results/clientpositive/sample6.q.out
index af85377..b748e8d 100644
--- a/ql/src/test/results/clientpositive/sample6.q.out
+++ b/ql/src/test/results/clientpositive/sample6.q.out
@@ -54,6 +54,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 
@@ -101,6 +102,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -123,6 +125,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -192,6 +195,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 
@@ -235,6 +239,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 
@@ -265,6 +270,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 
@@ -286,6 +292,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 
@@ -322,6 +329,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 
@@ -352,6 +360,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 
@@ -373,6 +382,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 
@@ -421,158 +431,76 @@ order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
-4      val_4
-4      val_5
-8      val_8
-8      val_9
-12     val_12
-12     val_12
-12     val_13
-16     val_17
-16     val_17
-20     val_20
-20     val_21
-20     val_21
-24     val_24
-24     val_24
-28     val_28
-32     val_33
+2      val_2
+2      val_3
+6      val_7
+6      val_7
+10     val_10
+10     val_11
+30     val_30
+30     val_31
 40     val_41
 40     val_41
-44     val_44
-48     val_49
-48     val_49
-52     val_53
-52     val_53
-52     val_53
-52     val_53
-56     val_57
-60     val_61
+58     val_58
+58     val_58
+58     val_59
+58     val_59
 64     val_64
-68     val_69
-72     val_72
-72     val_72
-76     val_76
-76     val_76
-76     val_77
-76     val_77
-76     val_77
+70     val_70
+70     val_70
+70     val_70
+70     val_71
 80     val_80
 80     val_81
-84     val_84
-84     val_84
-92     val_92
-96     val_96
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-104    val_104
-104    val_104
-104    val_105
-104    val_105
-104    val_105
+86     val_86
+86     val_87
+90     val_90
+90     val_90
+90     val_90
+98     val_98
+98     val_98
+110    val_111
 116    val_116
 116    val_117
-120    val_120
-120    val_120
-120    val_121
-128    val_128
-128    val_128
-128    val_128
-128    val_129
-128    val_129
-132    val_133
-132    val_133
-136    val_136
-136    val_137
-140    val_141
-144    val_145
-152    val_152
-152    val_152
-152    val_153
-152    val_153
-152    val_153
+126    val_126
+126    val_127
+126    val_127
+134    val_134
+134    val_134
+134    val_135
 156    val_156
 156    val_157
 156    val_157
-160    val_160
-160    val_161
-164    val_164
-164    val_164
-164    val_165
-164    val_165
-168    val_168
-168    val_169
-172    val_172
-172    val_172
-172    val_173
-176    val_176
-176    val_176
-180    val_180
+158    val_158
+178    val_178
+178    val_179
+178    val_179
 184    val_185
-192    val_192
-192    val_193
-196    val_196
-196    val_197
-196    val_197
-196    val_197
-200    val_200
-200    val_200
-204    val_205
+206    val_207
+206    val_207
+206    val_207
 208    val_208
 208    val_208
 208    val_208
-212    val_213
-216    val_216
-216    val_216
-216    val_217
-224    val_224
-224    val_224
-224    val_225
-228    val_228
-228    val_229
-240    val_241
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-248    val_248
-248    val_249
 252    val_252
 252    val_253
+254    val_255
 256    val_256
 256    val_256
 256    val_257
-260    val_260
-260    val_261
-260    val_261
-264    val_265
-264    val_265
-268    val_269
+266    val_266
 272    val_272
 272    val_272
 272    val_273
-276    val_277
-280    val_280
-280    val_280
-284    val_284
-284    val_285
-284    val_285
-288    val_288
-288    val_288
+286    val_286
+286    val_287
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-300    val_301
-300    val_301
 304    val_305
 308    val_308
 308    val_309
@@ -580,13 +508,15 @@ POSTHOOK: Input: default@dest1
 316    val_316
 316    val_316
 316    val_316
-324    val_325
-328    val_329
-328    val_329
-332    val_332
+326    val_327
+334    val_335
 336    val_336
 336    val_337
-340    val_341
+338    val_338
+338    val_339
+342    val_342
+342    val_342
+342    val_343
 344    val_344
 344    val_344
 344    val_345
@@ -598,29 +528,23 @@ POSTHOOK: Input: default@dest1
 348    val_349
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
 360    val_360
 360    val_361
+362    val_362
 364    val_364
 364    val_365
-368    val_368
-376    val_377
-384    val_384
-384    val_384
-384    val_384
-384    val_385
-384    val_385
-384    val_385
-388    val_389
+378    val_378
+378    val_379
 392    val_392
 392    val_393
 392    val_393
 396    val_396
 396    val_396
 396    val_396
-400    val_400
+402    val_402
+402    val_403
+402    val_403
+402    val_403
 404    val_404
 404    val_404
 404    val_405
@@ -628,48 +552,27 @@ POSTHOOK: Input: default@dest1
 404    val_405
 408    val_409
 408    val_409
-412    val_413
-412    val_413
-416    val_417
-424    val_424
-424    val_424
-424    val_425
-428    val_429
-432    val_432
-432    val_433
-436    val_436
-436    val_437
+410    val_411
+426    val_427
 440    val_441
 440    val_441
-444    val_444
-448    val_448
-448    val_449
 452    val_452
-460    val_460
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-468    val_469
-468    val_469
-468    val_469
+458    val_458
+458    val_458
+466    val_466
+466    val_466
+466    val_466
 472    val_472
 476    val_477
 476    val_477
-480    val_480
-480    val_480
-480    val_480
-480    val_481
-480    val_481
+478    val_478
+478    val_478
+478    val_479
+478    val_479
+482    val_482
+482    val_483
 484    val_484
 484    val_485
-488    val_489
-492    val_492
-492    val_492
-492    val_493
-492    val_493
-496    val_496
-496    val_497
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 
4 OUT OF 4 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -716,6 +619,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -738,6 +642,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -802,147 +707,105 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 #### A masked pattern was here ####
-3      val_4
-11     val_11
-11     val_12
-11     val_12
-11     val_12
+5      val_5
+5      val_5
+5      val_5
+5      val_6
 15     val_15
 15     val_15
 15     val_16
 15     val_16
-19     val_19
-19     val_20
 23     val_24
-27     val_27
-31     val_32
+33     val_33
+33     val_34
 35     val_35
 35     val_35
 35     val_35
 35     val_36
 35     val_36
 35     val_36
-43     val_43
 47     val_47
 47     val_48
-51     val_51
-51     val_51
-51     val_52
-59     val_60
+49     val_50
+49     val_50
+53     val_53
+53     val_54
 63     val_64
-67     val_67
-67     val_67
-71     val_72
 75     val_76
-83     val_83
-83     val_83
 87     val_87
 87     val_88
 87     val_88
-91     val_92
 95     val_95
 95     val_95
-99     val_100
-103    val_103
-103    val_103
 111    val_111
-119    val_119
-119    val_119
-119    val_119
-119    val_120
-119    val_120
-119    val_120
-123    val_124
-123    val_124
-131    val_131
-135    val_136
-135    val_136
-135    val_136
-143    val_143
-143    val_144
+125    val_125
+125    val_125
+125    val_126
+129    val_129
+129    val_129
+129    val_130
+129    val_130
+145    val_145
 147    val_148
 147    val_148
 151    val_152
 151    val_152
-155    val_155
-163    val_163
+161    val_162
+161    val_162
+161    val_162
+161    val_162
 167    val_167
 167    val_167
 167    val_167
 167    val_168
-175    val_175
-175    val_175
-175    val_176
-175    val_176
-179    val_179
-179    val_179
-179    val_180
-183    val_183
-183    val_184
-187    val_187
-187    val_187
-187    val_187
-191    val_191
-191    val_191
-191    val_192
-195    val_195
-195    val_195
-199    val_199
-199    val_199
-199    val_199
-199    val_200
+193    val_193
+193    val_193
+193    val_193
 203    val_203
 203    val_203
 207    val_207
 207    val_207
-215    val_216
+209    val_209
+209    val_209
+209    val_210
+209    val_210
+213    val_213
+213    val_213
+213    val_214
 219    val_219
 219    val_219
-223    val_223
-223    val_223
 227    val_228
-231    val_232
-235    val_235
-235    val_236
-239    val_239
-239    val_239
-239    val_240
-239    val_240
-243    val_244
-243    val_244
-247    val_247
-255    val_255
-255    val_255
+241    val_241
+241    val_242
+241    val_242
+241    val_242
+241    val_242
+245    val_246
+245    val_246
+257    val_257
+257    val_258
+257    val_258
 259    val_260
 259    val_260
 263    val_263
+265    val_265
+265    val_265
+265    val_266
 267    val_268
-271    val_272
-275    val_275
-275    val_276
-275    val_276
+273    val_273
+273    val_273
+273    val_273
+273    val_274
+281    val_281
+281    val_281
+281    val_282
+281    val_282
+281    val_282
 283    val_283
-287    val_287
-287    val_288
-287    val_288
-291    val_291
-291    val_292
-291    val_292
-295    val_296
-295    val_296
+293    val_294
+293    val_294
 303    val_304
 303    val_304
-307    val_307
-307    val_307
-311    val_311
-311    val_311
-311    val_311
-315    val_315
-323    val_323
-323    val_324
-327    val_327
-327    val_327
-327    val_327
 331    val_331
 331    val_331
 331    val_332
@@ -950,97 +813,51 @@ POSTHOOK: Input: default@srcbucket
 335    val_335
 335    val_336
 335    val_336
-339    val_339
-343    val_344
-347    val_348
-347    val_348
-351    val_351
-351    val_352
-351    val_352
-355    val_356
-355    val_356
-363    val_364
-363    val_364
-363    val_364
 367    val_367
 367    val_367
 367    val_368
 367    val_368
-371    val_372
-371    val_372
-371    val_372
-371    val_372
-375    val_375
-375    val_376
-375    val_376
-375    val_376
-375    val_376
-375    val_376
+373    val_373
+373    val_374
 379    val_379
 379    val_380
-391    val_392
-391    val_392
+381    val_382
+385    val_386
+385    val_386
 395    val_395
 395    val_395
 395    val_396
 395    val_396
-399    val_399
-399    val_399
-399    val_400
-399    val_400
+401    val_401
+401    val_401
+401    val_401
+401    val_401
+401    val_401
+401    val_402
 403    val_403
 403    val_403
 403    val_403
-407    val_407
-407    val_408
-407    val_408
-407    val_408
-411    val_411
-411    val_412
+405    val_406
 415    val_416
-419    val_419
-423    val_424
-427    val_427
-427    val_428
-427    val_428
+429    val_429
+429    val_429
+429    val_430
+429    val_430
 431    val_431
 431    val_431
 431    val_431
 431    val_432
-435    val_435
-435    val_436
-439    val_439
-439    val_439
-439    val_440
-439    val_440
-443    val_443
-443    val_444
-443    val_444
-443    val_444
+441    val_442
 447    val_448
-451    val_452
-455    val_455
-455    val_456
-455    val_456
-459    val_459
-459    val_459
-459    val_460
-463    val_463
-463    val_463
-463    val_464
-467    val_467
-467    val_468
 475    val_475
 475    val_476
-479    val_479
-483    val_483
-487    val_487
-487    val_488
-491    val_491
-491    val_492
-491    val_492
-495    val_495
-495    val_496
+481    val_481
+481    val_482
+489    val_489
+489    val_489
+489    val_489
+489    val_489
+489    val_490
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 
1 OUT OF 2 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -1087,6 +904,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -1109,6 +927,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1173,88 +992,36 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
 2      val_2
 2      val_3
-4      val_4
-4      val_5
 6      val_7
 6      val_7
-8      val_8
-8      val_9
 10     val_10
 10     val_11
-12     val_12
-12     val_12
-12     val_13
-16     val_17
-16     val_17
-18     val_18
-18     val_18
 20     val_20
 20     val_21
 20     val_21
-22     val_23
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
 30     val_30
 30     val_31
-32     val_33
-34     val_34
 40     val_41
 40     val_41
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-44     val_44
 46     val_47
 48     val_49
 48     val_49
-50     val_51
-52     val_53
-52     val_53
-52     val_53
-52     val_53
 54     val_54
-56     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
 60     val_61
-62     val_63
-62     val_63
 64     val_64
-66     val_66
 68     val_69
 70     val_70
 70     val_70
 70     val_70
 70     val_71
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-76     val_77
-76     val_77
-76     val_77
-78     val_78
-78     val_79
 80     val_80
 80     val_81
-82     val_82
-82     val_83
-82     val_83
 84     val_84
 84     val_84
 86     val_86
@@ -1262,116 +1029,41 @@ POSTHOOK: Input: default@srcbucket
 90     val_90
 90     val_90
 90     val_90
-92     val_92
-94     val_95
 96     val_96
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-102    val_103
-104    val_104
-104    val_104
-104    val_105
-104    val_105
-104    val_105
 106    val_107
 110    val_111
-114    val_114
-114    val_115
-114    val_115
-114    val_115
 116    val_116
 116    val_117
-118    val_118
-118    val_118
-118    val_119
-118    val_119
-118    val_119
-120    val_120
-120    val_120
-120    val_121
-122    val_123
-122    val_123
-122    val_123
 126    val_126
 126    val_127
 126    val_127
-128    val_128
-128    val_128
-128    val_128
-128    val_129
-128    val_129
 132    val_133
 132    val_133
 134    val_134
 134    val_134
 134    val_135
-136    val_136
-136    val_137
-138    val_138
-138    val_138
-138    val_138
-138    val_138
-138    val_139
-138    val_139
 140    val_141
-144    val_145
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
-152    val_153
-152    val_153
-152    val_153
 156    val_156
 156    val_157
 156    val_157
 158    val_158
-160    val_160
-160    val_161
 162    val_162
 162    val_163
 164    val_164
 164    val_164
 164    val_165
 164    val_165
-166    val_166
-168    val_168
-168    val_169
-170    val_170
-170    val_171
-172    val_172
-172    val_172
-172    val_173
-174    val_174
-174    val_174
-174    val_175
-174    val_175
-176    val_176
-176    val_176
 178    val_178
 178    val_179
 178    val_179
-180    val_180
 182    val_183
 184    val_185
-186    val_186
 190    val_190
-192    val_192
-192    val_193
-194    val_194
-196    val_196
-196    val_197
-196    val_197
-196    val_197
-200    val_200
-200    val_200
 202    val_202
-204    val_205
 206    val_207
 206    val_207
 206    val_207
@@ -1383,37 +1075,19 @@ POSTHOOK: Input: default@srcbucket
 216    val_216
 216    val_216
 216    val_217
-218    val_218
-222    val_222
-222    val_223
-224    val_224
-224    val_224
-224    val_225
 226    val_226
 226    val_227
 226    val_227
 226    val_227
 226    val_227
-228    val_228
-228    val_229
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
 238    val_238
 238    val_238
 238    val_239
 240    val_241
-242    val_242
-242    val_242
-242    val_243
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-246    val_247
-246    val_247
 248    val_248
 248    val_249
 252    val_252
@@ -1422,53 +1096,23 @@ POSTHOOK: Input: default@srcbucket
 256    val_256
 256    val_256
 256    val_257
-258    val_258
-258    val_259
 260    val_260
 260    val_261
 260    val_261
-262    val_262
-262    val_263
-262    val_263
-264    val_265
-264    val_265
 266    val_266
-268    val_269
 272    val_272
 272    val_272
 272    val_273
-274    val_274
-274    val_275
 276    val_277
-278    val_278
-278    val_278
-278    val_279
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 284    val_285
 284    val_285
 286    val_286
 286    val_287
-288    val_288
-288    val_288
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-298    val_298
-298    val_298
-298    val_298
-300    val_301
-300    val_301
-302    val_302
-302    val_303
 304    val_305
-306    val_306
-306    val_307
 308    val_308
 308    val_309
 308    val_309
@@ -1476,29 +1120,17 @@ POSTHOOK: Input: default@srcbucket
 310    val_311
 310    val_311
 310    val_311
-314    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-318    val_319
-322    val_322
-322    val_322
-322    val_323
 324    val_325
 326    val_327
-328    val_329
-328    val_329
-330    val_331
 332    val_332
 334    val_335
 336    val_336
 336    val_337
 338    val_338
 338    val_339
-340    val_341
 342    val_342
 342    val_342
 342    val_343
@@ -1513,26 +1145,14 @@ POSTHOOK: Input: default@srcbucket
 348    val_349
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
-358    val_359
 360    val_360
 360    val_361
 362    val_362
 364    val_364
 364    val_365
-366    val_366
 368    val_368
-374    val_374
-374    val_375
-376    val_377
 378    val_378
 378    val_379
-382    val_382
-382    val_382
-382    val_383
-382    val_383
 384    val_384
 384    val_384
 384    val_384
@@ -1543,9 +1163,6 @@ POSTHOOK: Input: default@srcbucket
 386    val_387
 386    val_387
 388    val_389
-390    val_391
-390    val_391
-390    val_391
 392    val_392
 392    val_393
 392    val_393
@@ -1553,8 +1170,6 @@ POSTHOOK: Input: default@srcbucket
 396    val_396
 396    val_396
 396    val_396
-398    val_399
-400    val_400
 402    val_402
 402    val_403
 402    val_403
@@ -1564,24 +1179,12 @@ POSTHOOK: Input: default@srcbucket
 404    val_405
 404    val_405
 404    val_405
-406    val_406
-406    val_406
-406    val_406
-406    val_406
-406    val_407
 408    val_409
 408    val_409
 410    val_411
-412    val_413
-412    val_413
 414    val_414
 414    val_414
 414    val_415
-416    val_417
-418    val_418
-424    val_424
-424    val_424
-424    val_425
 426    val_427
 428    val_429
 430    val_430
@@ -1590,24 +1193,12 @@ POSTHOOK: Input: default@srcbucket
 430    val_431
 432    val_432
 432    val_433
-436    val_436
-436    val_437
-438    val_438
-438    val_438
-438    val_438
-438    val_439
-438    val_439
 440    val_441
 440    val_441
-442    val_443
 444    val_444
 446    val_446
 446    val_447
 446    val_447
-448    val_448
-448    val_449
-450    val_451
-450    val_451
 452    val_452
 454    val_454
 454    val_454
@@ -1616,22 +1207,9 @@ POSTHOOK: Input: default@srcbucket
 454    val_455
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
-462    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-468    val_469
-468    val_469
-468    val_469
-470    val_470
-470    val_471
 472    val_472
 474    val_475
 474    val_475
@@ -1650,19 +1228,9 @@ POSTHOOK: Input: default@srcbucket
 482    val_483
 484    val_484
 484    val_485
-486    val_487
 488    val_489
 490    val_490
 490    val_491
-492    val_492
-492    val_492
-492    val_493
-492    val_493
-494    val_494
-494    val_495
-494    val_495
-496    val_496
-496    val_497
 498    val_498
 498    val_498
 498    val_498
@@ -1711,6 +1279,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -1733,6 +1302,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1797,24 +1367,16 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
-0      val_1
-0      val_1
-3      val_4
-6      val_7
-6      val_7
 9      val_9
-12     val_12
-12     val_12
-12     val_13
-15     val_15
-15     val_15
-15     val_16
-15     val_16
+16     val_17
+16     val_17
 18     val_18
 18     val_18
+19     val_19
+19     val_20
+20     val_20
+20     val_21
+20     val_21
 21     val_22
 21     val_22
 21     val_22
@@ -1822,265 +1384,302 @@ POSTHOOK: Input: default@srcbucket
 24     val_24
 24     val_24
 27     val_27
+29     val_30
+29     val_30
 30     val_30
 30     val_31
-33     val_33
-33     val_34
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-48     val_49
-48     val_49
-51     val_51
-51     val_51
-51     val_52
+31     val_32
+32     val_33
+40     val_41
+40     val_41
+41     val_41
+43     val_43
+44     val_44
+47     val_47
+47     val_48
+49     val_50
+49     val_50
+50     val_51
 54     val_54
-57     val_57
-60     val_61
-63     val_64
-66     val_66
-69     val_69
-69     val_70
-72     val_72
-72     val_72
+61     val_62
+64     val_64
+67     val_67
+67     val_67
+70     val_70
+70     val_70
+70     val_70
+70     val_71
+71     val_72
+74     val_74
 75     val_76
-78     val_78
-78     val_79
-84     val_84
-84     val_84
+76     val_76
+76     val_76
+76     val_77
+76     val_77
+76     val_77
+77     val_77
+77     val_78
+77     val_78
+82     val_82
+82     val_83
+82     val_83
+85     val_85
+85     val_86
 87     val_87
 87     val_88
 87     val_88
+89     val_90
+89     val_90
+89     val_90
 90     val_90
 90     val_90
 90     val_90
-93     val_94
-93     val_94
-93     val_94
-96     val_96
-99     val_100
-102    val_103
+92     val_92
 105    val_105
 105    val_106
 105    val_106
-111    val_111
 114    val_114
 114    val_115
 114    val_115
 114    val_115
+116    val_116
+116    val_117
 117    val_118
 117    val_118
+118    val_118
+118    val_118
+118    val_119
+118    val_119
+118    val_119
 120    val_120
 120    val_120
 120    val_121
-123    val_124
-123    val_124
-126    val_126
-126    val_127
-126    val_127
-129    val_129
-129    val_129
-129    val_130
-129    val_130
-132    val_133
-132    val_133
+122    val_123
+122    val_123
+122    val_123
+134    val_134
+134    val_134
+134    val_135
 135    val_136
 135    val_136
 135    val_136
-138    val_138
-138    val_138
-138    val_138
-138    val_138
-138    val_139
-138    val_139
+143    val_143
+143    val_144
 144    val_145
-147    val_148
-147    val_148
-150    val_150
-153    val_153
-153    val_154
-153    val_154
-156    val_156
-156    val_157
-156    val_157
-162    val_162
-162    val_163
+145    val_145
+146    val_146
+146    val_146
+149    val_149
+149    val_149
+149    val_150
+157    val_157
+157    val_158
+157    val_158
+158    val_158
+161    val_162
+161    val_162
+161    val_162
+161    val_162
 165    val_165
 165    val_165
 165    val_166
+166    val_166
 168    val_168
 168    val_169
-174    val_174
-174    val_174
-174    val_175
-174    val_175
-177    val_177
-177    val_178
-177    val_178
+170    val_170
+170    val_171
+179    val_179
+179    val_179
+179    val_180
 180    val_180
+181    val_181
 183    val_183
 183    val_184
-186    val_186
-189    val_189
-189    val_190
 192    val_192
 192    val_193
+193    val_193
+193    val_193
+193    val_193
 195    val_195
 195    val_195
-201    val_201
+197    val_197
+197    val_197
+197    val_198
+203    val_203
+203    val_203
 204    val_205
-207    val_207
-207    val_207
-213    val_213
-213    val_213
-213    val_214
-216    val_216
-216    val_216
-216    val_217
-219    val_219
-219    val_219
+209    val_209
+209    val_209
+209    val_210
+209    val_210
+214    val_214
 222    val_222
 222    val_223
+226    val_226
+226    val_227
+226    val_227
+226    val_227
+226    val_227
 228    val_228
 228    val_229
-231    val_232
-237    val_237
-237    val_237
-240    val_241
-243    val_244
-243    val_244
-246    val_247
-246    val_247
-249    val_249
-249    val_250
-249    val_250
-252    val_252
-252    val_253
-255    val_255
-255    val_255
-258    val_258
-258    val_259
+235    val_235
+235    val_236
+238    val_238
+238    val_238
+238    val_239
+241    val_241
+241    val_242
+241    val_242
+241    val_242
+241    val_242
+242    val_242
+242    val_242
+242    val_243
+245    val_246
+245    val_246
+254    val_255
+256    val_256
+256    val_256
+256    val_257
 261    val_262
-264    val_265
-264    val_265
-267    val_268
+262    val_262
+262    val_263
+262    val_263
+266    val_266
+268    val_269
+271    val_272
 273    val_273
 273    val_273
 273    val_273
 273    val_274
 276    val_277
-282    val_282
-282    val_282
+278    val_278
+278    val_278
+278    val_279
+280    val_280
+280    val_280
+284    val_284
+284    val_285
+284    val_285
 285    val_285
 285    val_286
-288    val_288
-288    val_288
-291    val_291
-291    val_292
-291    val_292
-300    val_301
-300    val_301
-303    val_304
-303    val_304
+286    val_286
+286    val_287
+287    val_287
+287    val_288
+287    val_288
+288    val_288
+288    val_288
+292    val_292
+292    val_293
+292    val_293
+293    val_294
+293    val_294
+295    val_296
+295    val_296
+298    val_298
+298    val_298
+298    val_298
+300    val_301
+300    val_301
 306    val_306
 306    val_307
+308    val_308
+308    val_309
+308    val_309
 309    val_309
 309    val_309
 309    val_310
-315    val_315
+316    val_316
+316    val_316
+316    val_316
 318    val_318
 318    val_318
 318    val_318
 318    val_319
-321    val_321
-321    val_321
-324    val_325
-327    val_327
-327    val_327
-327    val_327
-330    val_331
-333    val_333
-333    val_333
-333    val_334
-336    val_336
-336    val_337
-339    val_339
-342    val_342
-342    val_342
-342    val_343
-345    val_345
+323    val_323
+323    val_324
+325    val_325
+325    val_325
+326    val_327
+331    val_331
+331    val_331
+331    val_332
+331    val_332
+332    val_332
+341    val_341
+341    val_342
+341    val_342
+341    val_342
+343    val_344
+344    val_344
+344    val_344
+344    val_345
+347    val_348
+347    val_348
 348    val_348
 348    val_348
 348    val_348
 348    val_348
 348    val_348
 348    val_349
-351    val_351
-351    val_352
-351    val_352
-360    val_360
-360    val_361
-363    val_364
-363    val_364
-363    val_364
+364    val_364
+364    val_365
 366    val_366
 369    val_369
 369    val_369
 369    val_369
 369    val_370
-375    val_375
-375    val_376
-375    val_376
-375    val_376
-375    val_376
-375    val_376
-378    val_378
-378    val_379
-381    val_382
+373    val_373
+373    val_374
+374    val_374
+374    val_375
+379    val_379
+379    val_380
 384    val_384
 384    val_384
 384    val_384
 384    val_385
 384    val_385
 384    val_385
-390    val_391
-390    val_391
-390    val_391
-393    val_393
-393    val_394
-393    val_394
-396    val_396
-396    val_396
-396    val_396
+391    val_392
+391    val_392
+392    val_392
+392    val_393
+392    val_393
+395    val_395
+395    val_395
+395    val_396
+395    val_396
+397    val_397
+397    val_397
 399    val_399
 399    val_399
 399    val_400
 399    val_400
-402    val_402
-402    val_403
-402    val_403
-402    val_403
-405    val_406
-408    val_409
-408    val_409
-411    val_411
-411    val_412
+407    val_407
+407    val_408
+407    val_408
+407    val_408
+409    val_409
+409    val_409
+409    val_409
+409    val_410
+409    val_410
+410    val_411
 414    val_414
 414    val_414
 414    val_415
+415    val_416
 417    val_417
 417    val_417
 417    val_417
 423    val_424
 426    val_427
-429    val_429
-429    val_429
-429    val_430
-429    val_430
-432    val_432
-432    val_433
+430    val_430
+430    val_430
+430    val_430
+430    val_431
 435    val_435
 435    val_436
 438    val_438
@@ -2088,19 +1687,24 @@ POSTHOOK: Input: default@srcbucket
 438    val_438
 438    val_439
 438    val_439
-441    val_442
+439    val_439
+439    val_439
+439    val_440
+439    val_440
+440    val_441
+440    val_441
+443    val_443
+443    val_444
+443    val_444
+443    val_444
 444    val_444
 447    val_448
-450    val_451
-450    val_451
-453    val_453
-453    val_454
+448    val_448
+448    val_449
+452    val_452
 459    val_459
 459    val_459
 459    val_460
-462    val_462
-462    val_462
-462    val_463
 468    val_468
 468    val_468
 468    val_468
@@ -2108,31 +1712,39 @@ POSTHOOK: Input: default@srcbucket
 468    val_469
 468    val_469
 468    val_469
-474    val_475
-474    val_475
-477    val_477
-477    val_478
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+469    val_469
+469    val_470
+470    val_470
+470    val_471
+472    val_472
+478    val_478
+478    val_478
+478    val_479
+478    val_479
 480    val_480
 480    val_480
 480    val_480
 480    val_481
 480    val_481
-483    val_483
-486    val_487
-489    val_489
-489    val_489
-489    val_489
-489    val_489
-489    val_490
+485    val_485
+485    val_486
+485    val_486
+491    val_491
+491    val_492
+491    val_492
 492    val_492
 492    val_492
 492    val_493
 492    val_493
 495    val_495
 495    val_496
-498    val_498
-498    val_498
-498    val_498
+497    val_497
+497    val_498
+497    val_498
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 
2 OUT OF 3 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -2178,6 +1790,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -2200,6 +1813,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -2264,91 +1878,125 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket
 #### A masked pattern was here ####
+0      val_0
+0      val_0
+0      val_0
+0      val_1
+0      val_1
 1      val_2
-4      val_4
-4      val_5
+5      val_5
+5      val_5
+5      val_5
+5      val_6
+8      val_8
+8      val_9
 10     val_10
 10     val_11
-16     val_17
-16     val_17
-19     val_19
-19     val_20
-22     val_23
-28     val_28
-31     val_32
+15     val_15
+15     val_15
+15     val_16
+15     val_16
+17     val_17
+26     val_26
+26     val_26
+33     val_33
+33     val_34
 34     val_34
 37     val_37
 37     val_37
-40     val_41
-40     val_41
-43     val_43
-46     val_47
-49     val_50
-49     val_50
+42     val_42
+42     val_42
+42     val_43
+42     val_43
+42     val_43
 52     val_53
 52     val_53
 52     val_53
 52     val_53
+53     val_53
+53     val_54
+56     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
-61     val_62
-64     val_64
-67     val_67
-67     val_67
-70     val_70
-70     val_70
-70     val_70
-70     val_71
-76     val_76
-76     val_76
-76     val_77
-76     val_77
-76     val_77
-82     val_82
-82     val_83
-82     val_83
-85     val_85
-85     val_86
+59     val_60
+60     val_61
+65     val_65
+65     val_66
+65     val_66
+66     val_66
+69     val_69
+69     val_70
+72     val_72
+72     val_72
+83     val_83
+83     val_83
+84     val_84
+84     val_84
 91     val_92
 94     val_95
 97     val_97
 97     val_97
 97     val_98
 97     val_98
-100    val_100
-100    val_100
-100    val_101
-100    val_101
-103    val_103
-103    val_103
+99     val_100
+101    val_102
+102    val_103
+104    val_104
+104    val_104
+104    val_105
+104    val_105
+104    val_105
 106    val_107
-118    val_118
-118    val_118
-118    val_119
-118    val_119
-118    val_119
+110    val_111
+113    val_113
+113    val_113
 121    val_122
 121    val_122
+123    val_124
+123    val_124
+126    val_126
+126    val_127
+126    val_127
+128    val_128
+128    val_128
+128    val_128
+128    val_129
+128    val_129
+132    val_133
+132    val_133
 133    val_133
 133    val_134
-136    val_136
-136    val_137
-145    val_145
-151    val_152
-151    val_152
-157    val_157
-157    val_158
-157    val_158
+137    val_137
+137    val_137
+137    val_138
+138    val_138
+138    val_138
+138    val_138
+138    val_138
+138    val_139
+138    val_139
+150    val_150
+152    val_152
+152    val_152
+152    val_153
+152    val_153
+152    val_153
+153    val_153
+153    val_154
+153    val_154
 160    val_160
 160    val_161
 163    val_163
-166    val_166
-169    val_169
-169    val_169
-169    val_169
-169    val_169
+164    val_164
+164    val_164
+164    val_165
+164    val_165
+167    val_167
+167    val_167
+167    val_167
+167    val_168
 172    val_172
 172    val_172
 172    val_173
@@ -2356,197 +2004,154 @@ POSTHOOK: Input: default@srcbucket
 175    val_175
 175    val_176
 175    val_176
-178    val_178
-178    val_179
-178    val_179
-181    val_181
+176    val_176
+176    val_176
+177    val_177
+177    val_178
+177    val_178
 184    val_185
 187    val_187
 187    val_187
 187    val_187
+189    val_189
+189    val_190
 190    val_190
-193    val_193
-193    val_193
-193    val_193
-196    val_196
-196    val_197
-196    val_197
-196    val_197
+194    val_194
 199    val_199
 199    val_199
 199    val_199
 199    val_200
 202    val_202
-205    val_205
-205    val_205
-205    val_206
-208    val_208
-208    val_208
-208    val_208
-214    val_214
-217    val_217
-217    val_217
-217    val_218
-217    val_218
-223    val_223
-223    val_223
-226    val_226
-226    val_227
-226    val_227
-226    val_227
-226    val_227
+212    val_213
+213    val_213
+213    val_213
+213    val_214
+215    val_216
+218    val_218
+219    val_219
+219    val_219
+224    val_224
+224    val_224
+224    val_225
+227    val_228
 229    val_229
 229    val_229
-235    val_235
-235    val_236
-238    val_238
-238    val_238
-238    val_239
-241    val_241
-241    val_242
-241    val_242
-241    val_242
-241    val_242
-244    val_244
-244    val_245
-244    val_245
-244    val_245
+233    val_233
+233    val_233
+243    val_244
+243    val_244
+246    val_247
+246    val_247
 247    val_247
-256    val_256
-256    val_256
-256    val_257
+249    val_249
+249    val_250
+249    val_250
+252    val_252
+252    val_253
+255    val_255
+255    val_255
+257    val_257
+257    val_258
+257    val_258
 259    val_260
 259    val_260
-262    val_262
-262    val_263
-262    val_263
-265    val_265
-265    val_265
-265    val_266
-268    val_269
-271    val_272
-274    val_274
-274    val_275
+260    val_260
+260    val_261
+260    val_261
+267    val_268
+272    val_272
+272    val_272
+272    val_273
+275    val_275
+275    val_276
+275    val_276
 277    val_277
 277    val_277
 277    val_277
 277    val_277
 277    val_278
 277    val_278
-280    val_280
-280    val_280
-283    val_283
-286    val_286
-286    val_287
+282    val_282
+282    val_282
 289    val_289
 289    val_290
-292    val_292
-292    val_293
-292    val_293
-295    val_296
-295    val_296
-298    val_298
-298    val_298
-298    val_298
 304    val_305
-307    val_307
-307    val_307
 310    val_310
 310    val_311
 310    val_311
 310    val_311
 313    val_314
-316    val_316
-316    val_316
-316    val_316
-322    val_322
-322    val_322
-322    val_323
-325    val_325
-325    val_325
-328    val_329
-328    val_329
-331    val_331
-331    val_331
-331    val_332
-331    val_332
-334    val_335
-337    val_338
+314    val_315
+315    val_315
+324    val_325
+330    val_331
+333    val_333
+333    val_333
+333    val_334
 340    val_341
-343    val_344
-349    val_350
-349    val_350
-349    val_350
-349    val_350
-352    val_353
-352    val_353
-355    val_356
-355    val_356
+351    val_351
+351    val_352
+351    val_352
+353    val_353
+353    val_353
+353    val_354
+356    val_356
+356    val_357
+356    val_357
 358    val_359
-364    val_364
-364    val_365
-367    val_367
-367    val_367
-367    val_368
-367    val_368
-373    val_373
-373    val_374
-376    val_377
-379    val_379
-379    val_380
+363    val_364
+363    val_364
+363    val_364
+377    val_377
+378    val_378
+378    val_379
 382    val_382
 382    val_382
 382    val_383
 382    val_383
-385    val_386
-385    val_386
-388    val_389
-391    val_392
-391    val_392
-394    val_394
-397    val_397
-397    val_397
-400    val_400
-403    val_403
-403    val_403
-403    val_403
-406    val_406
-406    val_406
-406    val_406
-406    val_406
-406    val_407
-409    val_409
-409    val_409
-409    val_409
-409    val_410
-409    val_410
+385    val_386
+385    val_386
+388    val_389
+393    val_393
+393    val_394
+393    val_394
+396    val_396
+396    val_396
+396    val_396
+402    val_402
+402    val_403
+402    val_403
+402    val_403
+405    val_406
+408    val_409
+408    val_409
 412    val_413
 412    val_413
-415    val_416
-418    val_418
+413    val_413
+413    val_413
+413    val_414
+416    val_417
+419    val_419
 421    val_421
 421    val_422
 421    val_422
-424    val_424
-424    val_424
-424    val_425
-427    val_427
-427    val_428
-427    val_428
-430    val_430
-430    val_430
-430    val_430
-430    val_431
+429    val_429
+429    val_429
+429    val_430
+429    val_430
+432    val_432
+432    val_433
 436    val_436
 436    val_437
-439    val_439
-439    val_439
-439    val_440
-439    val_440
-442    val_443
-448    val_448
-448    val_449
+437    val_437
+437    val_438
+441    val_442
+446    val_446
+446    val_447
+446    val_447
 451    val_452
+453    val_453
+453    val_454
 454    val_454
 454    val_454
 454    val_454
@@ -2555,37 +2160,41 @@ POSTHOOK: Input: default@srcbucket
 457    val_457
 457    val_458
 457    val_458
+458    val_458
+458    val_458
 460    val_460
+461    val_462
 463    val_463
 463    val_463
 463    val_464
 466    val_466
 466    val_466
 466    val_466
-469    val_469
-469    val_469
-469    val_469
-469    val_469
-469    val_469
-469    val_470
-472    val_472
+474    val_475
+474    val_475
 475    val_475
 475    val_476
-478    val_478
-478    val_478
-478    val_479
-478    val_479
+476    val_477
+476    val_477
+477    val_477
+477    val_478
 481    val_481
 481    val_482
+482    val_482
+482    val_483
+483    val_483
 484    val_484
 484    val_485
+486    val_487
 487    val_487
 487    val_488
+489    val_489
+489    val_489
+489    val_489
+489    val_489
+489    val_490
 490    val_490
 490    val_491
-493    val_493
-496    val_496
-496    val_497
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket2 TABLESAMPLE 
(BUCKET 1 OUT OF 2 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -2632,6 +2241,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 4
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -2654,6 +2264,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -2680,6 +2291,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 4
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -2702,6 +2314,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -2767,104 +2380,40 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket2
 #### A masked pattern was here ####
-0      val_0
-0      val_0
-0      val_0
 2      val_2
-4      val_4
-8      val_8
 10     val_10
-12     val_12
-12     val_12
-18     val_18
-18     val_18
 20     val_20
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
 30     val_30
-34     val_34
-42     val_42
-42     val_42
-44     val_44
 54     val_54
 58     val_58
 58     val_58
 64     val_64
-66     val_66
 70     val_70
 70     val_70
 70     val_70
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-78     val_78
 80     val_80
-82     val_82
 84     val_84
 84     val_84
 86     val_86
 90     val_90
 90     val_90
 90     val_90
-92     val_92
 96     val_96
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-104    val_104
-104    val_104
-114    val_114
 116    val_116
-118    val_118
-118    val_118
-120    val_120
-120    val_120
 126    val_126
-128    val_128
-128    val_128
-128    val_128
 134    val_134
 134    val_134
-136    val_136
-138    val_138
-138    val_138
-138    val_138
-138    val_138
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
 156    val_156
 158    val_158
-160    val_160
 162    val_162
 164    val_164
 164    val_164
-166    val_166
-168    val_168
-170    val_170
-172    val_172
-172    val_172
-174    val_174
-174    val_174
-176    val_176
-176    val_176
 178    val_178
-180    val_180
-186    val_186
 190    val_190
-192    val_192
-194    val_194
-196    val_196
-200    val_200
-200    val_200
 202    val_202
 208    val_208
 208    val_208
@@ -2872,60 +2421,26 @@ POSTHOOK: Input: default@srcbucket2
 214    val_214
 216    val_216
 216    val_216
-218    val_218
-222    val_222
-224    val_224
-224    val_224
 226    val_226
-228    val_228
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
 238    val_238
 238    val_238
-242    val_242
-242    val_242
 244    val_244
 248    val_248
 252    val_252
 256    val_256
 256    val_256
-258    val_258
 260    val_260
-262    val_262
 266    val_266
 272    val_272
 272    val_272
-274    val_274
-278    val_278
-278    val_278
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 286    val_286
-288    val_288
-288    val_288
 292    val_292
-296    val_296
-298    val_298
-298    val_298
-298    val_298
-302    val_302
-306    val_306
 308    val_308
 310    val_310
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-322    val_322
-322    val_322
 332    val_332
 336    val_336
 338    val_338
@@ -2938,16 +2453,11 @@ POSTHOOK: Input: default@srcbucket2
 348    val_348
 348    val_348
 348    val_348
-356    val_356
 360    val_360
 362    val_362
 364    val_364
-366    val_366
 368    val_368
-374    val_374
 378    val_378
-382    val_382
-382    val_382
 384    val_384
 384    val_384
 384    val_384
@@ -2957,47 +2467,26 @@ POSTHOOK: Input: default@srcbucket2
 396    val_396
 396    val_396
 396    val_396
-400    val_400
 402    val_402
 404    val_404
 404    val_404
-406    val_406
-406    val_406
-406    val_406
-406    val_406
 414    val_414
 414    val_414
-418    val_418
-424    val_424
-424    val_424
 430    val_430
 430    val_430
 430    val_430
 432    val_432
-436    val_436
-438    val_438
-438    val_438
-438    val_438
 444    val_444
 446    val_446
-448    val_448
 452    val_452
 454    val_454
 454    val_454
 454    val_454
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-470    val_470
 472    val_472
 478    val_478
 478    val_478
@@ -3007,10 +2496,6 @@ POSTHOOK: Input: default@srcbucket2
 482    val_482
 484    val_484
 490    val_490
-492    val_492
-492    val_492
-494    val_494
-496    val_496
 498    val_498
 498    val_498
 498    val_498
@@ -3060,6 +2545,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 4
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -3082,6 +2568,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -3146,129 +2633,30 @@ ORDER BY key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcbucket2
 #### A masked pattern was here ####
-5      val_5
-5      val_5
-5      val_5
 9      val_9
-17     val_17
-33     val_33
 37     val_37
 37     val_37
-41     val_41
-53     val_53
-57     val_57
-65     val_65
-69     val_69
-77     val_77
-85     val_85
-97     val_97
-97     val_97
-105    val_105
-113    val_113
-113    val_113
-125    val_125
-125    val_125
-129    val_129
-129    val_129
-133    val_133
-137    val_137
-137    val_137
-145    val_145
-149    val_149
-149    val_149
-153    val_153
-157    val_157
-165    val_165
-165    val_165
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-177    val_177
-181    val_181
 189    val_189
-193    val_193
-193    val_193
-193    val_193
-197    val_197
-197    val_197
-201    val_201
 205    val_205
 205    val_205
-209    val_209
-209    val_209
-213    val_213
-213    val_213
 217    val_217
 217    val_217
-221    val_221
-221    val_221
-229    val_229
-229    val_229
-233    val_233
-233    val_233
-237    val_237
-237    val_237
-241    val_241
-249    val_249
-257    val_257
-265    val_265
-265    val_265
-273    val_273
-273    val_273
-273    val_273
 277    val_277
 277    val_277
 277    val_277
 277    val_277
-281    val_281
-281    val_281
 285    val_285
-289    val_289
 305    val_305
 309    val_309
 309    val_309
-317    val_317
-317    val_317
 321    val_321
 321    val_321
-325    val_325
-325    val_325
 333    val_333
 333    val_333
-341    val_341
 345    val_345
-353    val_353
-353    val_353
-365    val_365
-369    val_369
-369    val_369
-369    val_369
-373    val_373
-377    val_377
 389    val_389
-393    val_393
-397    val_397
-397    val_397
-401    val_401
-401    val_401
-401    val_401
-401    val_401
-401    val_401
-409    val_409
-409    val_409
-409    val_409
 413    val_413
 413    val_413
-417    val_417
-417    val_417
-417    val_417
-421    val_421
-429    val_429
-429    val_429
-437    val_437
-449    val_449
-453    val_453
 457    val_457
 469    val_469
 469    val_469
@@ -3276,14 +2664,7 @@ POSTHOOK: Input: default@srcbucket2
 469    val_469
 469    val_469
 477    val_477
-481    val_481
-485    val_485
-489    val_489
-489    val_489
-489    val_489
-489    val_489
 493    val_493
-497    val_497
 PREHOOK: query: CREATE TABLE empty_bucket (key int, value string) CLUSTERED BY 
(key) INTO 2 BUCKETS STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default

Reply via email to