http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/sample6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/sample6.q.out 
b/ql/src/test/results/clientpositive/spark/sample6.q.out
index 1b49bd3..95ff3ce 100644
--- a/ql/src/test/results/clientpositive/spark/sample6.q.out
+++ b/ql/src/test/results/clientpositive/spark/sample6.q.out
@@ -52,6 +52,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 
@@ -83,6 +84,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 
@@ -105,6 +107,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 
@@ -136,6 +139,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 
@@ -180,172 +184,175 @@ 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
+17     val_17
+21     val_22
+21     val_22
+21     val_22
+21     val_22
+27     val_27
+30     val_30
+30     val_31
+31     val_32
 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
+51     val_51
+51     val_51
+51     val_52
+57     val_57
+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
+65     val_65
+65     val_66
+65     val_66
+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
+83     val_83
+83     val_83
+86     val_86
+86     val_87
+90     val_90
+90     val_90
+90     val_90
+91     val_92
+98     val_98
+98     val_98
+105    val_105
+105    val_106
+105    val_106
+110    val_111
+113    val_113
+113    val_113
 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
+117    val_118
+117    val_118
+119    val_119
+119    val_119
+119    val_119
+119    val_120
+119    val_120
+119    val_120
+121    val_122
+121    val_122
+123    val_124
+123    val_124
+126    val_126
+126    val_127
+126    val_127
+134    val_134
+134    val_134
+134    val_135
+137    val_137
+137    val_137
+137    val_138
+153    val_153
+153    val_154
+153    val_154
 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
+157    val_157
+157    val_158
+157    val_158
+158    val_158
+163    val_163
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
+177    val_178
+177    val_178
+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
+187    val_187
+187    val_187
+187    val_187
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+197    val_198
+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
+221    val_221
+221    val_221
+229    val_229
+229    val_229
+237    val_237
+237    val_237
+243    val_244
+243    val_244
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-248    val_248
-248    val_249
+249    val_249
+249    val_250
+249    val_250
 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
+271    val_272
 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
+289    val_289
+289    val_290
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-300    val_301
-300    val_301
 304    val_305
+307    val_307
+307    val_307
 308    val_308
 308    val_309
 308    val_309
+315    val_315
 316    val_316
 316    val_316
 316    val_316
-324    val_325
-328    val_329
-328    val_329
-332    val_332
+317    val_317
+317    val_317
+317    val_318
+326    val_327
+327    val_327
+327    val_327
+327    val_327
+334    val_335
 336    val_336
 336    val_337
-340    val_341
+338    val_338
+338    val_339
+339    val_339
+342    val_342
+342    val_342
+342    val_343
 344    val_344
 344    val_344
 344    val_345
@@ -355,80 +362,97 @@ POSTHOOK: Input: default@dest1
 348    val_348
 348    val_348
 348    val_349
+349    val_350
+349    val_350
+349    val_350
+349    val_350
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
+353    val_353
+353    val_353
+353    val_354
+355    val_356
+355    val_356
 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
+369    val_369
+369    val_369
+369    val_369
+369    val_370
+371    val_372
+371    val_372
+371    val_372
+371    val_372
+377    val_377
+378    val_378
+378    val_379
+391    val_392
+391    val_392
 392    val_392
 392    val_393
 392    val_393
 396    val_396
 396    val_396
 396    val_396
-400    val_400
+399    val_399
+399    val_399
+399    val_400
+399    val_400
+402    val_402
+402    val_403
+402    val_403
+402    val_403
 404    val_404
 404    val_404
 404    val_405
 404    val_405
 404    val_405
+407    val_407
+407    val_408
+407    val_408
+407    val_408
 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
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+423    val_424
+426    val_427
+427    val_427
+427    val_428
+427    val_428
 440    val_441
 440    val_441
-444    val_444
-448    val_448
-448    val_449
+449    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
+463    val_463
+463    val_463
+463    val_464
+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
+479    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
+497    val_497
+497    val_498
+497    val_498
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 
4 OUT OF 4 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -480,6 +504,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 
@@ -502,6 +527,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 
@@ -567,147 +593,186 @@ 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
+12     val_12
+12     val_12
+12     val_13
 15     val_15
 15     val_15
 15     val_16
 15     val_16
-19     val_19
-19     val_20
+16     val_17
+16     val_17
+22     val_23
 23     val_24
-27     val_27
-31     val_32
+24     val_24
+24     val_24
+28     val_28
+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
+42     val_42
+42     val_42
+42     val_43
+42     val_43
+42     val_43
+44     val_44
 47     val_47
 47     val_48
-51     val_51
-51     val_51
-51     val_52
-59     val_60
+49     val_50
+49     val_50
+50     val_51
+52     val_53
+52     val_53
+52     val_53
+52     val_53
+53     val_53
+53     val_54
+56     val_57
 63     val_64
-67     val_67
-67     val_67
-71     val_72
 75     val_76
-83     val_83
-83     val_83
+76     val_76
+76     val_76
+76     val_77
+76     val_77
+76     val_77
 87     val_87
 87     val_88
 87     val_88
-91     val_92
+94     val_95
 95     val_95
 95     val_95
-99     val_100
-103    val_103
-103    val_103
+104    val_104
+104    val_104
+104    val_105
+104    val_105
+104    val_105
 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
+114    val_114
+114    val_115
+114    val_115
+114    val_115
+125    val_125
+125    val_125
+125    val_126
+129    val_129
+129    val_129
+129    val_130
+129    val_130
+138    val_138
+138    val_138
+138    val_138
+138    val_138
+138    val_139
+138    val_139
+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
+166    val_166
 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
+168    val_168
+168    val_169
+170    val_170
+170    val_171
+172    val_172
+172    val_172
+172    val_173
+180    val_180
+192    val_192
+192    val_193
+193    val_193
+193    val_193
+193    val_193
+196    val_196
+196    val_197
+196    val_197
+196    val_197
 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
+224    val_224
+224    val_224
+224    val_225
 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
+242    val_242
+242    val_242
+242    val_243
+245    val_246
+245    val_246
+257    val_257
+257    val_258
+257    val_258
+258    val_258
+258    val_259
 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
+268    val_269
+273    val_273
+273    val_273
+273    val_273
+273    val_274
+274    val_274
+274    val_275
+278    val_278
+278    val_278
+278    val_279
+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
+300    val_301
+300    val_301
 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
+318    val_318
+318    val_318
+318    val_318
+318    val_319
+322    val_322
+322    val_322
+322    val_323
+330    val_331
 331    val_331
 331    val_331
 331    val_332
@@ -715,97 +780,91 @@ 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
+356    val_356
+356    val_357
+356    val_357
+358    val_359
 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
+382    val_382
+382    val_382
+382    val_383
+382    val_383
+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
-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
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_407
+412    val_413
+412    val_413
 415    val_416
-419    val_419
-423    val_424
-427    val_427
-427    val_428
-427    val_428
+416    val_417
+418    val_418
+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
+436    val_436
+436    val_437
+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
+448    val_448
+448    val_449
+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
 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
+492    val_492
+492    val_492
+492    val_493
+492    val_493
+494    val_494
+494    val_495
+494    val_495
 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 
1 OUT OF 2 on key) s
 ORDER BY key, value
 PREHOOK: type: QUERY
@@ -857,6 +916,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 
@@ -879,6 +939,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 
@@ -944,205 +1005,188 @@ 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
+3      val_4
 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
+17     val_17
+19     val_19
+19     val_20
 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
+21     val_22
+21     val_22
+21     val_22
+21     val_22
+27     val_27
+29     val_30
+29     val_30
 30     val_30
 30     val_31
-32     val_33
-34     val_34
+31     val_32
 40     val_41
 40     val_41
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-44     val_44
+41     val_41
+43     val_43
 46     val_47
 48     val_49
 48     val_49
-50     val_51
-52     val_53
-52     val_53
-52     val_53
-52     val_53
+51     val_51
+51     val_51
+51     val_52
 54     val_54
-56     val_57
+57     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
+59     val_60
 60     val_61
-62     val_63
-62     val_63
+61     val_62
 64     val_64
-66     val_66
+65     val_65
+65     val_66
+65     val_66
+67     val_67
+67     val_67
 68     val_69
+69     val_69
+69     val_70
 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
+77     val_77
+77     val_78
+77     val_78
 80     val_80
 80     val_81
-82     val_82
-82     val_83
-82     val_83
+83     val_83
+83     val_83
 84     val_84
 84     val_84
+85     val_85
+85     val_86
 86     val_86
 86     val_87
+89     val_90
+89     val_90
+89     val_90
 90     val_90
 90     val_90
 90     val_90
-92     val_92
-94     val_95
+91     val_92
+93     val_94
+93     val_94
+93     val_94
 96     val_96
+97     val_97
+97     val_97
+97     val_98
+97     val_98
 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
+99     val_100
+101    val_102
+105    val_105
+105    val_106
+105    val_106
 106    val_107
 110    val_111
-114    val_114
-114    val_115
-114    val_115
-114    val_115
+113    val_113
+113    val_113
 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
+117    val_118
+117    val_118
+119    val_119
+119    val_119
+119    val_119
+119    val_120
+119    val_120
+119    val_120
+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
 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
+135    val_136
+135    val_136
+135    val_136
+137    val_137
+137    val_137
+137    val_138
 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
+149    val_149
+149    val_149
+149    val_150
+153    val_153
+153    val_154
+153    val_154
 156    val_156
 156    val_157
 156    val_157
+157    val_157
+157    val_158
+157    val_158
 158    val_158
-160    val_160
-160    val_161
 162    val_162
 162    val_163
+163    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
+165    val_165
+165    val_165
+165    val_166
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
+177    val_178
+177    val_178
 178    val_178
 178    val_179
 178    val_179
-180    val_180
+181    val_181
 182    val_183
 184    val_185
-186    val_186
+185    val_186
+187    val_187
+187    val_187
+187    val_187
 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
+191    val_191
+191    val_191
+191    val_192
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+197    val_198
+199    val_199
+199    val_199
+199    val_199
+199    val_200
+201    val_201
 202    val_202
-204    val_205
 206    val_207
 206    val_207
 206    val_207
@@ -1151,95 +1195,80 @@ POSTHOOK: Input: default@srcbucket
 208    val_208
 212    val_213
 214    val_214
+215    val_216
 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
+221    val_221
+221    val_221
 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
+229    val_229
+229    val_229
+231    val_232
+233    val_233
+233    val_233
+237    val_237
+237    val_237
 238    val_238
 238    val_238
 238    val_239
+239    val_239
+239    val_239
+239    val_240
+239    val_240
 240    val_241
-242    val_242
-242    val_242
-242    val_243
+243    val_244
+243    val_244
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-246    val_247
-246    val_247
 248    val_248
 248    val_249
+249    val_249
+249    val_250
+249    val_250
 252    val_252
 252    val_253
 254    val_255
+255    val_255
+255    val_255
 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
+261    val_262
 266    val_266
-268    val_269
+271    val_272
 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
+287    val_287
+287    val_288
+287    val_288
+289    val_289
+289    val_290
+291    val_291
+291    val_292
+291    val_292
 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
+307    val_307
+307    val_307
 308    val_308
 308    val_309
 308    val_309
@@ -1247,63 +1276,83 @@ POSTHOOK: Input: default@srcbucket
 310    val_311
 310    val_311
 310    val_311
-314    val_315
+311    val_311
+311    val_311
+311    val_311
+313    val_314
+315    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
+317    val_317
+317    val_317
+317    val_318
 324    val_325
+325    val_325
+325    val_325
 326    val_327
-328    val_329
-328    val_329
-330    val_331
+327    val_327
+327    val_327
+327    val_327
 332    val_332
 334    val_335
 336    val_336
 336    val_337
+337    val_338
 338    val_338
 338    val_339
-340    val_341
+339    val_339
+341    val_341
+341    val_342
+341    val_342
+341    val_342
 342    val_342
 342    val_342
 342    val_343
+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
+349    val_350
+349    val_350
+349    val_350
+349    val_350
+351    val_351
+351    val_352
+351    val_352
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
-358    val_359
+353    val_353
+353    val_353
+353    val_354
+355    val_356
+355    val_356
 360    val_360
 360    val_361
 362    val_362
 364    val_364
 364    val_365
-366    val_366
+365    val_365
 368    val_368
-374    val_374
-374    val_375
-376    val_377
+369    val_369
+369    val_369
+369    val_369
+369    val_370
+371    val_372
+371    val_372
+371    val_372
+371    val_372
+377    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
@@ -1314,18 +1363,24 @@ POSTHOOK: Input: default@srcbucket
 386    val_387
 386    val_387
 388    val_389
-390    val_391
-390    val_391
-390    val_391
+391    val_392
+391    val_392
 392    val_392
 392    val_393
 392    val_393
+393    val_393
+393    val_394
+393    val_394
 394    val_394
 396    val_396
 396    val_396
 396    val_396
-398    val_399
-400    val_400
+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
@@ -1335,25 +1390,36 @@ 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
+407    val_407
+407    val_408
+407    val_408
+407    val_408
 408    val_409
 408    val_409
+409    val_409
+409    val_409
+409    val_409
+409    val_410
+409    val_410
 410    val_411
-412    val_413
-412    val_413
+411    val_411
+411    val_412
 414    val_414
 414    val_414
 414    val_415
-416    val_417
-418    val_418
-424    val_424
-424    val_424
-424    val_425
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+421    val_422
+421    val_422
+423    val_424
+425    val_426
 426    val_427
+427    val_427
+427    val_428
+427    val_428
 428    val_429
 430    val_430
 430    val_430
@@ -1361,25 +1427,24 @@ 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
+435    val_435
+435    val_436
+437    val_437
+437    val_438
 440    val_441
 440    val_441
-442    val_443
+443    val_443
+443    val_444
+443    val_444
+443    val_444
 444    val_444
 446    val_446
 446    val_447
 446    val_447
-448    val_448
-448    val_449
-450    val_451
-450    val_451
+449    val_449
 452    val_452
+453    val_453
+453    val_454
 454    val_454
 454    val_454
 454    val_454
@@ -1387,23 +1452,19 @@ 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
+459    val_459
+459    val_459
+459    val_460
+463    val_463
+463    val_463
+463    val_464
 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
+467    val_467
+467    val_468
 472    val_472
+473    val_474
 474    val_475
 474    val_475
 476    val_477
@@ -1412,6 +1473,7 @@ POSTHOOK: Input: default@srcbucket
 478    val_478
 478    val_479
 478    val_479
+479    val_479
 480    val_480
 480    val_480
 480    val_480
@@ -1419,21 +1481,23 @@ POSTHOOK: Input: default@srcbucket
 480    val_481
 482    val_482
 482    val_483
+483    val_483
 484    val_484
 484    val_485
-486    val_487
+485    val_485
+485    val_486
+485    val_486
 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
+491    val_491
+491    val_492
+491    val_492
+495    val_495
+495    val_496
+497    val_497
+497    val_498
+497    val_498
 498    val_498
 498    val_498
 498    val_498
@@ -1487,6 +1551,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 
@@ -1509,6 +1574,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 
@@ -1574,24 +1640,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
@@ -1599,265 +1657,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
+286    val_286
+286    val_287
+287    val_287
+287    val_288
+287    val_288
 288    val_288
 288    val_288
-291    val_291
-291    val_292
-291    val_292
+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
-303    val_304
-303    val_304
 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
@@ -1865,19 +1960,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
@@ -1885,31 +1985,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
@@ -1960,6 +2068,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 
@@ -1982,6 +2091,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 
@@ -2047,91 +2157,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
@@ -2139,144 +2283,107 @@ 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
@@ -2284,52 +2391,46 @@ POSTHOOK: Input: default@srcbucket
 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
+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
@@ -2338,37 +2439,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
@@ -2420,6 +2525,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 
@@ -2442,6 +2548,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 
@@ -2468,6 +2575,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 
@@ -2490,6 +2598,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 
@@ -2556,104 +2665,93 @@ 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
+17     val_17
+19     val_19
 20     val_20
-24     val_24
-24     val_24
-26     val_26
-26     val_26
-28     val_28
+27     val_27
 30     val_30
-34     val_34
-42     val_42
-42     val_42
-44     val_44
+41     val_41
+43     val_43
+51     val_51
+51     val_51
 54     val_54
+57     val_57
 58     val_58
 58     val_58
 64     val_64
-66     val_66
+65     val_65
+67     val_67
+67     val_67
+69     val_69
 70     val_70
 70     val_70
 70     val_70
-72     val_72
-72     val_72
-74     val_74
-76     val_76
-76     val_76
-78     val_78
+77     val_77
 80     val_80
-82     val_82
+83     val_83
+83     val_83
 84     val_84
 84     val_84
+85     val_85
 86     val_86
 90     val_90
 90     val_90
 90     val_90
-92     val_92
 96     val_96
+97     val_97
+97     val_97
 98     val_98
 98     val_98
-100    val_100
-100    val_100
-104    val_104
-104    val_104
-114    val_114
+105    val_105
+113    val_113
+113    val_113
 116    val_116
-118    val_118
-118    val_118
-120    val_120
-120    val_120
+119    val_119
+119    val_119
+119    val_119
 126    val_126
-128    val_128
-128    val_128
-128    val_128
+133    val_133
 134    val_134
 134    val_134
-136    val_136
-138    val_138
-138    val_138
-138    val_138
-138    val_138
+137    val_137
+137    val_137
 146    val_146
 146    val_146
-150    val_150
-152    val_152
-152    val_152
+149    val_149
+149    val_149
+153    val_153
 156    val_156
+157    val_157
 158    val_158
-160    val_160
 162    val_162
+163    val_163
 164    val_164
 164    val_164
-166    val_166
-168    val_168
-170    val_170
-172    val_172
-172    val_172
-174    val_174
-174    val_174
-176    val_176
-176    val_176
+165    val_165
+165    val_165
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
 178    val_178
-180    val_180
-186    val_186
+181    val_181
+187    val_187
+187    val_187
+187    val_187
 190    val_190
-192    val_192
-194    val_194
-196    val_196
-200    val_200
-200    val_200
+191    val_191
+191    val_191
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+199    val_199
+199    val_199
+199    val_199
+201    val_201
 202    val_202
 208    val_208
 208    val_208
@@ -2661,63 +2759,60 @@ 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
+221    val_221
+221    val_221
 226    val_226
-228    val_228
-230    val_230
-230    val_230
-230    val_230
-230    val_230
-230    val_230
+229    val_229
+229    val_229
+233    val_233
+233    val_233
+237    val_237
+237    val_237
 238    val_238
 238    val_238
-242    val_242
-242    val_242
+239    val_239
+239    val_239
 244    val_244
 248    val_248
+249    val_249
 252    val_252
+255    val_255
+255    val_255
 256    val_256
 256    val_256
-258    val_258
 260    val_260
-262    val_262
 266    val_266
 272    val_272
 272    val_272
-274    val_274
-278    val_278
-278    val_278
-280    val_280
-280    val_280
-282    val_282
-282    val_282
 284    val_284
 286    val_286
-288    val_288
-288    val_288
+287    val_287
+289    val_289
+291    val_291
 292    val_292
-296    val_296
-298    val_298
-298    val_298
-298    val_298
-302    val_302
-306    val_306
+307    val_307
+307    val_307
 308    val_308
 310    val_310
+311    val_311
+311    val_311
+311    val_311
+315    val_315
 316    val_316
 316    val_316
 316    val_316
-318    val_318
-318    val_318
-318    val_318
-322    val_322
-322    val_322
+317    val_317
+317    val_317
+325    val_325
+325    val_325
+327    val_327
+327    val_327
+327    val_327
 332    val_332
 336    val_336
 338    val_338
+339    val_339
+341    val_341
 342    val_342
 342    val_342
 344    val_344
@@ -2727,79 +2822,89 @@ POSTHOOK: Input: default@srcbucket2
 348    val_348
 348    val_348
 348    val_348
-356    val_356
+351    val_351
+353    val_353
+353    val_353
 360    val_360
 362    val_362
 364    val_364
-366    val_366
+365    val_365
 368    val_368
-374    val_374
+369    val_369
+369    val_369
+369    val_369
+377    val_377
 378    val_378
-382    val_382
-382    val_382
 384    val_384
 384    val_384
 384    val_384
 386    val_386
 392    val_392
+393    val_393
 394    val_394
 396    val_396
 396    val_396
 396    val_396
-400    val_400
+397    val_397
+397    val_397
+399    val_399
+399    val_399
 402    val_402
 404    val_404
 404    val_404
-406    val_406
-406    val_406
-406    val_406
-406    val_406
+407    val_407
+409    val_409
+409    val_409
+409    val_409
+411    val_411
 414    val_414
 414    val_414
-418    val_418
-424    val_424
-424    val_424
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+427    val_427
 430    val_430
 430    val_430
 430    val_430
 432    val_432
-436    val_436
-438    val_438
-438    val_438
-438    val_438
+435    val_435
+437    val_437
+443    val_443
 444    val_444
 446    val_446
-448    val_448
+449    val_449
 452    val_452
+453    val_453
 454    val_454
 454    val_454
 454    val_454
 458    val_458
 458    val_458
-460    val_460
-462    val_462
-462    val_462
+459    val_459
+459    val_459
+463    val_463
+463    val_463
 466    val_466
 466    val_466
 466    val_466
-468    val_468
-468    val_468
-468    val_468
-468    val_468
-470    val_470
+467    val_467
 472    val_472
 478    val_478
 478    val_478
+479    val_479
 480    val_480
 480    val_480
 480    val_480
 482    val_482
+483    val_483
 484    val_484
+485    val_485
 490    val_490
-492    val_492
-492    val_492
-494    val_494
-496    val_496
+491    val_491
+495    val_495
+497    val_497
 498    val_498
 498    val_498
 498    val_498
@@ -2854,6 +2959,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 
@@ -2876,6 +2982,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 
@@ -2941,144 +3048,132 @@ 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
+0      val_0
+0      val_0
+0      val_0
+4      val_4
+8      val_8
 9      val_9
-17     val_17
-33     val_33
+11     val_11
+18     val_18
+18     val_18
+26     val_26
+26     val_26
+34     val_34
 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
+66     val_66
+72     val_72
+72     val_72
+74     val_74
+78     val_78
+82     val_82
+92     val_92
+100    val_100
+100    val_100
+103    val_103
+103    val_103
+118    val_118
+118    val_118
+120    val_120
+120    val_120
+128    val_128
+128    val_128
+128    val_128
+131    val_131
+136    val_136
+143    val_143
+150    val_150
+152    val_152
+152    val_152
+155    val_155
+160    val_160
+174    val_174
+174    val_174
+175    val_175
+175    val_175
+176    val_176
+176    val_176
+179    val_179
+179    val_179
+183    val_183
+186    val_186
 189    val_189
-193    val_193
-193    val_193
-193    val_193
-197    val_197
-197    val_197
-201    val_201
+194    val_194
+200    val_200
+200    val_200
 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
+218    val_218
+222    val_222
+223    val_223
+223    val_223
+228    val_228
+230    val_230
+230    val_230
+230    val_230
+230    val_230
+230    val_230
+235    val_235
+247    val_247
+262    val_262
+275    val_275
 277    val_277
 277    val_277
 277    val_277
 277    val_277
-281    val_281
-281    val_281
+280    val_280
+280    val_280
+282    val_282
+282    val_282
 285    val_285
-289    val_289
+288    val_288
+288    val_288
+296    val_296
+298    val_298
+298    val_298
+298    val_298
+302    val_302
 305    val_305
+306    val_306
 309    val_309
 309    val_309
-317    val_317
-317    val_317
 321    val_321
 321    val_321
-325    val_325
-325    val_325
+323    val_323
 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
+366    val_366
+374    val_374
+375    val_375
 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
+400    val_400
 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
+424    val_424
+424    val_424
+438    val_438
+438    val_438
+438    val_438
+439    val_439
+439    val_439
+455    val_455
 457    val_457
+460    val_460
+462    val_462
+462    val_462
 469    val_469
 469    val_469
 469    val_469
 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
+487    val_487
 493    val_493
-497    val_497
+496    val_496
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/sample7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/sample7.q.out 
b/ql/src/test/results/clientpositive/spark/sample7.q.out
index 98c2d92..96dc5cc 100644
--- a/ql/src/test/results/clientpositive/spark/sample7.q.out
+++ b/ql/src/test/results/clientpositive/spark/sample7.q.out
@@ -53,6 +53,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 
@@ -84,6 +85,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 
@@ -106,6 +108,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 
@@ -137,6 +140,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 
@@ -183,121 +187,130 @@ order by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dest1
 #### A masked pattern was here ####
-104    val_104
-104    val_104
-104    val_105
-104    val_105
-104    val_105
+105    val_105
+105    val_106
+105    val_106
+110    val_111
+113    val_113
+113    val_113
 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
+117    val_118
+117    val_118
+119    val_119
+119    val_119
+119    val_119
+119    val_120
+119    val_120
+119    val_120
+121    val_122
+121    val_122
+123    val_124
+123    val_124
+126    val_126
+126    val_127
+126    val_127
+134    val_134
+134    val_134
+134    val_135
+137    val_137
+137    val_137
+137    val_138
+153    val_153
+153    val_154
+153    val_154
 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
+157    val_157
+157    val_158
+157    val_158
+158    val_158
+163    val_163
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
+177    val_178
+177    val_178
+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
+187    val_187
+187    val_187
+187    val_187
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+197    val_198
+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
+221    val_221
+221    val_221
+229    val_229
+229    val_229
+237    val_237
+237    val_237
+243    val_244
+243    val_244
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-248    val_248
-248    val_249
+249    val_249
+249    val_250
+249    val_250
 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
+271    val_272
 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
+289    val_289
+289    val_290
 292    val_292
 292    val_293
 292    val_293
-296    val_296
-296    val_297
-300    val_301
-300    val_301
 304    val_305
+307    val_307
+307    val_307
 308    val_308
 308    val_309
 308    val_309
+315    val_315
 316    val_316
 316    val_316
 316    val_316
-324    val_325
-328    val_329
-328    val_329
-332    val_332
+317    val_317
+317    val_317
+317    val_318
+326    val_327
+327    val_327
+327    val_327
+327    val_327
+334    val_335
 336    val_336
 336    val_337
-340    val_341
+338    val_338
+338    val_339
+339    val_339
+342    val_342
+342    val_342
+342    val_343
 344    val_344
 344    val_344
 344    val_345
@@ -307,77 +320,94 @@ POSTHOOK: Input: default@dest1
 348    val_348
 348    val_348
 348    val_349
+349    val_350
+349    val_350
+349    val_350
+349    val_350
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
+353    val_353
+353    val_353
+353    val_354
+355    val_356
+355    val_356
 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
+369    val_369
+369    val_369
+369    val_369
+369    val_370
+371    val_372
+371    val_372
+371    val_372
+371    val_372
+377    val_377
+378    val_378
+378    val_379
+391    val_392
+391    val_392
 392    val_392
 392    val_393
 392    val_393
 396    val_396
 396    val_396
 396    val_396
-400    val_400
+399    val_399
+399    val_399
+399    val_400
+399    val_400
+402    val_402
+402    val_403
+402    val_403
+402    val_403
 404    val_404
 404    val_404
 404    val_405
 404    val_405
 404    val_405
+407    val_407
+407    val_408
+407    val_408
+407    val_408
 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
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+423    val_424
+426    val_427
+427    val_427
+427    val_428
+427    val_428
 440    val_441
 440    val_441
-444    val_444
-448    val_448
-448    val_449
+449    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
+463    val_463
+463    val_463
+463    val_464
+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
+479    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
+497    val_497
+497    val_498
+497    val_498

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/sample8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/sample8.q.out 
b/ql/src/test/results/clientpositive/spark/sample8.q.out
index 5e27cb6..96a89b7 100644
--- a/ql/src/test/results/clientpositive/spark/sample8.q.out
+++ b/ql/src/test/results/clientpositive/spark/sample8.q.out
@@ -75,6 +75,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'
@@ -146,6 +147,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'
@@ -194,6 +196,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'
@@ -242,6 +245,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'
@@ -290,6 +294,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'
@@ -380,358 +385,334 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-105    val_105
-105    val_105
-105    val_105
-105    val_105
-114    val_114
-114    val_114
-114    val_114
-114    val_114
-150    val_150
-150    val_150
-150    val_150
-150    val_150
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-169    val_169
-178    val_178
-178    val_178
-178    val_178
-178    val_178
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
-187    val_187
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
+149    val_149
 196    val_196
 196    val_196
 196    val_196
 196    val_196
-2      val_2
-2      val_2
-2      val_2
-2      val_2
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-213    val_213
-222    val_222
-222    val_222
-222    val_222
-222    val_222
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-277    val_277
-286    val_286
-286    val_286
-286    val_286
-286    val_286
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-321    val_321
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
-367    val_367
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+219    val_219
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+238    val_238
+258    val_258
+258    val_258
+258    val_258
+258    val_258
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+280    val_280
+285    val_285
+285    val_285
+285    val_285
+285    val_285
+291    val_291
+291    val_291
+291    val_291
+291    val_291
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+298    val_298
+306    val_306
+306    val_306
+306    val_306
+306    val_306
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+37     val_37
+374    val_374
+374    val_374
+374    val_374
+374    val_374
+377    val_377
+377    val_377
+377    val_377
+377    val_377
 394    val_394
 394    val_394
 394    val_394
 394    val_394
-402    val_402
-402    val_402
-402    val_402
-402    val_402
-411    val_411
-411    val_411
-411    val_411
-411    val_411
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-439    val_439
-448    val_448
-448    val_448
-448    val_448
-448    val_448
-457    val_457
-457    val_457
-457    val_457
-457    val_457
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-466    val_466
-475    val_475
-475    val_475
-475    val_475
-475    val_475
-484    val_484
-484    val_484
-484    val_484
-484    val_484
-493    val_493
-493    val_493
-493    val_493
-493    val_493
-77     val_77
-77     val_77
-77     val_77
-77     val_77
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+406    val_406
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+414    val_414
+444    val_444
+444    val_444
+444    val_444
+444    val_444
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+458    val_458
+485    val_485
+485    val_485
+485    val_485
+485    val_485
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+492    val_492
+66     val_66
+66     val_66
+66     val_66
+66     val_66
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+67     val_67
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+72     val_72
+8      val_8
+8      val_8
+8      val_8
+8      val_8
 86     val_86
 86     val_86
 86     val_86
 86     val_86
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
-95     val_95
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
+97     val_97
 PREHOOK: query: EXPLAIN
 SELECT * FROM src TABLESAMPLE(100 ROWS) a JOIN src1 TABLESAMPLE(10 ROWS) b ON 
a.key=b.key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/sample9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/sample9.q.out 
b/ql/src/test/results/clientpositive/spark/sample9.q.out
index 8283d04..7e648b5 100644
--- a/ql/src/test/results/clientpositive/spark/sample9.q.out
+++ b/ql/src/test/results/clientpositive/spark/sample9.q.out
@@ -38,205 +38,188 @@ 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
+3      val_4
 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
+17     val_17
+19     val_19
+19     val_20
 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
+21     val_22
+21     val_22
+21     val_22
+21     val_22
+27     val_27
+29     val_30
+29     val_30
 30     val_30
 30     val_31
-32     val_33
-34     val_34
+31     val_32
 40     val_41
 40     val_41
-42     val_42
-42     val_42
-42     val_43
-42     val_43
-42     val_43
-44     val_44
+41     val_41
+43     val_43
 46     val_47
 48     val_49
 48     val_49
-50     val_51
-52     val_53
-52     val_53
-52     val_53
-52     val_53
+51     val_51
+51     val_51
+51     val_52
 54     val_54
-56     val_57
+57     val_57
 58     val_58
 58     val_58
 58     val_59
 58     val_59
+59     val_60
 60     val_61
-62     val_63
-62     val_63
+61     val_62
 64     val_64
-66     val_66
+65     val_65
+65     val_66
+65     val_66
+67     val_67
+67     val_67
 68     val_69
+69     val_69
+69     val_70
 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
+77     val_77
+77     val_78
+77     val_78
 80     val_80
 80     val_81
-82     val_82
-82     val_83
-82     val_83
+83     val_83
+83     val_83
 84     val_84
 84     val_84
+85     val_85
+85     val_86
 86     val_86
 86     val_87
+89     val_90
+89     val_90
+89     val_90
 90     val_90
 90     val_90
 90     val_90
-92     val_92
-94     val_95
+91     val_92
+93     val_94
+93     val_94
+93     val_94
 96     val_96
+97     val_97
+97     val_97
+97     val_98
+97     val_98
 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
+99     val_100
+101    val_102
+105    val_105
+105    val_106
+105    val_106
 106    val_107
 110    val_111
-114    val_114
-114    val_115
-114    val_115
-114    val_115
+113    val_113
+113    val_113
 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
+117    val_118
+117    val_118
+119    val_119
+119    val_119
+119    val_119
+119    val_120
+119    val_120
+119    val_120
+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
 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
+135    val_136
+135    val_136
+135    val_136
+137    val_137
+137    val_137
+137    val_138
 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
+149    val_149
+149    val_149
+149    val_150
+153    val_153
+153    val_154
+153    val_154
 156    val_156
 156    val_157
 156    val_157
+157    val_157
+157    val_158
+157    val_158
 158    val_158
-160    val_160
-160    val_161
 162    val_162
 162    val_163
+163    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
+165    val_165
+165    val_165
+165    val_166
+169    val_169
+169    val_169
+169    val_169
+169    val_169
+177    val_177
+177    val_178
+177    val_178
 178    val_178
 178    val_179
 178    val_179
-180    val_180
+181    val_181
 182    val_183
 184    val_185
-186    val_186
+185    val_186
+187    val_187
+187    val_187
+187    val_187
 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
+191    val_191
+191    val_191
+191    val_192
+195    val_195
+195    val_195
+197    val_197
+197    val_197
+197    val_198
+199    val_199
+199    val_199
+199    val_199
+199    val_200
+201    val_201
 202    val_202
-204    val_205
 206    val_207
 206    val_207
 206    val_207
@@ -245,95 +228,80 @@ POSTHOOK: Input: default@srcbucket
 208    val_208
 212    val_213
 214    val_214
+215    val_216
 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
+221    val_221
+221    val_221
 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
+229    val_229
+229    val_229
+231    val_232
+233    val_233
+233    val_233
+237    val_237
+237    val_237
 238    val_238
 238    val_238
 238    val_239
+239    val_239
+239    val_239
+239    val_240
+239    val_240
 240    val_241
-242    val_242
-242    val_242
-242    val_243
+243    val_244
+243    val_244
 244    val_244
 244    val_245
 244    val_245
 244    val_245
-246    val_247
-246    val_247
 248    val_248
 248    val_249
+249    val_249
+249    val_250
+249    val_250
 252    val_252
 252    val_253
 254    val_255
+255    val_255
+255    val_255
 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
+261    val_262
 266    val_266
-268    val_269
+271    val_272
 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
+287    val_287
+287    val_288
+287    val_288
+289    val_289
+289    val_290
+291    val_291
+291    val_292
+291    val_292
 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
+307    val_307
+307    val_307
 308    val_308
 308    val_309
 308    val_309
@@ -341,63 +309,83 @@ POSTHOOK: Input: default@srcbucket
 310    val_311
 310    val_311
 310    val_311
-314    val_315
+311    val_311
+311    val_311
+311    val_311
+313    val_314
+315    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
+317    val_317
+317    val_317
+317    val_318
 324    val_325
+325    val_325
+325    val_325
 326    val_327
-328    val_329
-328    val_329
-330    val_331
+327    val_327
+327    val_327
+327    val_327
 332    val_332
 334    val_335
 336    val_336
 336    val_337
+337    val_338
 338    val_338
 338    val_339
-340    val_341
+339    val_339
+341    val_341
+341    val_342
+341    val_342
+341    val_342
 342    val_342
 342    val_342
 342    val_343
+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
+349    val_350
+349    val_350
+349    val_350
+349    val_350
+351    val_351
+351    val_352
+351    val_352
 352    val_353
 352    val_353
-356    val_356
-356    val_357
-356    val_357
-358    val_359
+353    val_353
+353    val_353
+353    val_354
+355    val_356
+355    val_356
 360    val_360
 360    val_361
 362    val_362
 364    val_364
 364    val_365
-366    val_366
+365    val_365
 368    val_368
-374    val_374
-374    val_375
-376    val_377
+369    val_369
+369    val_369
+369    val_369
+369    val_370
+371    val_372
+371    val_372
+371    val_372
+371    val_372
+377    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
@@ -408,18 +396,24 @@ POSTHOOK: Input: default@srcbucket
 386    val_387
 386    val_387
 388    val_389
-390    val_391
-390    val_391
-390    val_391
+391    val_392
+391    val_392
 392    val_392
 392    val_393
 392    val_393
+393    val_393
+393    val_394
+393    val_394
 394    val_394
 396    val_396
 396    val_396
 396    val_396
-398    val_399
-400    val_400
+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
@@ -429,25 +423,36 @@ 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
+407    val_407
+407    val_408
+407    val_408
+407    val_408
 408    val_409
 408    val_409
+409    val_409
+409    val_409
+409    val_409
+409    val_410
+409    val_410
 410    val_411
-412    val_413
-412    val_413
+411    val_411
+411    val_412
 414    val_414
 414    val_414
 414    val_415
-416    val_417
-418    val_418
-424    val_424
-424    val_424
-424    val_425
+417    val_417
+417    val_417
+417    val_417
+419    val_419
+421    val_421
+421    val_422
+421    val_422
+423    val_424
+425    val_426
 426    val_427
+427    val_427
+427    val_428
+427    val_428
 428    val_429
 430    val_430
 430    val_430
@@ -455,25 +460,24 @@ 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
+435    val_435
+435    val_436
+437    val_437
+437    val_438
 440    val_441
 440    val_441
-442    val_443
+443    val_443
+443    val_444
+443    val_444
+443    val_444
 444    val_444
 446    val_446
 446    val_447
 446    val_447
-448    val_448
-448    val_449
-450    val_451
-450    val_451
+449    val_449
 452    val_452
+453    val_453
+453    val_454
 454    val_454
 454    val_454
 454    val_454
@@ -481,23 +485,19 @@ 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
+459    val_459
+459    val_459
+459    val_460
+463    val_463
+463    val_463
+463    val_464
 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
+467    val_467
+467    val_468
 472    val_472
+473    val_474
 474    val_475
 474    val_475
 476    val_477
@@ -506,6 +506,7 @@ POSTHOOK: Input: default@srcbucket
 478    val_478
 478    val_479
 478    val_479
+479    val_479
 480    val_480
 480    val_480
 480    val_480
@@ -513,21 +514,23 @@ POSTHOOK: Input: default@srcbucket
 480    val_481
 482    val_482
 482    val_483
+483    val_483
 484    val_484
 484    val_485
-486    val_487
+485    val_485
+485    val_486
+485    val_486
 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
+491    val_491
+491    val_492
+491    val_492
+495    val_495
+495    val_496
+497    val_497
+497    val_498
+497    val_498
 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/spark/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out
index ec10c44..0ada54b 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out
@@ -64,6 +64,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        SORTBUCKETCOLSPREFIX    TRUE                
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 0                   
        rawDataSize             0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
index 054905d..125e11f 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
@@ -128,6 +128,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -166,6 +167,7 @@ STAGE PLANS:
                       properties:
                         bucket_count 16
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -197,6 +199,7 @@ STAGE PLANS:
               properties:
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1826,6 +1829,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1898,6 +1902,7 @@ STAGE PLANS:
               properties:
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1936,47 +1941,38 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-17     val_17  1
-33     val_33  1
-65     val_65  1
-97     val_97  1
-97     val_97  1
-113    val_113 1
-113    val_113 1
-129    val_129 1
-129    val_129 1
-145    val_145 1
-177    val_177 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-209    val_209 1
-209    val_209 1
-241    val_241 1
-257    val_257 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-289    val_289 1
-305    val_305 1
+8      val_8   1
+26     val_26  1
+26     val_26  1
+82     val_82  1
+103    val_103 1
+103    val_103 1
+118    val_118 1
+118    val_118 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+176    val_176 1
+176    val_176 1
+194    val_194 1
+275    val_275 1
+280    val_280 1
+280    val_280 1
+282    val_282 1
+282    val_282 1
+309    val_309 1
+309    val_309 1
 321    val_321 1
 321    val_321 1
-353    val_353 1
-353    val_353 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-449    val_449 1
-481    val_481 1
-497    val_497 1
+400    val_400 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+439    val_439 1
+439    val_439 1
+455    val_455 1
+462    val_462 1
+462    val_462 1
 PREHOOK: query: SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -1987,103 +1983,70 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-17     val_17  1
-33     val_33  1
-65     val_65  1
-97     val_97  1
-97     val_97  1
-97     val_97  1
-97     val_97  1
-113    val_113 1
-113    val_113 1
-113    val_113 1
-113    val_113 1
-129    val_129 1
-129    val_129 1
-129    val_129 1
-129    val_129 1
-145    val_145 1
-177    val_177 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-193    val_193 1
-209    val_209 1
-209    val_209 1
-209    val_209 1
-209    val_209 1
-241    val_241 1
-257    val_257 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-273    val_273 1
-289    val_289 1
-305    val_305 1
+8      val_8   1
+26     val_26  1
+26     val_26  1
+26     val_26  1
+26     val_26  1
+82     val_82  1
+103    val_103 1
+103    val_103 1
+103    val_103 1
+103    val_103 1
+118    val_118 1
+118    val_118 1
+118    val_118 1
+118    val_118 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+128    val_128 1
+176    val_176 1
+176    val_176 1
+176    val_176 1
+176    val_176 1
+194    val_194 1
+275    val_275 1
+280    val_280 1
+280    val_280 1
+280    val_280 1
+280    val_280 1
+282    val_282 1
+282    val_282 1
+282    val_282 1
+282    val_282 1
+309    val_309 1
+309    val_309 1
+309    val_309 1
+309    val_309 1
 321    val_321 1
 321    val_321 1
 321    val_321 1
 321    val_321 1
-353    val_353 1
-353    val_353 1
-353    val_353 1
-353    val_353 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-369    val_369 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-401    val_401 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-417    val_417 1
-449    val_449 1
-481    val_481 1
-497    val_497 1
+400    val_400 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+438    val_438 1
+439    val_439 1
+439    val_439 1
+439    val_439 1
+439    val_439 1
+455    val_455 1
+462    val_462 1
+462    val_462 1
+462    val_462 1
+462    val_462 1
 PREHOOK: query: SELECT COUNT(*) FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 
16) a JOIN test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND 
a.ds = '1' AND b.ds='1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
@@ -2098,4 +2061,4 @@ POSTHOOK: Input: default@test_table1@ds=1
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-293
+140

Reply via email to