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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample7.q.out b/ql/src/test/results/clientpositive/sample7.q.out
index f24f297..07b6f0e 100644
--- a/ql/src/test/results/clientpositive/sample7.q.out
+++ b/ql/src/test/results/clientpositive/sample7.q.out
@@ -55,6 +55,7 @@ STAGE PLANS:
                       properties:
                         COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                         bucket_count -1
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -102,6 +103,7 @@ STAGE PLANS:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count 2
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -124,6 +126,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -193,6 +196,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -236,6 +240,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -266,6 +271,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -287,6 +293,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -323,6 +330,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -353,6 +361,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -374,6 +383,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -424,107 +434,48 @@ 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
+110	val_111
 116	val_116
 116	val_117
-120	val_120
-120	val_120
-120	val_121
-128	val_128
-128	val_128
-128	val_128
-128	val_129
-128	val_129
-132	val_133
-132	val_133
-136	val_136
-136	val_137
-140	val_141
-144	val_145
-152	val_152
-152	val_152
-152	val_153
-152	val_153
-152	val_153
+126	val_126
+126	val_127
+126	val_127
+134	val_134
+134	val_134
+134	val_135
 156	val_156
 156	val_157
 156	val_157
-160	val_160
-160	val_161
-164	val_164
-164	val_164
-164	val_165
-164	val_165
-168	val_168
-168	val_169
-172	val_172
-172	val_172
-172	val_173
-176	val_176
-176	val_176
-180	val_180
+158	val_158
+178	val_178
+178	val_179
+178	val_179
 184	val_185
-192	val_192
-192	val_193
-196	val_196
-196	val_197
-196	val_197
-196	val_197
-200	val_200
-200	val_200
-204	val_205
+206	val_207
+206	val_207
+206	val_207
 208	val_208
 208	val_208
 208	val_208
-212	val_213
-216	val_216
-216	val_216
-216	val_217
-224	val_224
-224	val_224
-224	val_225
-228	val_228
-228	val_229
-240	val_241
 244	val_244
 244	val_245
 244	val_245
 244	val_245
-248	val_248
-248	val_249
 252	val_252
 252	val_253
+254	val_255
 256	val_256
 256	val_256
 256	val_257
-260	val_260
-260	val_261
-260	val_261
-264	val_265
-264	val_265
-268	val_269
+266	val_266
 272	val_272
 272	val_272
 272	val_273
-276	val_277
-280	val_280
-280	val_280
-284	val_284
-284	val_285
-284	val_285
-288	val_288
-288	val_288
+286	val_286
+286	val_287
 292	val_292
 292	val_293
 292	val_293
-296	val_296
-296	val_297
-300	val_301
-300	val_301
 304	val_305
 308	val_308
 308	val_309
@@ -532,13 +483,15 @@ POSTHOOK: Input: default@dest1
 316	val_316
 316	val_316
 316	val_316
-324	val_325
-328	val_329
-328	val_329
-332	val_332
+326	val_327
+334	val_335
 336	val_336
 336	val_337
-340	val_341
+338	val_338
+338	val_339
+342	val_342
+342	val_342
+342	val_343
 344	val_344
 344	val_344
 344	val_345
@@ -550,29 +503,23 @@ POSTHOOK: Input: default@dest1
 348	val_349
 352	val_353
 352	val_353
-356	val_356
-356	val_357
-356	val_357
 360	val_360
 360	val_361
+362	val_362
 364	val_364
 364	val_365
-368	val_368
-376	val_377
-384	val_384
-384	val_384
-384	val_384
-384	val_385
-384	val_385
-384	val_385
-388	val_389
+378	val_378
+378	val_379
 392	val_392
 392	val_393
 392	val_393
 396	val_396
 396	val_396
 396	val_396
-400	val_400
+402	val_402
+402	val_403
+402	val_403
+402	val_403
 404	val_404
 404	val_404
 404	val_405
@@ -580,45 +527,24 @@ POSTHOOK: Input: default@dest1
 404	val_405
 408	val_409
 408	val_409
-412	val_413
-412	val_413
-416	val_417
-424	val_424
-424	val_424
-424	val_425
-428	val_429
-432	val_432
-432	val_433
-436	val_436
-436	val_437
+410	val_411
+426	val_427
 440	val_441
 440	val_441
-444	val_444
-448	val_448
-448	val_449
 452	val_452
-460	val_460
-468	val_468
-468	val_468
-468	val_468
-468	val_468
-468	val_469
-468	val_469
-468	val_469
+458	val_458
+458	val_458
+466	val_466
+466	val_466
+466	val_466
 472	val_472
 476	val_477
 476	val_477
-480	val_480
-480	val_480
-480	val_480
-480	val_481
-480	val_481
+478	val_478
+478	val_478
+478	val_479
+478	val_479
+482	val_482
+482	val_483
 484	val_484
 484	val_485
-488	val_489
-492	val_492
-492	val_492
-492	val_493
-492	val_493
-496	val_496
-496	val_497

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
index 24a1f66..b51cd5c 100644
--- a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out
@@ -81,6 +81,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	1500                
 	rawDataSize         	18124               

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/serde_user_properties.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/serde_user_properties.q.out b/ql/src/test/results/clientpositive/serde_user_properties.q.out
index c7269cc..964328f 100644
--- a/ql/src/test/results/clientpositive/serde_user_properties.q.out
+++ b/ql/src/test/results/clientpositive/serde_user_properties.q.out
@@ -99,6 +99,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 'default','default'
@@ -120,6 +121,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -227,6 +229,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 'default','default'
@@ -249,6 +252,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'
@@ -357,6 +361,7 @@ STAGE PLANS:
             properties:
               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
               bucket_count -1
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 'default','default'
@@ -379,6 +384,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 'default','default'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_alter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_alter.q.out b/ql/src/test/results/clientpositive/show_create_table_alter.q.out
index 6023f47..74be374 100644
--- a/ql/src/test/results/clientpositive/show_create_table_alter.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_alter.q.out
@@ -31,6 +31,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE')
 PREHOOK: type: ALTERTABLE_PROPERTIES
@@ -65,6 +66,7 @@ LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
   'EXTERNAL'='FALSE', 
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE')
 PREHOOK: type: ALTERTABLE_PROPERTIES
@@ -98,6 +100,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE')
 PREHOOK: type: ALTERTABLE_PROPERTIES
@@ -131,6 +134,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler')
 PREHOOK: type: ALTERTABLE_PROPERTIES
@@ -164,6 +168,7 @@ WITH SERDEPROPERTIES (
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
index f31da65..33410c8 100644
--- a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out
@@ -58,6 +58,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt2
 PREHOOK: type: SHOW_CREATETABLE
@@ -79,6 +80,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt3
 PREHOOK: type: SHOW_CREATETABLE
@@ -101,6 +103,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_feng.tmp_showcrt1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
index 9fb35c5..ad58bf6 100644
--- a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out
@@ -39,6 +39,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
index 3e850aa..bb2c6c7 100644
--- a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out
@@ -31,6 +31,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_serde.q.out b/ql/src/test/results/clientpositive/show_create_table_serde.q.out
index d98bf00..aa93fa1 100644
--- a/ql/src/test/results/clientpositive/show_create_table_serde.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_serde.q.out
@@ -36,6 +36,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE
@@ -81,6 +82,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE
@@ -128,6 +130,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE
@@ -170,6 +173,7 @@ WITH SERDEPROPERTIES (
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
+  'bucketing_version'='2', 
 #### A masked pattern was here ####
 PREHOOK: query: DROP TABLE tmp_showcrt1
 PREHOOK: type: DROPTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out b/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out
index d98225a..bf25602 100644
--- a/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out
+++ b/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out
@@ -30,7 +30,7 @@ OUTPUTFORMAT
 LOCATION
 #### A masked pattern was here ####
 TBLPROPERTIES (
-)
+  'bucketing_version'='2')
 PREHOOK: query: drop table tmp1
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: drop table tmp1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_functions.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_functions.q.out b/ql/src/test/results/clientpositive/show_functions.q.out
index 4df555b..02b956b 100644
--- a/ql/src/test/results/clientpositive/show_functions.q.out
+++ b/ql/src/test/results/clientpositive/show_functions.q.out
@@ -164,6 +164,7 @@ minute
 mod
 month
 months_between
+murmur_hash
 named_struct
 negative
 next_day
@@ -422,6 +423,7 @@ minute
 mod
 month
 months_between
+murmur_hash
 xpath
 xpath_boolean
 xpath_double

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/show_tblproperties.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_tblproperties.q.out b/ql/src/test/results/clientpositive/show_tblproperties.q.out
index 1ef1b9b..e4bda1d 100644
--- a/ql/src/test/results/clientpositive/show_tblproperties.q.out
+++ b/ql/src/test/results/clientpositive/show_tblproperties.q.out
@@ -38,6 +38,7 @@ POSTHOOK: query: show tblproperties tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}}
 bar	bar value
+bucketing_version	2
 #### A masked pattern was here ####
 numFiles	0
 numRows	0
@@ -56,6 +57,7 @@ POSTHOOK: query: show tblproperties default.tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}}
 bar	bar value
+bucketing_version	2
 #### A masked pattern was here ####
 numFiles	0
 numRows	0
@@ -110,6 +112,7 @@ POSTHOOK: query: show tblproperties default.tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}}
 bar	bar value
+bucketing_version	2
 #### A masked pattern was here ####
 numFiles	0
 numRows	0
@@ -128,6 +131,7 @@ POSTHOOK: query: show tblproperties tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true","COLUMN_STATS":{"b":"true"}}
 bar	bar value1
+bucketing_version	2
 #### A masked pattern was here ####
 numFiles	0
 numRows	0
@@ -152,6 +156,7 @@ POSTHOOK: query: show tblproperties db1.tmpfoo
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true","COLUMN_STATS":{"b":"true"}}
 bar	bar value1
+bucketing_version	2
 #### A masked pattern was here ####
 numFiles	0
 numRows	0

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
index 1182e56..8e43c88 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/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/smb_mapjoin_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
index ef48acb..004f5f4 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
@@ -121,6 +121,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -156,6 +157,7 @@ STAGE PLANS:
                 properties:
                   bucket_count 16
                   bucket_field_name key
+                  bucketing_version 2
                   column.name.delimiter ,
                   columns key,value
                   columns.comments 
@@ -213,6 +215,7 @@ STAGE PLANS:
               properties:
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -1959,6 +1962,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -2067,6 +2071,7 @@ STAGE PLANS:
               properties:
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -2101,47 +2106,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
@@ -2152,103 +2148,70 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-497	val_497	1
-481	val_481	1
-449	val_449	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
-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
-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
-353	val_353	1
-353	val_353	1
-353	val_353	1
-353	val_353	1
+462	val_462	1
+462	val_462	1
+462	val_462	1
+462	val_462	1
+455	val_455	1
+439	val_439	1
+439	val_439	1
+439	val_439	1
+439	val_439	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
+400	val_400	1
 321	val_321	1
 321	val_321	1
 321	val_321	1
 321	val_321	1
-305	val_305	1
-289	val_289	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
-257	val_257	1
-241	val_241	1
-209	val_209	1
-209	val_209	1
-209	val_209	1
-209	val_209	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
-177	val_177	1
-145	val_145	1
-129	val_129	1
-129	val_129	1
-129	val_129	1
-129	val_129	1
-113	val_113	1
-113	val_113	1
-113	val_113	1
-113	val_113	1
-97	val_97	1
-97	val_97	1
-97	val_97	1
-97	val_97	1
-65	val_65	1
-33	val_33	1
-17	val_17	1
+309	val_309	1
+309	val_309	1
+309	val_309	1
+309	val_309	1
+282	val_282	1
+282	val_282	1
+282	val_282	1
+282	val_282	1
+280	val_280	1
+280	val_280	1
+280	val_280	1
+280	val_280	1
+275	val_275	1
+194	val_194	1
+176	val_176	1
+176	val_176	1
+176	val_176	1
+176	val_176	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
+118	val_118	1
+118	val_118	1
+118	val_118	1
+118	val_118	1
+103	val_103	1
+103	val_103	1
+103	val_103	1
+103	val_103	1
+82	val_82	1
+26	val_26	1
+26	val_26	1
+26	val_26	1
+26	val_26	1
+8	val_8	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
@@ -2263,4 +2226,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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
index 0c1f4cf..cfe641b 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
@@ -101,6 +101,7 @@ STAGE PLANS:
                           SORTBUCKETCOLSPREFIX TRUE
                           bucket_count 16
                           bucket_field_name key
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value
                           columns.comments 
@@ -156,6 +157,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -188,6 +190,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -247,7 +250,7 @@ POSTHOOK: Input: default@test_table1@ds=1
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-879
+420
 PREHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3 a JOIN test_table1 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
@@ -332,6 +335,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -368,6 +372,7 @@ STAGE PLANS:
                   SORTBUCKETCOLSPREFIX TRUE
                   bucket_count 16
                   bucket_field_name key
+                  bucketing_version 2
                   column.name.delimiter ,
                   columns key,value
                   columns.comments 
@@ -426,6 +431,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -551,4 +557,4 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=2
 #### A masked pattern was here ####
-879
+420

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
index 3bc00c8..f85dcaf 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
@@ -116,6 +116,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 16
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -139,6 +140,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -296,6 +298,7 @@ STAGE PLANS:
               SORTBUCKETCOLSPREFIX TRUE
               bucket_count 16
               bucket_field_name key
+              bucketing_version 2
               column.name.delimiter ,
               columns key,value
               columns.comments 
@@ -319,6 +322,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out
index 5958232..2869db2 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out
@@ -108,7 +108,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -126,7 +126,7 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: drop table test_table1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_table1
@@ -253,7 +253,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -271,4 +271,4 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 #### A masked pattern was here ####
-253
+257