http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket1.q.out 
b/ql/src/test/results/clientpositive/bucket1.q.out
index 3266ab0..bdbaa0b 100644
--- a/ql/src/test/results/clientpositive/bucket1.q.out
+++ b/ql/src/test/results/clientpositive/bucket1.q.out
@@ -51,6 +51,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 'default','default'
@@ -72,6 +73,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -111,6 +113,7 @@ STAGE PLANS:
                   COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                   bucket_count 100
                   bucket_field_name key
+                  bucketing_version 2
                   column.name.delimiter ,
                   columns key,value
                   columns.comments 
@@ -170,6 +173,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 100
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
index b68e1aa..f3f70d4 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
@@ -121,6 +121,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 1
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -143,6 +144,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 1
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
index d1cbe3d..d74fd8b 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
@@ -121,6 +121,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 1
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -143,6 +144,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 1
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
index 3e917fa..3e711d5 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out
@@ -163,6 +163,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -239,6 +240,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -323,6 +325,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -371,6 +374,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -400,6 +404,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -600,6 +605,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -676,6 +682,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -760,6 +767,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -808,6 +816,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -837,6 +846,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
index 4027863..2084c90 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out
@@ -147,6 +147,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -223,6 +224,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -307,6 +309,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -355,6 +358,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -384,6 +388,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -584,6 +589,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -660,6 +666,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -744,6 +751,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -792,6 +800,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -821,6 +830,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
index facb47b..9f601c9 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out
@@ -147,6 +147,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -223,6 +224,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -307,6 +309,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -355,6 +358,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -384,6 +388,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -584,6 +589,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -660,6 +666,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value1,value2
                             columns.comments 
@@ -744,6 +751,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -792,6 +800,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -821,6 +830,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
index 2cdf28e..0172264 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out
@@ -193,6 +193,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -216,6 +217,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -243,6 +245,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -266,6 +269,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -293,6 +297,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -316,6 +321,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -549,6 +555,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -572,6 +579,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -599,6 +607,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -622,6 +631,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -649,6 +659,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -672,6 +683,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_num_reducers.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_num_reducers.q.out 
b/ql/src/test/results/clientpositive/bucket_num_reducers.q.out
deleted file mode 100644
index 9f31781..0000000
--- a/ql/src/test/results/clientpositive/bucket_num_reducers.q.out
+++ /dev/null
@@ -1,17 +0,0 @@
-PREHOOK: query: CREATE TABLE bucket_nr(key int, value string) CLUSTERED BY 
(key) INTO 50 BUCKETS
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket_nr
-POSTHOOK: query: CREATE TABLE bucket_nr(key int, value string) CLUSTERED BY 
(key) INTO 50 BUCKETS
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket_nr
-PREHOOK: query: insert overwrite table bucket_nr
-select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@bucket_nr
-PREHOOK: query: drop table bucket_nr
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@bucket_nr
-PREHOOK: Output: default@bucket_nr

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out 
b/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out
deleted file mode 100644
index c7eeda0..0000000
--- a/ql/src/test/results/clientpositive/bucket_num_reducers2.q.out
+++ /dev/null
@@ -1,13 +0,0 @@
-PREHOOK: query: CREATE TABLE test_table(key int, value string) CLUSTERED BY 
(key) INTO 3 BUCKETS
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@test_table
-POSTHOOK: query: CREATE TABLE test_table(key int, value string) CLUSTERED BY 
(key) INTO 3 BUCKETS
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@test_table
-PREHOOK: query: insert overwrite table test_table
-select * from src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@test_table

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucket_num_reducers_acid2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_num_reducers_acid2.q.out 
b/ql/src/test/results/clientpositive/bucket_num_reducers_acid2.q.out
deleted file mode 100644
index add89f4..0000000
--- a/ql/src/test/results/clientpositive/bucket_num_reducers_acid2.q.out
+++ /dev/null
@@ -1,48 +0,0 @@
-PREHOOK: query: drop table if exists bucket_nr_acid2
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table if exists bucket_nr_acid2
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create table bucket_nr_acid2 (a int, b int) clustered by (a) 
into 4 buckets stored as orc TBLPROPERTIES ('transactional'='true')
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@bucket_nr_acid2
-POSTHOOK: query: create table bucket_nr_acid2 (a int, b int) clustered by (a) 
into 4 buckets stored as orc TBLPROPERTIES ('transactional'='true')
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: insert into bucket_nr_acid2 values(0,1),(1,1)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: insert into bucket_nr_acid2 values(2,2),(3,2)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: insert into bucket_nr_acid2 values(0,3),(1,3)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: insert into bucket_nr_acid2 values(2,4),(3,4)
-PREHOOK: type: QUERY
-PREHOOK: Input: _dummy_database@_dummy_table
-PREHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: update bucket_nr_acid2 set b = -1
-PREHOOK: type: QUERY
-PREHOOK: Input: default@bucket_nr_acid2
-PREHOOK: Output: default@bucket_nr_acid2
-PREHOOK: query: select * from bucket_nr_acid2 order by a, b
-PREHOOK: type: QUERY
-PREHOOK: Input: default@bucket_nr_acid2
-PREHOOK: Output: hdfs://### HDFS PATH ###
-0      -1
-0      -1
-1      -1
-1      -1
-2      -1
-2      -1
-3      -1
-3      -1
-PREHOOK: query: drop table bucket_nr_acid2
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@bucket_nr_acid2
-PREHOOK: Output: default@bucket_nr_acid2

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
index fb9a8e1..7dc0a1f 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
@@ -146,6 +146,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -255,6 +256,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -304,6 +306,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -450,6 +453,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -499,6 +503,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
index f0ebfaa..f577e19 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
@@ -130,6 +130,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -239,6 +240,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -288,6 +290,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -434,6 +437,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -483,6 +487,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
index a1fde02..5eda44b 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
@@ -130,6 +130,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -177,6 +178,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -286,6 +288,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -431,6 +434,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
index da30743..7dd8e70 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -146,6 +146,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -193,6 +194,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -302,6 +304,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -447,6 +450,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
index cf263be..61501be 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -147,6 +147,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -169,6 +170,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -285,6 +287,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -307,6 +310,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
index 889ef90..c761efc 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -190,6 +190,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -239,6 +240,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -383,6 +385,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -432,6 +435,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
index 81811e7..2c4aeac 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -163,6 +163,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -210,6 +211,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -319,6 +321,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -368,6 +371,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -516,6 +520,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -565,6 +570,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketcontext_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out 
b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
index ae07508..55a7948 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -163,6 +163,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -210,6 +211,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -319,6 +321,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -368,6 +371,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -516,6 +520,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -565,6 +570,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
index 381a691..7fee7c2 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
@@ -180,6 +180,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -226,6 +227,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -326,6 +328,7 @@ STAGE PLANS:
               properties:
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -374,6 +377,7 @@ STAGE PLANS:
               properties:
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
index a2c35d8..206de59 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
@@ -188,6 +188,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -234,6 +235,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -342,6 +344,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -390,6 +393,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -521,6 +525,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -567,6 +572,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -675,6 +681,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -723,6 +730,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
index d58e959..64eb6a2 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
@@ -148,6 +148,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 
@@ -256,6 +257,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -381,6 +383,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -481,6 +484,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
index 406cca4..416e316 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
@@ -117,6 +117,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -218,6 +219,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -267,6 +269,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -397,6 +400,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -506,6 +510,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -641,6 +646,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -750,6 +756,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -885,6 +892,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -994,6 +1002,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name value
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
index 1ac8451..5ed02e7 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
@@ -253,6 +253,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -326,6 +327,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -374,6 +376,7 @@ STAGE PLANS:
               properties:
                 bucket_count 4
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -442,6 +445,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -485,6 +489,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -515,6 +520,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -536,6 +542,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -572,6 +579,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -602,6 +610,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -623,6 +632,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -845,6 +855,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -918,6 +929,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -966,6 +978,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1034,6 +1047,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -1077,6 +1091,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -1107,6 +1122,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -1128,6 +1144,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -1164,6 +1181,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -1194,6 +1212,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -1215,6 +1234,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
index 633d830..d0b1dde 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
@@ -114,6 +114,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -222,6 +223,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -356,6 +358,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name value
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -464,6 +467,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
index f8ce494..24a24e9 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
@@ -122,6 +122,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -222,6 +223,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -389,6 +391,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -489,6 +492,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
index e209dca..7c560d2 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
@@ -125,6 +125,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 3
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -193,6 +194,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -241,6 +243,7 @@ STAGE PLANS:
             properties:
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -262,6 +265,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -331,6 +335,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -374,6 +379,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -404,6 +410,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -425,6 +432,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -461,6 +469,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -491,6 +500,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -512,6 +522,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
index eeb4d3d..1260a58 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
@@ -134,6 +134,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -180,6 +181,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -256,6 +258,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -304,6 +307,7 @@ STAGE PLANS:
             properties:
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -325,6 +329,7 @@ STAGE PLANS:
               properties:
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -394,6 +399,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -437,6 +443,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -467,6 +474,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -488,6 +496,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -524,6 +533,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value1,value2
                     columns.comments 
@@ -554,6 +564,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value1,value2
               columns.comments 
@@ -575,6 +586,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
index be6525a..498837c 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
@@ -242,6 +242,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -264,6 +265,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -390,6 +392,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name value
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -412,6 +415,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name value
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -530,6 +534,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -552,6 +557,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -670,6 +676,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -692,6 +699,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -810,6 +818,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -832,6 +841,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -950,6 +960,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -972,6 +983,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1090,6 +1102,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name value
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -1112,6 +1125,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name value
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1230,6 +1244,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name value
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -1252,6 +1267,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name value
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1370,6 +1386,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 3
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -1392,6 +1409,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 3
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

Reply via email to