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/04/30 05:25:31 UTC

[19/36] 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/ac6b2a3f/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
index 6a654d0..42d5528 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out
@@ -651,314 +651,314 @@ POSTHOOK: query: select unionsrc.key, unionsrc.value FROM (select s1.key as key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-0	val_0
-103	val_103
-105	val_105
 116	val_116
+118	val_118
 120	val_120
-129	val_129
 131	val_131
-136	val_136
+133	val_133
+15	val_15
+150	val_150
+152	val_152
+153	val_153
 155	val_155
-157	val_157
 160	val_160
-180	val_180
+169	val_169
+175	val_175
+176	val_176
+178	val_178
 183	val_183
-190	val_190
-191	val_191
-193	val_193
-205	val_205
-207	val_207
+186	val_186
+194	val_194
+202	val_202
+203	val_203
 213	val_213
 223	val_223
-235	val_235
-238	val_238
+224	val_224
+226	val_226
+228	val_228
 239	val_239
-24	val_24
-248	val_248
-260	val_260
+244	val_244
+247	val_247
+252	val_252
+255	val_255
+256	val_256
+257	val_257
+266	val_266
+272	val_272
+274	val_274
+275	val_275
 28	val_28
+284	val_284
 286	val_286
-298	val_298
-305	val_305
+289	val_289
+296	val_296
+302	val_302
 306	val_306
 307	val_307
-308	val_308
-315	val_315
 317	val_317
 321	val_321
+323	val_323
 33	val_33
-331	val_331
-356	val_356
+338	val_338
+34	val_34
+35	val_35
 360	val_360
-366	val_366
-367	val_367
-368	val_368
-37	val_37
-378	val_378
-379	val_379
-382	val_382
-389	val_389
-395	val_395
-400	val_400
-402	val_402
+365	val_365
+374	val_374
+377	val_377
+393	val_393
+399	val_399
+404	val_404
 406	val_406
-407	val_407
+409	val_409
+41	val_41
+417	val_417
+418	val_418
 42	val_42
-430	val_430
-436	val_436
+431	val_431
+439	val_439
 44	val_44
-452	val_452
-466	val_466
-467	val_467
-472	val_472
-480	val_480
-484	val_484
-485	val_485
-487	val_487
-495	val_495
-496	val_496
-498	val_498
-51	val_51
-57	val_57
-58	val_58
-65	val_65
+443	val_443
+448	val_448
+455	val_455
+459	val_459
+462	val_462
+463	val_463
+470	val_470
+490	val_490
+491	val_491
+494	val_494
+5	val_5
+53	val_53
 66	val_66
-69	val_69
-70	val_70
-78	val_78
-8	val_8
-92	val_92
-96	val_96
-104	val_104
+72	val_72
+76	val_76
+77	val_77
+80	val_80
+84	val_84
+90	val_90
+10	val_10
+105	val_105
 111	val_111
-114	val_114
-118	val_118
-12	val_12
-133	val_133
-138	val_138
-153	val_153
-156	val_156
-162	val_162
-168	val_168
+113	val_113
+119	val_119
+129	val_129
+136	val_136
+143	val_143
+149	val_149
+163	val_163
+167	val_167
 174	val_174
-176	val_176
-178	val_178
-181	val_181
-186	val_186
 187	val_187
-192	val_192
 197	val_197
-199	val_199
 2	val_2
-201	val_201
-203	val_203
+200	val_200
 208	val_208
-214	val_214
+209	val_209
+216	val_216
+217	val_217
 218	val_218
-219	val_219
+221	val_221
 230	val_230
-237	val_237
-249	val_249
-256	val_256
-257	val_257
+258	val_258
+26	val_26
+263	val_263
+273	val_273
 277	val_277
-278	val_278
-284	val_284
-285	val_285
-310	val_310
-322	val_322
-327	val_327
-333	val_333
-336	val_336
-338	val_338
+281	val_281
+292	val_292
+30	val_30
+316	val_316
+335	val_335
 341	val_341
+342	val_342
 344	val_344
-348	val_348
-351	val_351
+345	val_345
 362	val_362
-364	val_364
-374	val_374
+367	val_367
+368	val_368
+37	val_37
 392	val_392
-397	val_397
+394	val_394
 4	val_4
-403	val_403
-404	val_404
-419	val_419
-421	val_421
-427	val_427
-429	val_429
+413	val_413
 437	val_437
-438	val_438
-439	val_439
-454	val_454
-455	val_455
+444	val_444
+446	val_446
+452	val_452
+453	val_453
+457	val_457
 460	val_460
-463	val_463
-470	val_470
-478	val_478
+466	val_466
+468	val_468
+477	val_477
 479	val_479
-489	val_489
-491	val_491
+483	val_483
+487	val_487
 492	val_492
-53	val_53
+493	val_493
+498	val_498
+51	val_51
+54	val_54
+64	val_64
+65	val_65
 67	val_67
 82	val_82
-90	val_90
-97	val_97
-10	val_10
-125	val_125
-134	val_134
-143	val_143
+85	val_85
+87	val_87
+95	val_95
+96	val_96
+100	val_100
+103	val_103
+104	val_104
+11	val_11
+114	val_114
+137	val_137
 145	val_145
-149	val_149
-150	val_150
-158	val_158
-163	val_163
-164	val_164
-166	val_166
+156	val_156
+157	val_157
+162	val_162
+168	val_168
 17	val_17
 170	val_170
-172	val_172
-189	val_189
+180	val_180
 19	val_19
-195	val_195
+190	val_190
+192	val_192
 196	val_196
+199	val_199
 20	val_20
-209	val_209
-216	val_216
-217	val_217
-224	val_224
-228	val_228
-229	val_229
+207	val_207
+214	val_214
+219	val_219
+222	val_222
 233	val_233
 241	val_241
-244	val_244
-247	val_247
-255	val_255
-258	val_258
-26	val_26
-263	val_263
-265	val_265
-266	val_266
-272	val_272
-273	val_273
-274	val_274
-281	val_281
-291	val_291
-296	val_296
-30	val_30
-302	val_302
-309	val_309
-316	val_316
+260	val_260
+27	val_27
+278	val_278
+280	val_280
+285	val_285
+288	val_288
+305	val_305
+311	val_311
 318	val_318
-325	val_325
-332	val_332
-335	val_335
-339	val_339
-342	val_342
-345	val_345
-353	val_353
+322	val_322
+327	val_327
+331	val_331
+336	val_336
+348	val_348
+351	val_351
+366	val_366
 369	val_369
-373	val_373
 375	val_375
-377	val_377
+379	val_379
+382	val_382
 384	val_384
-386	val_386
-394	val_394
+389	val_389
+395	val_395
 396	val_396
-399	val_399
+397	val_397
+400	val_400
 401	val_401
-41	val_41
-413	val_413
+407	val_407
 414	val_414
-431	val_431
-446	val_446
-448	val_448
-449	val_449
-459	val_459
-462	val_462
-468	val_468
+421	val_421
+427	val_427
+430	val_430
+435	val_435
+438	val_438
+454	val_454
 47	val_47
-482	val_482
-490	val_490
-493	val_493
-494	val_494
-497	val_497
-5	val_5
-54	val_54
+472	val_472
+478	val_478
+480	val_480
+481	val_481
+485	val_485
+489	val_489
+57	val_57
+69	val_69
 74	val_74
-77	val_77
-80	val_80
-84	val_84
-85	val_85
-87	val_87
+78	val_78
+8	val_8
+86	val_86
 9	val_9
-95	val_95
-100	val_100
-11	val_11
-113	val_113
-119	val_119
+0	val_0
+12	val_12
+125	val_125
 126	val_126
 128	val_128
-137	val_137
+134	val_134
+138	val_138
 146	val_146
-15	val_15
-152	val_152
+158	val_158
+164	val_164
 165	val_165
-167	val_167
-169	val_169
-175	val_175
+166	val_166
+172	val_172
 177	val_177
 179	val_179
 18	val_18
-194	val_194
-200	val_200
-202	val_202
-221	val_221
-222	val_222
-226	val_226
+181	val_181
+189	val_189
+191	val_191
+193	val_193
+195	val_195
+201	val_201
+205	val_205
+229	val_229
+235	val_235
+237	val_237
+238	val_238
+24	val_24
 242	val_242
-252	val_252
+248	val_248
+249	val_249
 262	val_262
-27	val_27
-275	val_275
-280	val_280
+265	val_265
 282	val_282
 283	val_283
 287	val_287
-288	val_288
-289	val_289
-292	val_292
-311	val_311
-323	val_323
-34	val_34
-35	val_35
-365	val_365
-393	val_393
-409	val_409
+291	val_291
+298	val_298
+308	val_308
+309	val_309
+310	val_310
+315	val_315
+325	val_325
+332	val_332
+333	val_333
+339	val_339
+353	val_353
+356	val_356
+364	val_364
+373	val_373
+378	val_378
+386	val_386
+402	val_402
+403	val_403
 411	val_411
-417	val_417
-418	val_418
+419	val_419
 424	val_424
+429	val_429
 43	val_43
 432	val_432
-435	val_435
-443	val_443
-444	val_444
-453	val_453
-457	val_457
+436	val_436
+449	val_449
 458	val_458
+467	val_467
 469	val_469
 475	val_475
-477	val_477
-481	val_481
-483	val_483
-64	val_64
-72	val_72
-76	val_76
+482	val_482
+484	val_484
+495	val_495
+496	val_496
+497	val_497
+58	val_58
+70	val_70
 83	val_83
-86	val_86
+92	val_92
+97	val_97
 98	val_98
 PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE
 PREHOOK: type: CREATETABLE
@@ -3836,6 +3836,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k0,k1,k2,k3,k4,k5
                       columns.comments 
@@ -3914,6 +3915,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k1,k2,k3,k4
                       columns.comments 
@@ -3992,6 +3994,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k0,k1,k2,k3,k4,k5
                       columns.comments 
@@ -4032,6 +4035,7 @@ STAGE PLANS:
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       properties:
                         bucket_count -1
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns k1,k2,k3,k4
                         columns.comments 
@@ -4157,6 +4161,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns k1,k2,k3,k4
                 columns.comments 
@@ -4231,329 +4236,329 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dst_union22
 POSTHOOK: Input: default@dst_union22@ds=2
 POSTHOOK: Output: hdfs://### HDFS PATH ###
+100	val_100	100	val_100	2
 103	val_103	103	val_103	2
-113	val_113	113	val_113	2
+104	val_104	104	val_104	2
+11	val_11	11	val_11	2
+114	val_114	114	val_114	2
+116	val_116	116	val_116	2
+118	val_118	118	val_118	2
 120	val_120	120	val_120	2
-128	val_128	128	val_128	2
+131	val_131	131	val_131	2
+133	val_133	133	val_133	2
 137	val_137	137	val_137	2
 145	val_145	145	val_145	2
-146	val_146	146	val_146	2
 15	val_15	15	val_15	2
+150	val_150	150	val_150	2
+152	val_152	152	val_152	2
+153	val_153	153	val_153	2
+155	val_155	155	val_155	2
 156	val_156	156	val_156	2
-163	val_163	163	val_163	2
-165	val_165	165	val_165	2
-166	val_166	166	val_166	2
-167	val_167	167	val_167	2
+157	val_157	157	val_157	2
+160	val_160	160	val_160	2
+162	val_162	162	val_162	2
+168	val_168	168	val_168	2
+169	val_169	169	val_169	2
+17	val_17	17	val_17	2
 170	val_170	170	val_170	2
-174	val_174	174	val_174	2
+175	val_175	175	val_175	2
+176	val_176	176	val_176	2
 178	val_178	178	val_178	2
+180	val_180	180	val_180	2
 183	val_183	183	val_183	2
-191	val_191	191	val_191	2
-195	val_195	195	val_195	2
+186	val_186	186	val_186	2
+19	val_19	19	val_19	2
+190	val_190	190	val_190	2
+192	val_192	192	val_192	2
+194	val_194	194	val_194	2
+196	val_196	196	val_196	2
 199	val_199	199	val_199	2
-2	val_2	2	val_2	2
+20	val_20	20	val_20	2
+202	val_202	202	val_202	2
 203	val_203	203	val_203	2
-217	val_217	217	val_217	2
+207	val_207	207	val_207	2
+213	val_213	213	val_213	2
+214	val_214	214	val_214	2
+219	val_219	219	val_219	2
+222	val_222	222	val_222	2
+223	val_223	223	val_223	2
 224	val_224	224	val_224	2
-229	val_229	229	val_229	2
-242	val_242	242	val_242	2
-27	val_27	NULL	NULL	2
-272	val_272	272	val_272	2
-28	val_28	NULL	NULL	2
-280	val_280	280	val_280	2
-282	val_282	282	val_282	2
-283	val_283	283	val_283	2
-287	val_287	287	val_287	2
-289	val_289	289	val_289	2
-292	val_292	292	val_292	2
-306	val_306	306	val_306	2
-307	val_307	307	val_307	2
-309	val_309	309	val_309	2
-310	val_310	310	val_310	2
-315	val_315	315	val_315	2
-327	val_327	327	val_327	2
-33	val_33	33	val_33	2
-331	val_331	331	val_331	2
-332	val_332	332	val_332	2
-333	val_333	333	val_333	2
-338	val_338	338	val_338	2
-344	val_344	344	val_344	2
-348	val_348	348	val_348	2
-35	val_35	35	val_35	2
-353	val_353	353	val_353	2
-362	val_362	362	val_362	2
-37	val_37	37	val_37	2
-373	val_373	373	val_373	2
-379	val_379	379	val_379	2
-4	val_4	4	val_4	2
-400	val_400	400	val_400	2
-401	val_401	401	val_401	2
-403	val_403	403	val_403	2
-406	val_406	406	val_406	2
-41	val_41	41	val_41	2
-414	val_414	414	val_414	2
-417	val_417	417	val_417	2
-431	val_431	431	val_431	2
-432	val_432	432	val_432	2
-436	val_436	436	val_436	2
-439	val_439	439	val_439	2
-452	val_452	452	val_452	2
-453	val_453	453	val_453	2
-455	val_455	455	val_455	2
-466	val_466	466	val_466	2
-469	val_469	469	val_469	2
-47	val_47	NULL	NULL	2
-470	val_470	470	val_470	2
-475	val_475	475	val_475	2
-477	val_477	477	val_477	2
-493	val_493	493	val_493	2
-496	val_496	496	val_496	2
-54	val_54	54	val_54	2
-57	val_57	57	val_57	2
-65	val_65	65	val_65	2
-69	val_69	69	val_69	2
-77	val_77	77	val_77	2
-78	val_78	78	val_78	2
-8	val_8	8	val_8	2
-82	val_82	82	val_82	2
-87	val_87	87	val_87	2
-9	val_9	9	val_9	2
-92	val_92	92	val_92	2
-10	val_10	10	val_10	2
-11	val_11	11	val_11	2
-111	val_111	111	val_111	2
-114	val_114	114	val_114	2
-116	val_116	116	val_116	2
-12	val_12	12	val_12	2
-129	val_129	129	val_129	2
-136	val_136	136	val_136	2
-152	val_152	152	val_152	2
-155	val_155	155	val_155	2
-158	val_158	158	val_158	2
-168	val_168	168	val_168	2
-176	val_176	176	val_176	2
-177	val_177	177	val_177	2
-179	val_179	179	val_179	2
-18	val_18	18	val_18	2
-186	val_186	186	val_186	2
-194	val_194	194	val_194	2
-208	val_208	208	val_208	2
-214	val_214	214	val_214	2
-222	val_222	222	val_222	2
 226	val_226	226	val_226	2
-230	val_230	230	val_230	2
-237	val_237	237	val_237	2
-24	val_24	NULL	NULL	2
-24	val_24	24	val_24	2
-248	val_248	248	val_248	2
+228	val_228	228	val_228	2
+233	val_233	233	val_233	2
+239	val_239	239	val_239	2
+241	val_241	241	val_241	2
+244	val_244	244	val_244	2
+247	val_247	247	val_247	2
+252	val_252	252	val_252	2
 255	val_255	255	val_255	2
 256	val_256	256	val_256	2
-26	val_26	26	val_26	2
-265	val_265	265	val_265	2
+257	val_257	257	val_257	2
+260	val_260	260	val_260	2
 266	val_266	266	val_266	2
-273	val_273	273	val_273	2
+27	val_27	27	val_27	2
+272	val_272	272	val_272	2
+274	val_274	274	val_274	2
 275	val_275	275	val_275	2
+278	val_278	278	val_278	2
+28	val_28	NULL	NULL	2
 28	val_28	28	val_28	2
+280	val_280	280	val_280	2
 284	val_284	284	val_284	2
-291	val_291	291	val_291	2
-298	val_298	298	val_298	2
-30	val_30	NULL	NULL	2
-30	val_30	30	val_30	2
-308	val_308	308	val_308	2
+285	val_285	285	val_285	2
+286	val_286	286	val_286	2
+288	val_288	288	val_288	2
+289	val_289	289	val_289	2
+296	val_296	296	val_296	2
+302	val_302	302	val_302	2
+305	val_305	305	val_305	2
+306	val_306	306	val_306	2
+307	val_307	307	val_307	2
+311	val_311	311	val_311	2
+317	val_317	317	val_317	2
+318	val_318	318	val_318	2
 321	val_321	321	val_321	2
 322	val_322	322	val_322	2
-335	val_335	335	val_335	2
+323	val_323	323	val_323	2
+327	val_327	327	val_327	2
+33	val_33	NULL	NULL	2
+33	val_33	33	val_33	2
+331	val_331	331	val_331	2
 336	val_336	336	val_336	2
+338	val_338	338	val_338	2
+34	val_34	NULL	NULL	2
 34	val_34	34	val_34	2
-341	val_341	341	val_341	2
-342	val_342	342	val_342	2
+348	val_348	348	val_348	2
+35	val_35	NULL	NULL	2
+35	val_35	35	val_35	2
+351	val_351	351	val_351	2
+360	val_360	360	val_360	2
+365	val_365	365	val_365	2
+366	val_366	366	val_366	2
 369	val_369	369	val_369	2
 374	val_374	374	val_374	2
+375	val_375	375	val_375	2
 377	val_377	377	val_377	2
+379	val_379	379	val_379	2
 382	val_382	382	val_382	2
-386	val_386	386	val_386	2
+384	val_384	384	val_384	2
+389	val_389	389	val_389	2
 393	val_393	393	val_393	2
+395	val_395	395	val_395	2
+396	val_396	396	val_396	2
 397	val_397	397	val_397	2
-402	val_402	402	val_402	2
+399	val_399	399	val_399	2
+400	val_400	400	val_400	2
+401	val_401	401	val_401	2
 404	val_404	404	val_404	2
+406	val_406	406	val_406	2
 407	val_407	407	val_407	2
+409	val_409	409	val_409	2
+41	val_41	NULL	NULL	2
+41	val_41	41	val_41	2
+414	val_414	414	val_414	2
+417	val_417	417	val_417	2
 418	val_418	418	val_418	2
-446	val_446	446	val_446	2
+42	val_42	NULL	NULL	2
+42	val_42	42	val_42	2
+421	val_421	421	val_421	2
+427	val_427	427	val_427	2
+430	val_430	430	val_430	2
+431	val_431	431	val_431	2
+435	val_435	435	val_435	2
+438	val_438	438	val_438	2
+439	val_439	439	val_439	2
+44	val_44	NULL	NULL	2
+44	val_44	44	val_44	2
+443	val_443	443	val_443	2
 448	val_448	448	val_448	2
-457	val_457	457	val_457	2
+454	val_454	454	val_454	2
+455	val_455	455	val_455	2
 459	val_459	459	val_459	2
 462	val_462	462	val_462	2
 463	val_463	463	val_463	2
+47	val_47	47	val_47	2
+470	val_470	470	val_470	2
 472	val_472	472	val_472	2
 478	val_478	478	val_478	2
-479	val_479	479	val_479	2
 480	val_480	480	val_480	2
-483	val_483	483	val_483	2
+481	val_481	481	val_481	2
 485	val_485	485	val_485	2
+489	val_489	489	val_489	2
+490	val_490	490	val_490	2
 491	val_491	491	val_491	2
+494	val_494	494	val_494	2
 5	val_5	5	val_5	2
 53	val_53	53	val_53	2
-67	val_67	67	val_67	2
+57	val_57	57	val_57	2
+66	val_66	66	val_66	2
+69	val_69	69	val_69	2
+72	val_72	72	val_72	2
+74	val_74	74	val_74	2
 76	val_76	76	val_76	2
-83	val_83	83	val_83	2
+77	val_77	77	val_77	2
+78	val_78	78	val_78	2
+8	val_8	8	val_8	2
+80	val_80	80	val_80	2
+84	val_84	84	val_84	2
 86	val_86	86	val_86	2
-95	val_95	95	val_95	2
-96	val_96	96	val_96	2
-98	val_98	98	val_98	2
-100	val_100	100	val_100	2
+9	val_9	9	val_9	2
+90	val_90	90	val_90	2
+26	val_26	NULL	NULL	2
+30	val_30	NULL	NULL	2
+37	val_37	NULL	NULL	2
+0	val_0	0	val_0	2
+10	val_10	10	val_10	2
+105	val_105	105	val_105	2
+111	val_111	111	val_111	2
+113	val_113	113	val_113	2
+119	val_119	119	val_119	2
+12	val_12	12	val_12	2
 125	val_125	125	val_125	2
 126	val_126	126	val_126	2
+128	val_128	128	val_128	2
+129	val_129	129	val_129	2
 134	val_134	134	val_134	2
+136	val_136	136	val_136	2
 138	val_138	138	val_138	2
 143	val_143	143	val_143	2
+146	val_146	146	val_146	2
 149	val_149	149	val_149	2
-150	val_150	150	val_150	2
-157	val_157	157	val_157	2
+158	val_158	158	val_158	2
+163	val_163	163	val_163	2
 164	val_164	164	val_164	2
-169	val_169	169	val_169	2
-17	val_17	17	val_17	2
+165	val_165	165	val_165	2
+166	val_166	166	val_166	2
+167	val_167	167	val_167	2
 172	val_172	172	val_172	2
+174	val_174	174	val_174	2
+177	val_177	177	val_177	2
+179	val_179	179	val_179	2
+18	val_18	18	val_18	2
 181	val_181	181	val_181	2
 187	val_187	187	val_187	2
 189	val_189	189	val_189	2
-190	val_190	190	val_190	2
-192	val_192	192	val_192	2
+191	val_191	191	val_191	2
+193	val_193	193	val_193	2
+195	val_195	195	val_195	2
 197	val_197	197	val_197	2
+2	val_2	2	val_2	2
+200	val_200	200	val_200	2
 201	val_201	201	val_201	2
-202	val_202	202	val_202	2
 205	val_205	205	val_205	2
-207	val_207	207	val_207	2
+208	val_208	208	val_208	2
 209	val_209	209	val_209	2
 216	val_216	216	val_216	2
+217	val_217	217	val_217	2
 218	val_218	218	val_218	2
-223	val_223	223	val_223	2
-228	val_228	228	val_228	2
-233	val_233	233	val_233	2
+221	val_221	221	val_221	2
+229	val_229	229	val_229	2
+230	val_230	230	val_230	2
 235	val_235	235	val_235	2
+237	val_237	237	val_237	2
 238	val_238	238	val_238	2
-241	val_241	241	val_241	2
-244	val_244	244	val_244	2
-247	val_247	247	val_247	2
-252	val_252	252	val_252	2
+24	val_24	24	val_24	2
+242	val_242	242	val_242	2
+248	val_248	248	val_248	2
+249	val_249	249	val_249	2
 258	val_258	258	val_258	2
-260	val_260	260	val_260	2
+26	val_26	26	val_26	2
 262	val_262	262	val_262	2
-27	val_27	27	val_27	2
-274	val_274	274	val_274	2
+263	val_263	263	val_263	2
+265	val_265	265	val_265	2
+27	val_27	NULL	NULL	2
+273	val_273	273	val_273	2
 277	val_277	277	val_277	2
-278	val_278	278	val_278	2
-288	val_288	288	val_288	2
-296	val_296	296	val_296	2
-302	val_302	302	val_302	2
-305	val_305	305	val_305	2
-311	val_311	311	val_311	2
-318	val_318	318	val_318	2
+281	val_281	281	val_281	2
+282	val_282	282	val_282	2
+283	val_283	283	val_283	2
+287	val_287	287	val_287	2
+291	val_291	291	val_291	2
+292	val_292	292	val_292	2
+298	val_298	298	val_298	2
+30	val_30	30	val_30	2
+308	val_308	308	val_308	2
+309	val_309	309	val_309	2
+310	val_310	310	val_310	2
+315	val_315	315	val_315	2
+316	val_316	316	val_316	2
+325	val_325	325	val_325	2
+332	val_332	332	val_332	2
+333	val_333	333	val_333	2
+335	val_335	335	val_335	2
+339	val_339	339	val_339	2
+341	val_341	341	val_341	2
+342	val_342	342	val_342	2
+344	val_344	344	val_344	2
 345	val_345	345	val_345	2
-35	val_35	NULL	NULL	2
+353	val_353	353	val_353	2
 356	val_356	356	val_356	2
-360	val_360	360	val_360	2
-365	val_365	365	val_365	2
-375	val_375	375	val_375	2
-389	val_389	389	val_389	2
+362	val_362	362	val_362	2
+364	val_364	364	val_364	2
+367	val_367	367	val_367	2
+368	val_368	368	val_368	2
+37	val_37	37	val_37	2
+373	val_373	373	val_373	2
+378	val_378	378	val_378	2
+386	val_386	386	val_386	2
 392	val_392	392	val_392	2
 394	val_394	394	val_394	2
-395	val_395	395	val_395	2
-409	val_409	409	val_409	2
-41	val_41	NULL	NULL	2
+4	val_4	4	val_4	2
+402	val_402	402	val_402	2
+403	val_403	403	val_403	2
 411	val_411	411	val_411	2
 413	val_413	413	val_413	2
 419	val_419	419	val_419	2
-42	val_42	42	val_42	2
-427	val_427	427	val_427	2
+424	val_424	424	val_424	2
 429	val_429	429	val_429	2
-430	val_430	430	val_430	2
-44	val_44	NULL	NULL	2
+43	val_43	43	val_43	2
+432	val_432	432	val_432	2
+436	val_436	436	val_436	2
+437	val_437	437	val_437	2
 444	val_444	444	val_444	2
-454	val_454	454	val_454	2
+446	val_446	446	val_446	2
+449	val_449	449	val_449	2
+452	val_452	452	val_452	2
+453	val_453	453	val_453	2
+457	val_457	457	val_457	2
+458	val_458	458	val_458	2
 460	val_460	460	val_460	2
+466	val_466	466	val_466	2
+467	val_467	467	val_467	2
 468	val_468	468	val_468	2
-47	val_47	47	val_47	2
-481	val_481	481	val_481	2
+469	val_469	469	val_469	2
+47	val_47	NULL	NULL	2
+475	val_475	475	val_475	2
+477	val_477	477	val_477	2
+479	val_479	479	val_479	2
 482	val_482	482	val_482	2
+483	val_483	483	val_483	2
 484	val_484	484	val_484	2
-489	val_489	489	val_489	2
+487	val_487	487	val_487	2
 492	val_492	492	val_492	2
+493	val_493	493	val_493	2
 495	val_495	495	val_495	2
+496	val_496	496	val_496	2
+497	val_497	497	val_497	2
 498	val_498	498	val_498	2
+51	val_51	51	val_51	2
+54	val_54	54	val_54	2
 58	val_58	58	val_58	2
 64	val_64	64	val_64	2
-66	val_66	66	val_66	2
+65	val_65	65	val_65	2
+67	val_67	67	val_67	2
 70	val_70	70	val_70	2
-72	val_72	72	val_72	2
-74	val_74	74	val_74	2
-80	val_80	80	val_80	2
-84	val_84	84	val_84	2
-90	val_90	90	val_90	2
-0	val_0	0	val_0	2
-104	val_104	104	val_104	2
-105	val_105	105	val_105	2
-118	val_118	118	val_118	2
-119	val_119	119	val_119	2
-131	val_131	131	val_131	2
-133	val_133	133	val_133	2
-153	val_153	153	val_153	2
-160	val_160	160	val_160	2
-162	val_162	162	val_162	2
-175	val_175	175	val_175	2
-180	val_180	180	val_180	2
-19	val_19	19	val_19	2
-193	val_193	193	val_193	2
-196	val_196	196	val_196	2
-20	val_20	20	val_20	2
-200	val_200	200	val_200	2
-213	val_213	213	val_213	2
-219	val_219	219	val_219	2
-221	val_221	221	val_221	2
-239	val_239	239	val_239	2
-249	val_249	249	val_249	2
-257	val_257	257	val_257	2
-26	val_26	NULL	NULL	2
-263	val_263	263	val_263	2
-281	val_281	281	val_281	2
-285	val_285	285	val_285	2
-286	val_286	286	val_286	2
-316	val_316	316	val_316	2
-317	val_317	317	val_317	2
-323	val_323	323	val_323	2
-325	val_325	325	val_325	2
-33	val_33	NULL	NULL	2
-339	val_339	339	val_339	2
-34	val_34	NULL	NULL	2
-351	val_351	351	val_351	2
-364	val_364	364	val_364	2
-366	val_366	366	val_366	2
-367	val_367	367	val_367	2
-368	val_368	368	val_368	2
-37	val_37	NULL	NULL	2
-378	val_378	378	val_378	2
-384	val_384	384	val_384	2
-396	val_396	396	val_396	2
-399	val_399	399	val_399	2
-42	val_42	NULL	NULL	2
-421	val_421	421	val_421	2
-424	val_424	424	val_424	2
-43	val_43	NULL	NULL	2
-43	val_43	43	val_43	2
-435	val_435	435	val_435	2
-437	val_437	437	val_437	2
-438	val_438	438	val_438	2
-44	val_44	44	val_44	2
-443	val_443	443	val_443	2
-449	val_449	449	val_449	2
-458	val_458	458	val_458	2
-467	val_467	467	val_467	2
-487	val_487	487	val_487	2
-490	val_490	490	val_490	2
-494	val_494	494	val_494	2
-497	val_497	497	val_497	2
-51	val_51	51	val_51	2
+82	val_82	82	val_82	2
+83	val_83	83	val_83	2
 85	val_85	85	val_85	2
+87	val_87	87	val_87	2
+92	val_92	92	val_92	2
+95	val_95	95	val_95	2
+96	val_96	96	val_96	2
 97	val_97	97	val_97	2
+98	val_98	98	val_98	2
+24	val_24	NULL	NULL	2
+43	val_43	NULL	NULL	2
 PREHOOK: query: explain
 select s.key2, s.value2
 from (
@@ -4672,314 +4677,314 @@ from (
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-0	val_0
-103	val_103
-105	val_105
 116	val_116
+118	val_118
 120	val_120
-129	val_129
 131	val_131
-136	val_136
+133	val_133
+15	val_15
+150	val_150
+152	val_152
+153	val_153
 155	val_155
-157	val_157
 160	val_160
-180	val_180
+169	val_169
+175	val_175
+176	val_176
+178	val_178
 183	val_183
-190	val_190
-191	val_191
-193	val_193
-205	val_205
-207	val_207
+186	val_186
+194	val_194
+202	val_202
+203	val_203
 213	val_213
 223	val_223
-235	val_235
-238	val_238
+224	val_224
+226	val_226
+228	val_228
 239	val_239
-24	val_24
-248	val_248
-260	val_260
+244	val_244
+247	val_247
+252	val_252
+255	val_255
+256	val_256
+257	val_257
+266	val_266
+272	val_272
+274	val_274
+275	val_275
 28	val_28
+284	val_284
 286	val_286
-298	val_298
-305	val_305
+289	val_289
+296	val_296
+302	val_302
 306	val_306
 307	val_307
-308	val_308
-315	val_315
 317	val_317
 321	val_321
+323	val_323
 33	val_33
-331	val_331
-356	val_356
+338	val_338
+34	val_34
+35	val_35
 360	val_360
-366	val_366
-367	val_367
-368	val_368
-37	val_37
-378	val_378
-379	val_379
-382	val_382
-389	val_389
-395	val_395
-400	val_400
-402	val_402
+365	val_365
+374	val_374
+377	val_377
+393	val_393
+399	val_399
+404	val_404
 406	val_406
-407	val_407
+409	val_409
+41	val_41
+417	val_417
+418	val_418
 42	val_42
-430	val_430
-436	val_436
+431	val_431
+439	val_439
 44	val_44
-452	val_452
-466	val_466
-467	val_467
-472	val_472
-480	val_480
-484	val_484
-485	val_485
-487	val_487
-495	val_495
-496	val_496
-498	val_498
-51	val_51
-57	val_57
-58	val_58
-65	val_65
+443	val_443
+448	val_448
+455	val_455
+459	val_459
+462	val_462
+463	val_463
+470	val_470
+490	val_490
+491	val_491
+494	val_494
+5	val_5
+53	val_53
 66	val_66
-69	val_69
-70	val_70
-78	val_78
-8	val_8
-92	val_92
-96	val_96
-104	val_104
+72	val_72
+76	val_76
+77	val_77
+80	val_80
+84	val_84
+90	val_90
+10	val_10
+105	val_105
 111	val_111
-114	val_114
-118	val_118
-12	val_12
-133	val_133
-138	val_138
-153	val_153
-156	val_156
-162	val_162
-168	val_168
+113	val_113
+119	val_119
+129	val_129
+136	val_136
+143	val_143
+149	val_149
+163	val_163
+167	val_167
 174	val_174
-176	val_176
-178	val_178
-181	val_181
-186	val_186
 187	val_187
-192	val_192
 197	val_197
-199	val_199
 2	val_2
-201	val_201
-203	val_203
+200	val_200
 208	val_208
-214	val_214
+209	val_209
+216	val_216
+217	val_217
 218	val_218
-219	val_219
+221	val_221
 230	val_230
-237	val_237
-249	val_249
-256	val_256
-257	val_257
+258	val_258
+26	val_26
+263	val_263
+273	val_273
 277	val_277
-278	val_278
-284	val_284
-285	val_285
-310	val_310
-322	val_322
-327	val_327
-333	val_333
-336	val_336
-338	val_338
+281	val_281
+292	val_292
+30	val_30
+316	val_316
+335	val_335
 341	val_341
+342	val_342
 344	val_344
-348	val_348
-351	val_351
+345	val_345
 362	val_362
-364	val_364
-374	val_374
+367	val_367
+368	val_368
+37	val_37
 392	val_392
-397	val_397
+394	val_394
 4	val_4
-403	val_403
-404	val_404
-419	val_419
-421	val_421
-427	val_427
-429	val_429
+413	val_413
 437	val_437
-438	val_438
-439	val_439
-454	val_454
-455	val_455
+444	val_444
+446	val_446
+452	val_452
+453	val_453
+457	val_457
 460	val_460
-463	val_463
-470	val_470
-478	val_478
+466	val_466
+468	val_468
+477	val_477
 479	val_479
-489	val_489
-491	val_491
+483	val_483
+487	val_487
 492	val_492
-53	val_53
+493	val_493
+498	val_498
+51	val_51
+54	val_54
+64	val_64
+65	val_65
 67	val_67
 82	val_82
-90	val_90
-97	val_97
-10	val_10
-125	val_125
-134	val_134
-143	val_143
+85	val_85
+87	val_87
+95	val_95
+96	val_96
+100	val_100
+103	val_103
+104	val_104
+11	val_11
+114	val_114
+137	val_137
 145	val_145
-149	val_149
-150	val_150
-158	val_158
-163	val_163
-164	val_164
-166	val_166
+156	val_156
+157	val_157
+162	val_162
+168	val_168
 17	val_17
 170	val_170
-172	val_172
-189	val_189
+180	val_180
 19	val_19
-195	val_195
+190	val_190
+192	val_192
 196	val_196
+199	val_199
 20	val_20
-209	val_209
-216	val_216
-217	val_217
-224	val_224
-228	val_228
-229	val_229
+207	val_207
+214	val_214
+219	val_219
+222	val_222
 233	val_233
 241	val_241
-244	val_244
-247	val_247
-255	val_255
-258	val_258
-26	val_26
-263	val_263
-265	val_265
-266	val_266
-272	val_272
-273	val_273
-274	val_274
-281	val_281
-291	val_291
-296	val_296
-30	val_30
-302	val_302
-309	val_309
-316	val_316
+260	val_260
+27	val_27
+278	val_278
+280	val_280
+285	val_285
+288	val_288
+305	val_305
+311	val_311
 318	val_318
-325	val_325
-332	val_332
-335	val_335
-339	val_339
-342	val_342
-345	val_345
-353	val_353
+322	val_322
+327	val_327
+331	val_331
+336	val_336
+348	val_348
+351	val_351
+366	val_366
 369	val_369
-373	val_373
 375	val_375
-377	val_377
+379	val_379
+382	val_382
 384	val_384
-386	val_386
-394	val_394
+389	val_389
+395	val_395
 396	val_396
-399	val_399
+397	val_397
+400	val_400
 401	val_401
-41	val_41
-413	val_413
+407	val_407
 414	val_414
-431	val_431
-446	val_446
-448	val_448
-449	val_449
-459	val_459
-462	val_462
-468	val_468
+421	val_421
+427	val_427
+430	val_430
+435	val_435
+438	val_438
+454	val_454
 47	val_47
-482	val_482
-490	val_490
-493	val_493
-494	val_494
-497	val_497
-5	val_5
-54	val_54
+472	val_472
+478	val_478
+480	val_480
+481	val_481
+485	val_485
+489	val_489
+57	val_57
+69	val_69
 74	val_74
-77	val_77
-80	val_80
-84	val_84
-85	val_85
-87	val_87
+78	val_78
+8	val_8
+86	val_86
 9	val_9
-95	val_95
-100	val_100
-11	val_11
-113	val_113
-119	val_119
+0	val_0
+12	val_12
+125	val_125
 126	val_126
 128	val_128
-137	val_137
+134	val_134
+138	val_138
 146	val_146
-15	val_15
-152	val_152
+158	val_158
+164	val_164
 165	val_165
-167	val_167
-169	val_169
-175	val_175
+166	val_166
+172	val_172
 177	val_177
 179	val_179
 18	val_18
-194	val_194
-200	val_200
-202	val_202
-221	val_221
-222	val_222
-226	val_226
+181	val_181
+189	val_189
+191	val_191
+193	val_193
+195	val_195
+201	val_201
+205	val_205
+229	val_229
+235	val_235
+237	val_237
+238	val_238
+24	val_24
 242	val_242
-252	val_252
+248	val_248
+249	val_249
 262	val_262
-27	val_27
-275	val_275
-280	val_280
+265	val_265
 282	val_282
 283	val_283
 287	val_287
-288	val_288
-289	val_289
-292	val_292
-311	val_311
-323	val_323
-34	val_34
-35	val_35
-365	val_365
-393	val_393
-409	val_409
+291	val_291
+298	val_298
+308	val_308
+309	val_309
+310	val_310
+315	val_315
+325	val_325
+332	val_332
+333	val_333
+339	val_339
+353	val_353
+356	val_356
+364	val_364
+373	val_373
+378	val_378
+386	val_386
+402	val_402
+403	val_403
 411	val_411
-417	val_417
-418	val_418
+419	val_419
 424	val_424
+429	val_429
 43	val_43
 432	val_432
-435	val_435
-443	val_443
-444	val_444
-453	val_453
-457	val_457
+436	val_436
+449	val_449
 458	val_458
+467	val_467
 469	val_469
 475	val_475
-477	val_477
-481	val_481
-483	val_483
-64	val_64
-72	val_72
-76	val_76
+482	val_482
+484	val_484
+495	val_495
+496	val_496
+497	val_497
+58	val_58
+70	val_70
 83	val_83
-86	val_86
+92	val_92
+97	val_97
 98	val_98
 PREHOOK: query: create table src2 as select key, count(1) as count from src group by key
 PREHOOK: type: CREATETABLE_AS_SELECT
@@ -5108,6 +5113,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5130,6 +5136,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5187,6 +5194,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5209,6 +5217,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5268,6 +5277,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5290,6 +5300,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5349,6 +5360,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5371,6 +5383,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5613,6 +5626,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5635,6 +5649,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5694,6 +5709,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5716,6 +5732,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5770,6 +5787,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5792,6 +5810,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -5847,6 +5866,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -5869,6 +5889,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -6088,6 +6109,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -6110,6 +6132,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -6164,6 +6187,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -6186,6 +6210,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -6245,6 +6270,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -6267,6 +6293,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -6321,6 +6348,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -6343,6 +6371,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -7329,314 +7358,314 @@ POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-1	0	val_0
-1	103	val_103
-1	105	val_105
 1	116	val_116
+1	118	val_118
 1	120	val_120
-1	129	val_129
 1	131	val_131
-1	136	val_136
+1	133	val_133
+1	15	val_15
+1	150	val_150
+1	152	val_152
+1	153	val_153
 1	155	val_155
-1	157	val_157
 1	160	val_160
-1	180	val_180
+1	169	val_169
+1	175	val_175
+1	176	val_176
+1	178	val_178
 1	183	val_183
-1	190	val_190
-1	191	val_191
-1	193	val_193
-1	205	val_205
-1	207	val_207
+1	186	val_186
+1	194	val_194
+1	202	val_202
+1	203	val_203
 1	213	val_213
 1	223	val_223
-1	235	val_235
-1	238	val_238
+1	224	val_224
+1	226	val_226
+1	228	val_228
 1	239	val_239
-1	24	val_24
-1	248	val_248
-1	260	val_260
+1	244	val_244
+1	247	val_247
+1	252	val_252
+1	255	val_255
+1	256	val_256
+1	257	val_257
+1	266	val_266
+1	272	val_272
+1	274	val_274
+1	275	val_275
 1	28	val_28
+1	284	val_284
 1	286	val_286
-1	298	val_298
-1	305	val_305
+1	289	val_289
+1	296	val_296
+1	302	val_302
 1	306	val_306
 1	307	val_307
-1	308	val_308
-1	315	val_315
 1	317	val_317
 1	321	val_321
+1	323	val_323
 1	33	val_33
-1	331	val_331
-1	356	val_356
+1	338	val_338
+1	34	val_34
+1	35	val_35
 1	360	val_360
-1	366	val_366
-1	367	val_367
-1	368	val_368
-1	37	val_37
-1	378	val_378
-1	379	val_379
-1	382	val_382
-1	389	val_389
-1	395	val_395
-1	400	val_400
-1	402	val_402
+1	365	val_365
+1	374	val_374
+1	377	val_377
+1	393	val_393
+1	399	val_399
+1	404	val_404
 1	406	val_406
-1	407	val_407
+1	409	val_409
+1	41	val_41
+1	417	val_417
+1	418	val_418
 1	42	val_42
-1	430	val_430
-1	436	val_436
+1	431	val_431
+1	439	val_439
 1	44	val_44
+1	443	val_443
+1	448	val_448
+1	455	val_455
+1	459	val_459
+1	462	val_462
+1	463	val_463
+1	470	val_470
+1	490	val_490
+1	491	val_491
+1	494	val_494
+1	5	val_5
+1	53	val_53
+1	66	val_66
+1	72	val_72
+1	76	val_76
+1	77	val_77
+1	80	val_80
+1	84	val_84
+1	90	val_90
+1	10	val_10
+1	105	val_105
+1	111	val_111
+1	113	val_113
+1	119	val_119
+1	129	val_129
+1	136	val_136
+1	143	val_143
+1	149	val_149
+1	163	val_163
+1	167	val_167
+1	174	val_174
+1	187	val_187
+1	197	val_197
+1	2	val_2
+1	200	val_200
+1	208	val_208
+1	209	val_209
+1	216	val_216
+1	217	val_217
+1	218	val_218
+1	221	val_221
+1	230	val_230
+1	258	val_258
+1	26	val_26
+1	263	val_263
+1	273	val_273
+1	277	val_277
+1	281	val_281
+1	292	val_292
+1	30	val_30
+1	316	val_316
+1	335	val_335
+1	341	val_341
+1	342	val_342
+1	344	val_344
+1	345	val_345
+1	362	val_362
+1	367	val_367
+1	368	val_368
+1	37	val_37
+1	392	val_392
+1	394	val_394
+1	4	val_4
+1	413	val_413
+1	437	val_437
+1	444	val_444
+1	446	val_446
 1	452	val_452
+1	453	val_453
+1	457	val_457
+1	460	val_460
 1	466	val_466
-1	467	val_467
-1	472	val_472
-1	480	val_480
-1	484	val_484
-1	485	val_485
+1	468	val_468
+1	477	val_477
+1	479	val_479
+1	483	val_483
 1	487	val_487
-1	495	val_495
-1	496	val_496
+1	492	val_492
+1	493	val_493
 1	498	val_498
 1	51	val_51
-1	57	val_57
-1	58	val_58
+1	54	val_54
+1	64	val_64
 1	65	val_65
-1	66	val_66
-1	69	val_69
-1	70	val_70
-1	78	val_78
-1	8	val_8
-1	92	val_92
+1	67	val_67
+1	82	val_82
+1	85	val_85
+1	87	val_87
+1	95	val_95
 1	96	val_96
+1	100	val_100
+1	103	val_103
 1	104	val_104
-1	111	val_111
+1	11	val_11
 1	114	val_114
-1	118	val_118
-1	12	val_12
-1	133	val_133
-1	138	val_138
-1	153	val_153
+1	137	val_137
+1	145	val_145
 1	156	val_156
+1	157	val_157
 1	162	val_162
 1	168	val_168
-1	174	val_174
-1	176	val_176
-1	178	val_178
-1	181	val_181
-1	186	val_186
-1	187	val_187
+1	17	val_17
+1	170	val_170
+1	180	val_180
+1	19	val_19
+1	190	val_190
 1	192	val_192
-1	197	val_197
+1	196	val_196
 1	199	val_199
-1	2	val_2
-1	201	val_201
-1	203	val_203
-1	208	val_208
+1	20	val_20
+1	207	val_207
 1	214	val_214
-1	218	val_218
 1	219	val_219
-1	230	val_230
-1	237	val_237
-1	249	val_249
-1	256	val_256
-1	257	val_257
-1	277	val_277
+1	222	val_222
+1	233	val_233
+1	241	val_241
+1	260	val_260
+1	27	val_27
 1	278	val_278
-1	284	val_284
+1	280	val_280
 1	285	val_285
-1	310	val_310
+1	288	val_288
+1	305	val_305
+1	311	val_311
+1	318	val_318
 1	322	val_322
 1	327	val_327
-1	333	val_333
+1	331	val_331
 1	336	val_336
-1	338	val_338
-1	341	val_341
-1	344	val_344
 1	348	val_348
 1	351	val_351
-1	362	val_362
-1	364	val_364
-1	374	val_374
-1	392	val_392
+1	366	val_366
+1	369	val_369
+1	375	val_375
+1	379	val_379
+1	382	val_382
+1	384	val_384
+1	389	val_389
+1	395	val_395
+1	396	val_396
 1	397	val_397
-1	4	val_4
-1	403	val_403
-1	404	val_404
-1	419	val_419
+1	400	val_400
+1	401	val_401
+1	407	val_407
+1	414	val_414
 1	421	val_421
 1	427	val_427
-1	429	val_429
-1	437	val_437
+1	430	val_430
+1	435	val_435
 1	438	val_438
-1	439	val_439
 1	454	val_454
-1	455	val_455
-1	460	val_460
-1	463	val_463
-1	470	val_470
+1	47	val_47
+1	472	val_472
 1	478	val_478
-1	479	val_479
+1	480	val_480
+1	481	val_481
+1	485	val_485
 1	489	val_489
-1	491	val_491
-1	492	val_492
-1	53	val_53
-1	67	val_67
-1	82	val_82
-1	90	val_90
-1	97	val_97
-1	10	val_10
+1	57	val_57
+1	69	val_69
+1	74	val_74
+1	78	val_78
+1	8	val_8
+1	86	val_86
+1	9	val_9
+1	0	val_0
+1	12	val_12
 1	125	val_125
+1	126	val_126
+1	128	val_128
 1	134	val_134
-1	143	val_143
-1	145	val_145
-1	149	val_149
-1	150	val_150
+1	138	val_138
+1	146	val_146
 1	158	val_158
-1	163	val_163
 1	164	val_164
+1	165	val_165
 1	166	val_166
-1	17	val_17
-1	170	val_170
 1	172	val_172
+1	177	val_177
+1	179	val_179
+1	18	val_18
+1	181	val_181
 1	189	val_189
-1	19	val_19
+1	191	val_191
+1	193	val_193
 1	195	val_195
-1	196	val_196
-1	20	val_20
-1	209	val_209
-1	216	val_216
-1	217	val_217
-1	224	val_224
-1	228	val_228
+1	201	val_201
+1	205	val_205
 1	229	val_229
-1	233	val_233
-1	241	val_241
-1	244	val_244
-1	247	val_247
-1	255	val_255
-1	258	val_258
-1	26	val_26
-1	263	val_263
+1	235	val_235
+1	237	val_237
+1	238	val_238
+1	24	val_24
+1	242	val_242
+1	248	val_248
+1	249	val_249
+1	262	val_262
 1	265	val_265
-1	266	val_266
-1	272	val_272
-1	273	val_273
-1	274	val_274
-1	281	val_281
+1	282	val_282
+1	283	val_283
+1	287	val_287
 1	291	val_291
-1	296	val_296
-1	30	val_30
-1	302	val_302
+1	298	val_298
+1	308	val_308
 1	309	val_309
-1	316	val_316
-1	318	val_318
+1	310	val_310
+1	315	val_315
 1	325	val_325
 1	332	val_332
-1	335	val_335
+1	333	val_333
 1	339	val_339
-1	342	val_342
-1	345	val_345
 1	353	val_353
-1	369	val_369
+1	356	val_356
+1	364	val_364
 1	373	val_373
-1	375	val_375
-1	377	val_377
-1	384	val_384
+1	378	val_378
 1	386	val_386
-1	394	val_394
-1	396	val_396
-1	399	val_399
-1	401	val_401
-1	41	val_41
-1	413	val_413
-1	414	val_414
-1	431	val_431
-1	446	val_446
-1	448	val_448
-1	449	val_449
-1	459	val_459
-1	462	val_462
-1	468	val_468
-1	47	val_47
-1	482	val_482
-1	490	val_490
-1	493	val_493
-1	494	val_494
-1	497	val_497
-1	5	val_5
-1	54	val_54
-1	74	val_74
-1	77	val_77
-1	80	val_80
-1	84	val_84
-1	85	val_85
-1	87	val_87
-1	9	val_9
-1	95	val_95
-1	100	val_100
-1	11	val_11
-1	113	val_113
-1	119	val_119
-1	126	val_126
-1	128	val_128
-1	137	val_137
-1	146	val_146
-1	15	val_15
-1	152	val_152
-1	165	val_165
-1	167	val_167
-1	169	val_169
-1	175	val_175
-1	177	val_177
-1	179	val_179
-1	18	val_18
-1	194	val_194
-1	200	val_200
-1	202	val_202
-1	221	val_221
-1	222	val_222
-1	226	val_226
-1	242	val_242
-1	252	val_252
-1	262	val_262
-1	27	val_27
-1	275	val_275
-1	280	val_280
-1	282	val_282
-1	283	val_283
-1	287	val_287
-1	288	val_288
-1	289	val_289
-1	292	val_292
-1	311	val_311
-1	323	val_323
-1	34	val_34
-1	35	val_35
-1	365	val_365
-1	393	val_393
-1	409	val_409
+1	402	val_402
+1	403	val_403
 1	411	val_411
-1	417	val_417
-1	418	val_418
+1	419	val_419
 1	424	val_424
+1	429	val_429
 1	43	val_43
 1	432	val_432
-1	435	val_435
-1	443	val_443
-1	444	val_444
-1	453	val_453
-1	457	val_457
+1	436	val_436
+1	449	val_449
 1	458	val_458
+1	467	val_467
 1	469	val_469
 1	475	val_475
-1	477	val_477
-1	481	val_481
-1	483	val_483
-1	64	val_64
-1	72	val_72
-1	76	val_76
+1	482	val_482
+1	484	val_484
+1	495	val_495
+1	496	val_496
+1	497	val_497
+1	58	val_58
+1	70	val_70
 1	83	val_83
-1	86	val_86
+1	92	val_92
+1	97	val_97
 1	98	val_98
 PREHOOK: query: SELECT 
 count(1) as counts,
@@ -7688,314 +7717,314 @@ POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-1	0	val_0
-1	103	val_103
-1	105	val_105
 1	116	val_116
+1	118	val_118
 1	120	val_120
-1	129	val_129
 1	131	val_131
-1	136	val_136
+1	133	val_133
+1	15	val_15
+1	150	val_150
+1	152	val_152
+1	153	val_153
 1	155	val_155
-1	157	val_157
 1	160	val_160
-1	180	val_180
+1	169	val_169
+1	175	val_175
+1	176	val_176
+1	178	val_178
 1	183	val_183
-1	190	val_190
-1	191	val_191
-1	193	val_193
-1	205	val_205
-1	207	val_207
+1	186	val_186
+1	194	val_194
+1	202	val_202
+1	203	val_203
 1	213	val_213
 1	223	val_223
-1	235	val_235
-1	238	val_238
+1	224	val_224
+1	226	val_226
+1	228	val_228
 1	239	val_239
-1	24	val_24
-1	248	val_248
-1	260	val_260
+1	244	val_244
+1	247	val_247
+1	252	val_252
+1	255	val_255
+1	256	val_256
+1	257	val_257
+1	266	val_266
+1	272	val_272
+1	274	val_274
+1	275	val_275
 1	28	val_28
+1	284	val_284
 1	286	val_286
-1	298	val_298
-1	305	val_305
+1	289	val_289
+1	296	val_296
+1	302	val_302
 1	306	val_306
 1	307	val_307
-1	308	val_308
-1	315	val_315
 1	317	val_317
 1	321	val_321
+1	323	val_323
 1	33	val_33
-1	331	val_331
-1	356	val_356
+1	338	val_338
+1	34	val_34
+1	35	val_35
 1	360	val_360
-1	366	val_366
-1	367	val_367
-1	368	val_368
-1	37	val_37
-1	378	val_378
-1	379	val_379
-1	382	val_382
-1	389	val_389
-1	395	val_395
-1	400	val_400
-1	402	val_402
+1	365	val_365
+1	374	val_374
+1	377	val_377
+1	393	val_393
+1	399	val_399
+1	404	val_404
 1	406	val_406
-1	407	val_407
+1	409	val_409
+1	41	val_41
+1	417	val_417
+1	418	val_418
 1	42	val_42
-1	430	val_430
-1	436	val_436
+1	431	val_431
+1	439	val_439
 1	44	val_44
-1	452	val_452
-1	466	val_466
-1	467	val_467
-1	472	val_472
-1	480	val_480
-1	484	val_484
-1	485	val_485
-1	487	val_487
-1	495	val_495
-1	496	val_496
-1	498	val_498
-1	51	val_51
-1	57	val_57
-1	58	val_58
-1	65	val_65
+1	443	val_443
+1	448	val_448
+1	455	val_455
+1	459	val_459
+1	462	val_462
+1	463	val_463
+1	470	val_470
+1	490	val_490
+1	491	val_491
+1	494	val_494
+1	5	val_5
+1	53	val_53
 1	66	val_66
-1	69	val_69
-1	70	val_70
-1	78	val_78
-1	8	val_8
-1	92	val_92
-1	96	val_96
-1	104	val_104
+1	72	val_72
+1	76	val_76
+1	77	val_77
+1	80	val_80
+1	84	val_84
+1	90	val_90
+1	10	val_10
+1	105	val_105
 1	111	val_111
-1	114	val_114
-1	118	val_118
-1	12	val_12
-1	133	val_133
-1	138	val_138
-1	153	val_153
-1	156	val_156
-1	162	val_162
-1	168	val_168
+1	113	val_113
+1	119	val_119
+1	129	val_129
+1	136	val_136
+1	143	val_143
+1	149	val_149
+1	163	val_163
+1	167	val_167
 1	174	val_174
-1	176	val_176
-1	178	val_178
-1	181	val_181
-1	186	val_186
 1	187	val_187
-1	192	val_192
 1	197	val_197
-1	199	val_199
 1	2	val_2
-1	201	val_201
-1	203	val_203
+1	200	val_200
 1	208	val_208
-1	214	val_214
+1	209	val_209
+1	216	val_216
+1	217	val_217
 1	218	val_218
-1	219	val_219
+1	221	val_221
 1	230	val_230
-1	237	val_237
-1	249	val_249
-1	256	val_256
-1	257	val_257
+1	258	val_258
+1	26	val_26
+1	263	val_263
+1	273	val_273
 1	277	val_277
-1	278	val_278
-1	284	val_284
-1	285	val_285
-1	310	val_310
-1	322	val_322
-1	327	val_327
-1	333	val_333
-1	336	val_336
-1	338	val_338
+1	281	val_281
+1	292	val_292
+1	30	val_30
+1	316	val_316
+1	335	val_335
 1	341	val_341
+1	342	val_342
 1	344	val_344
-1	348	val_348
-1	351	val_351
+1	345	val_345
 1	362	val_362
-1	364	val_364
-1	374	val_374
+1	367	val_367
+1	368	val_368
+1	37	val_37
 1	392	val_392
-1	397	val_397
+1	394	val_394
 1	4	val_4
-1	403	val_403
-1	404	val_404
-1	419	val_419
-1	421	val_421
-1	427	val_427
-1	429	val_429
+1	413	val_413
 1	437	val_437
-1	438	val_438
-1	439	val_439
-1	454	val_454
-1	455	val_455
+1	444	val_444
+1	446	val_446
+1	452	val_452
+1	453	val_453
+1	457	val_457
 1	460	val_460
-1	463	val_463
-1	470	val_470
-1	478	val_478
+1	466	val_466
+1	468	val_468
+1	477	val_477
 1	479	val_479
-1	489	val_489
-1	491	val_491
+1	483	val_483
+1	487	val_487
 1	492	val_492
-1	53	val_53
-1	67	val_67
-1	82	val_82
-1	90	val_90
-1	97	val_97
-1	10	val_10
-1	125	val_125
-1	134	val_134
-1	143	val_143
+1	493	val_493
+1	498	val_498
+1	51	val_51
+1	54	val_54
+1	64	val_64
+1	65	val_65
+1	67	val_67
+1	82	val_82
+1	85	val_85
+1	87	val_87
+1	95	val_95
+1	96	val_96
+1	100	val_100
+1	103	val_103
+1	104	val_104
+1	11	val_11
+1	114	val_114
+1	137	val_137
 1	145	val_145
-1	149	val_149
-1	150	val_150
-1	158	val_158
-1	163	val_163
-1	164	val_164
-1	166	val_166
+1	156	val_156
+1	157	val_157
+1	162	val_162
+1	168	val_168
 1	17	val_17
 1	170	val_170
-1	172	val_172
-1	189	val_189
+1	180	val_180
 1	19	val_19
-1	195	val_195
+1	190	val_190
+1	192	val_192
 1	196	val_196
+1	199	val_199
 1	20	val_20
-1	209	val_209
-1	216	val_216
-1	217	val_217
-1	224	val_224
-1	228	val_228
-1	229	val_229
+1	207	val_207
+1	214	val_214
+1	219	val_219
+1	222	val_222
 1	233	val_233
 1	241	val_241
-1	244	val_244
-1	247	val_247
-1	255	val_255
-1	258	val_258
-1	26	val_26
-1	263	val_263
-1	265	val_265
-1	266	val_266
-1	272	val_272
-1	273	val_273
-1	274	val_274
-1	281	val_281
-1	291	val_291
-1	296	val_296
-1	30	val_30
-1	302	val_302
-1	309	val_309
-1	316	val_316
+1	260	val_260
+1	27	val_27
+1	278	val_278
+1	280	val_280
+1	285	val_285
+1	288	val_288
+1	305	val_305
+1	311	val_311
 1	318	val_318
-1	325	val_325
-1	332	val_332
-1	335	val_335
-1	339	val_339
-1	342	val_342
-1	345	val_345
-1	353	val_353
+1	322	val_322
+1	327	val_327
+1	331	val_331
+1	336	val_336
+1	348	val_348
+1	351	val_351
+1	366	val_366
 1	369	val_369
-1	373	val_373
 1	375	val_375
-1	377	val_377
+1	379	val_379
+1	382	val_382
 1	384	val_384
-1	386	val_386
-1	394	val_394
+1	389	val_389
+1	395	val_395
 1	396	val_396
-1	399	val_399
+1	397	val_397
+1	400	val_400
 1	401	val_401
-1	41	val_41
-1	413	val_413
+1	407	val_407
 1	414	val_414
-1	431	val_431
-1	446	val_446
-1	448	val_448
-1	449	val_449
-1	459	val_459
-1	462	val_462
-1	468	val_468
+1	421	val_421
+1	427	val_427
+1	430	val_430
+1	435	val_435
+1	438	val_438
+1	454	val_454
 1	47	val_47
-1	482	val_482
-1	490	val_490
-1	493	val_493
-1	494	val_494
-1	497	val_497
-1	5	val_5
-1	54	val_54
+1	472	val_472
+1	478	val_478
+1	480	val_480
+1	481	val_481
+1	485	val_485
+1	489	val_489
+1	57	val_57
+1	69	val_69
 1	74	val_74
-1	77	val_77
-1	80	val_80
-1	84	val_84
-1	85	val_85
-1	87	val_87
+1	78	val_78
+1	8	val_8
+1	86	val_86
 1	9	val_9
-1	95	val_95
-1	100	val_100
-1	11	val_11
-1	113	val_113
-1	119	val_119
+1	0	val_0
+1	12	val_12
+1	125	val_125
 1	126	val_126
 1	128	val_128
-1	137	val_137
+1	134	val_134
+1	138	val_138
 1	146	val_146
-1	15	val_15
-1	152	val_152
+1	158	val_158
+1	164	val_164
 1	165	val_165
-1	167	val_167
-1	169	val_169
-1	175	val_175
+1	166	val_166
+1	172	val_172
 1	177	val_177
 1	179	val_179
 1	18	val_18
-1	194	val_194
-1	200	val_200
-1	202	val_202
-1	221	val_221
-1	222	val_222
-1	226	val_226
+1	181	val_181
+1	189	val_189
+1	191	val_191
+1	193	val_193
+1	195	val_195
+1	201	val_201
+1	205	val_205
+1	229	val_229
+1	235	val_235
+1	237	val_237
+1	238	val_238
+1	24	val_24
 1	242	val_242
-1	252	val_252
+1	248	val_248
+1	249	val_249
 1	262	val_262
-1	27	val_27
-1	275	val_275
-1	280	val_280
+1	265	val_265
 1	282	val_282
 1	283	val_283
 1	287	val_287
-1	288	val_288
-1	289	val_289
-1	292	val_292
-1	311	val_311
-1	323	val_323
-1	34	val_34
-1	35	val_35
-1	365	val_365
-1	393	val_393
-1	409	val_409
+1	291	val_291
+1	298	val_298
+1	308	val_308
+1	309	val_309
+1	310	val_310
+1	315	val_315
+1	325	val_325
+1	332	val_332
+1	333	val_333
+1	339	val_339
+1	353	val_353
+1	356	val_356
+1	364	val_364
+1	373	val_373
+1	378	val_378
+1	386	val_386
+1	402	val_402
+1	403	val_403
 1	411	val_411
-1	417	val_417
-1	418	val_418
+1	419	val_419
 1	424	val_424
+1	429	val_429
 1	43	val_43
 1	432	val_432
-1	435	val_435
-1	443	val_443
-1	444	val_444
-1	453	val_453
-1	457	val_457
+1	436	val_436
+1	449	val_449
 1	458	val_458
+1	467	val_467
 1	469	val_469
 1	475	val_475
-1	477	val_477
-1	481	val_481
-1	483	val_483
-1	64	val_64
-1	72	val_72
-1	76	val_76
+1	482	val_482
+1	484	val_484
+1	495	val_495
+1	496	val_496
+1	497	val_497
+1	58	val_58
+1	70	val_70
 1	83	val_83
-1	86	val_86
+1	92	val_92
+1	97	val_97
 1	98	val_98
 PREHOOK: query: create table jackson_sev_same as select * from src
 PREHOOK: type: CREATETABLE_AS_SELECT
@@ -9031,9 +9060,9 @@ POSTHOOK: query: select * from union_out
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@union_out
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-4
-1
 2
+1
+4
 3
 PREHOOK: query: create table union_subq_union30(key int, value string)
 PREHOOK: type: CREATETABLE
@@ -11880,15 +11909,15 @@ POSTHOOK: Input: default@src10_2
 POSTHOOK: Input: default@src10_3
 POSTHOOK: Input: default@src10_4
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-238	val_238
-484	val_484
-278	val_278
 255	val_255
-165	val_165
+409	val_409
 27	val_27
+278	val_278
 311	val_311
-409	val_409
 86	val_86
+165	val_165
+238	val_238
+484	val_484
 98	val_98
 PREHOOK: query: explain
 SELECT * FROM (
@@ -12083,13 +12112,13 @@ POSTHOOK: Input: default@src10_2
 POSTHOOK: Input: default@src10_3
 POSTHOOK: Input: default@src10_4
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-238	val_238
-484	val_484
-278	val_278
 255	val_255
-165	val_165
+409	val_409
 27	val_27
+278	val_278
 311	val_311
-409	val_409
 86	val_86
+165	val_165
+238	val_238
+484	val_484
 98	val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/unionDistinct_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_3.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_3.q.out
index 65a57e0..cb5b912 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_3.q.out
@@ -489,315 +489,315 @@ POSTHOOK: query: select unionsrc.key, unionsrc.value FROM (select s1.key as key,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-0	val_0
-103	val_103
+104	val_104
 105	val_105
-116	val_116
+113	val_113
+118	val_118
+12	val_12
 120	val_120
-129	val_129
-131	val_131
+133	val_133
 136	val_136
 155	val_155
-157	val_157
+158	val_158
 160	val_160
+162	val_162
+168	val_168
+17	val_17
+170	val_170
+175	val_175
+18	val_18
 180	val_180
-183	val_183
-190	val_190
-191	val_191
-193	val_193
-205	val_205
-207	val_207
-213	val_213
-223	val_223
+186	val_186
+19	val_19
+197	val_197
+200	val_200
+216	val_216
+218	val_218
+222	val_222
+224	val_224
+228	val_228
 235	val_235
-238	val_238
+237	val_237
 239	val_239
-24	val_24
-248	val_248
-260	val_260
+244	val_244
+247	val_247
+256	val_256
+263	val_263
+273	val_273
 28	val_28
+283	val_283
 286	val_286
-298	val_298
-305	val_305
+292	val_292
 306	val_306
-307	val_307
 308	val_308
+327	val_327
+33	val_33
+348	val_348
+353	val_353
+362	val_362
+366	val_366
+396	val_396
+397	val_397
+401	val_401
+409	val_409
+411	val_411
+419	val_419
+427	val_427
+43	val_43
+432	val_432
+436	val_436
+439	val_439
+443	val_443
+453	val_453
+460	val_460
+462	val_462
+47	val_47
+472	val_472
+485	val_485
+496	val_496
+54	val_54
+64	val_64
+70	val_70
+8	val_8
+83	val_83
+84	val_84
+85	val_85
+90	val_90
+0	val_0
+103	val_103
+114	val_114
+125	val_125
+138	val_138
+146	val_146
+150	val_150
+152	val_152
+153	val_153
+156	val_156
+157	val_157
+165	val_165
+172	val_172
+177	val_177
+179	val_179
+187	val_187
+195	val_195
+196	val_196
+217	val_217
+242	val_242
+248	val_248
+252	val_252
+265	val_265
+27	val_27
+272	val_272
+280	val_280
+291	val_291
+305	val_305
+309	val_309
+311	val_311
 315	val_315
 317	val_317
-321	val_321
-33	val_33
-331	val_331
+322	val_322
+333	val_333
+34	val_34
+345	val_345
+35	val_35
 356	val_356
-360	val_360
-366	val_366
-367	val_367
+364	val_364
 368	val_368
+369	val_369
 37	val_37
-378	val_378
-379	val_379
-382	val_382
-389	val_389
-395	val_395
-400	val_400
+373	val_373
+377	val_377
+4	val_4
 402	val_402
-406	val_406
-407	val_407
+404	val_404
+413	val_413
 42	val_42
 430	val_430
-436	val_436
-44	val_44
+431	val_431
+444	val_444
+449	val_449
 452	val_452
+454	val_454
+457	val_457
+463	val_463
 466	val_466
-467	val_467
-472	val_472
-480	val_480
-484	val_484
-485	val_485
-487	val_487
-495	val_495
-496	val_496
-498	val_498
-51	val_51
+470	val_470
+475	val_475
+481	val_481
+489	val_489
+491	val_491
 57	val_57
-58	val_58
 65	val_65
 66	val_66
-69	val_69
-70	val_70
+74	val_74
+76	val_76
 78	val_78
-8	val_8
+9	val_9
 92	val_92
-96	val_96
-104	val_104
-111	val_111
-114	val_114
-118	val_118
-12	val_12
-133	val_133
-138	val_138
-153	val_153
-156	val_156
-162	val_162
-168	val_168
+95	val_95
+100	val_100
+119	val_119
+128	val_128
+129	val_129
+145	val_145
+167	val_167
 174	val_174
-176	val_176
 178	val_178
 181	val_181
-186	val_186
-187	val_187
-192	val_192
-197	val_197
+193	val_193
 199	val_199
-2	val_2
+20	val_20
 201	val_201
-203	val_203
-208	val_208
+213	val_213
 214	val_214
-218	val_218
 219	val_219
-230	val_230
-237	val_237
+221	val_221
+223	val_223
+226	val_226
+233	val_233
+241	val_241
 249	val_249
-256	val_256
-257	val_257
+260	val_260
+262	val_262
 277	val_277
-278	val_278
-284	val_284
-285	val_285
+281	val_281
+287	val_287
+288	val_288
+298	val_298
+302	val_302
 310	val_310
-322	val_322
-327	val_327
-333	val_333
+323	val_323
 336	val_336
-338	val_338
 341	val_341
 344	val_344
-348	val_348
 351	val_351
-362	val_362
-364	val_364
-374	val_374
-392	val_392
-397	val_397
-4	val_4
+375	val_375
+382	val_382
+384	val_384
+393	val_393
+395	val_395
+399	val_399
 403	val_403
-404	val_404
-419	val_419
-421	val_421
-427	val_427
-429	val_429
-437	val_437
-438	val_438
-439	val_439
-454	val_454
+406	val_406
+418	val_418
+435	val_435
 455	val_455
-460	val_460
-463	val_463
-470	val_470
+459	val_459
+477	val_477
 478	val_478
 479	val_479
-489	val_489
-491	val_491
-492	val_492
-53	val_53
+482	val_482
+493	val_493
+494	val_494
+495	val_495
+497	val_497
+5	val_5
+58	val_58
 67	val_67
-82	val_82
-90	val_90
+77	val_77
+80	val_80
+86	val_86
 97	val_97
+98	val_98
 10	val_10
-125	val_125
+11	val_11
+111	val_111
+116	val_116
+126	val_126
+131	val_131
 134	val_134
+137	val_137
 143	val_143
-145	val_145
 149	val_149
-150	val_150
-158	val_158
+15	val_15
 163	val_163
 164	val_164
 166	val_166
-17	val_17
-170	val_170
-172	val_172
+169	val_169
+176	val_176
+183	val_183
 189	val_189
-19	val_19
-195	val_195
-196	val_196
-20	val_20
+190	val_190
+191	val_191
+192	val_192
+194	val_194
+2	val_2
+202	val_202
+203	val_203
+205	val_205
+207	val_207
+208	val_208
 209	val_209
-216	val_216
-217	val_217
-224	val_224
-228	val_228
 229	val_229
-233	val_233
-241	val_241
-244	val_244
-247	val_247
+230	val_230
+238	val_238
+24	val_24
 255	val_255
+257	val_257
 258	val_258
 26	val_26
-263	val_263
-265	val_265
 266	val_266
-272	val_272
-273	val_273
 274	val_274
-281	val_281
-291	val_291
+275	val_275
+278	val_278
+282	val_282
+284	val_284
+285	val_285
+289	val_289
 296	val_296
 30	val_30
-302	val_302
-309	val_309
+307	val_307
 316	val_316
 318	val_318
+321	val_321
 325	val_325
+331	val_331
 332	val_332
 335	val_335
+338	val_338
 339	val_339
 342	val_342
-345	val_345
-353	val_353
-369	val_369
-373	val_373
-375	val_375
-377	val_377
-384	val_384
+360	val_360
+365	val_365
+367	val_367
+374	val_374
+378	val_378
+379	val_379
 386	val_386
+389	val_389
+392	val_392
 394	val_394
-396	val_396
-399	val_399
-401	val_401
+400	val_400
+407	val_407
 41	val_41
-413	val_413
 414	val_414
-431	val_431
-446	val_446
-448	val_448
-449	val_449
-459	val_459
-462	val_462
-468	val_468
-47	val_47
-482	val_482
-490	val_490
-493	val_493
-494	val_494
-497	val_497
-5	val_5
-54	val_54
-74	val_74
-77	val_77
-80	val_80
-84	val_84
-85	val_85
-87	val_87
-9	val_9
-95	val_95
-100	val_100
-11	val_11
-113	val_113
-119	val_119
-126	val_126
-128	val_128
-137	val_137
-146	val_146
-15	val_15
-152	val_152
-165	val_165
-167	val_167
-169	val_169
-175	val_175
-177	val_177
-179	val_179
-18	val_18
-194	val_194
-200	val_200
-202	val_202
-221	val_221
-222	val_222
-226	val_226
-242	val_242
-252	val_252
-262	val_262
-27	val_27
-275	val_275
-280	val_280
-282	val_282
-283	val_283
-287	val_287
-288	val_288
-289	val_289
-292	val_292
-311	val_311
-323	val_323
-34	val_34
-35	val_35
-365	val_365
-393	val_393
-409	val_409
-411	val_411
 417	val_417
-418	val_418
+421	val_421
 424	val_424
-43	val_43
-432	val_432
-435	val_435
-443	val_443
-444	val_444
-453	val_453
-457	val_457
+429	val_429
+437	val_437
+438	val_438
+44	val_44
+446	val_446
+448	val_448
 458	val_458
+467	val_467
+468	val_468
 469	val_469
-475	val_475
-477	val_477
-481	val_481
+480	val_480
 483	val_483
-64	val_64
+484	val_484
+487	val_487
+490	val_490
+492	val_492
+498	val_498
+51	val_51
+53	val_53
+69	val_69
 72	val_72
-76	val_76
-83	val_83
-86	val_86
-98	val_98
+82	val_82
+87	val_87
+96	val_96
 PREHOOK: query: explain 
   select unionsrc.key, count(1) FROM (select 'tst1' as key, count(1) as value from src s1
                                         UNION DISTINCT  
@@ -2145,539 +2145,539 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src_thrift
 #### A masked pattern was here ####
-03	1
-071	1
-09	1
-1	1
+013	1
+061	1
+063	1
+064	1
+074	1
+08	1
+081	1
+094	1
 10	1
 100	1
+103	1
 104	1
-111	1
-114	1
-116	1
-123	1
+105	1
+11	1
 126	1
 128	1
-131	1
+129	1
+133	1
 134	1
-14	1
+136	1
+143	1
+149	1
 152	1
-155	1
+153	1
+157	1
+162	1
+166	1
 169	1
-17	1
 170	1
-172	1
-178	1
-179	1
-182	1
-189	1
-19	1
-192	1
-194	1
-195	1
-199	1
-20	1
-207	1
-21	1
+174	1
+176	1
+184	1
+193	1
+196	1
+201	1
+205	1
+209	1
 213	1
 218	1
+221	1
 223	1
-229	1
 233	1
-235	1
+234	1
+239	1
 24	1
-256	1
-257	1
+241	1
+242	1
+247	1
+248	1
+251	1
+254	1
 26	1
-265	1
-266	1
-27	1
-278	1
-280	1
-284	1
-291	1
-294	1
-30	1
+263	1
+264	1
+272	1
+275	1
+285	1
+293	1
+296	1
+298	1
 301	1
 302	1
-305	1
-312	1
-314	1
-316	1
-321	1
+307	1
+310	1
 323	1
-33	1
+325	1
 333	1
+335	1
 338	1
-344	1
-353	1
-356	1
-361	1
-364	1
-368	1
-369	1
-37	1
+360	1
+362	1
+367	1
+375	1
 377	1
-378	1
-386	1
+38	1
+384	1
 392	1
-397	1
+399	1
 40	1
-404	1
-407	1
-411	1
-418	1
+401	1
+402	1
+403	1
+412	1
+413	1
+417	1
 419	1
-422	1
-424	1
-430	1
-432	1
-436	1
-437	1
-448	1
-454	1
-457	1
-46	1
-468	1
-477	1
+42	1
+427	1
+438	1
+44	1
+458	1
+459	1
+461	1
+466	1
+469	1
+472	1
+475	1
+478	1
 479	1
-490	1
-492	1
-493	1
+483	1
+489	1
 495	1
 496	1
-497	1
-501	1
+5	1
 533	1
-534	1
-552	1
+551	1
 57	1
+573	1
+58	1
 582	1
-611	1
-62	1
+593	1
+594	1
+604	1
+64	1
 652	1
-67	1
-671	1
-691	1
-712	1
-723	1
-73	1
-732	1
-75	1
-751	1
-761	1
-794	1
-8	1
-80	1
-814	1
-822	1
-831	1
-85	1
-854	1
-863	1
-871	1
-874	1
-882	1
+66	1
+682	1
+683	1
+69	1
+702	1
+713	1
+72	1
+76	1
+763	1
+77	1
+771	1
+774	1
+782	1
+791	1
+802	1
+812	1
+833	1
+842	1
+873	1
+894	1
 9	1
-902	1
-904	1
-91	1
-911	1
-92	1
-921	1
-922	1
+90	1
+903	1
+912	1
+933	1
+954	1
 964	1
-97	1
-974	1
-982	1
 983	1
-record_7	1
+984	1
+record_2	1
+record_3	1
+record_6	1
 record_8	1
 NULL	1
-002	1
+0	1
+004	1
+01	1
 02	1
 032	1
-034	1
-07	1
-074	1
+062	1
+082	1
 091	1
-105	1
-11	1
 113	1
-124	1
-136	1
+114	1
+116	1
+118	1
+122	1
+123	1
 137	1
 138	1
-143	1
-150	1
+14	1
+145	1
+146	1
+155	1
 158	1
-160	1
-162	1
+164	1
 165	1
-166	1
-174	1
-177	1
-18	1
-180	1
+178	1
+181	1
+183	1
 186	1
-196	1
-197	1
+189	1
+190	1
+191	1
+194	1
+195	1
+199	1
+2	1
 204	1
-217	1
-219	1
-226	1
+207	1
+208	1
+214	1
+216	1
+222	1
+224	1
+229	1
 230	1
 238	1
-242	1
-248	1
-252	1
+243	1
+244	1
+258	1
 260	1
-261	1
-263	1
-274	1
-277	1
-293	1
-296	1
-304	1
-307	1
-308	1
-325	1
-327	1
+262	1
+266	1
+27	1
+273	1
+28	1
+284	1
+288	1
+294	1
+30	1
+312	1
+314	1
+315	1
+321	1
+33	1
 342	1
-348	1
 35	1
-351	1
-367	1
+364	1
+365	1
+366	1
+368	1
 381	1
+386	1
 389	1
-393	1
 394	1
+396	1
+397	1
 4	1
-403	1
-409	1
-412	1
+41	1
 414	1
 421	1
-427	1
-429	1
-435	1
-438	1
-439	1
-45	1
+442	1
+444	1
+446	1
+448	1
+452	1
+454	1
 455	1
-458	1
 460	1
-461	1
-462	1
+463	1
 471	1
-475	1
-478	1
-480	1
-484	1
-487	1
+473	1
+482	1
+492	1
+493	1
 50	1
-503	1
-513	1
-521	1
-523	1
-53	1
-532	1
-551	1
-56	1
-563	1
-571	1
-573	1
-58	1
-59	1
-591	1
-603	1
-604	1
-622	1
+501	1
+502	1
+543	1
+554	1
+574	1
+584	1
+60	1
+621	1
 633	1
-634	1
-641	1
-644	1
+65	1
 651	1
-66	1
-661	1
-69	1
-693	1
-694	1
+662	1
+664	1
+681	1
+692	1
 703	1
-71	1
+712	1
+714	1
+723	1
 731	1
 734	1
-752	1
-754	1
-764	1
-77	1
-772	1
+751	1
 78	1
-784	1
-793	1
-803	1
-813	1
-83	1
-833	1
+80	1
+814	1
+831	1
+832	1
+834	1
 843	1
 844	1
-864	1
-89	1
-90	1
+852	1
+863	1
+882	1
+911	1
 924	1
+932	1
 934	1
-95	1
-954	1
-961	1
+942	1
+944	1
+963	1
+97	1
+982	1
+991	1
 993	1
-record_0	1
-record_2	1
-record_4	1
-record_6	1
+record_1	1
+record_7	1
 record_9	1
 001	1
-004	1
-01	1
-013	1
+002	1
 051	1
-061	1
-062	1
-063	1
+071	1
 102	1
-103	1
+111	1
+12	1
 120	1
-129	1
-133	1
-142	1
-145	1
-146	1
-149	1
-15	1
-157	1
-181	1
-187	1
-191	1
-2	1
-200	1
-201	1
-202	1
+131	1
+150	1
+156	1
+160	1
+163	1
+167	1
+168	1
+17	1
+175	1
+180	1
+182	1
+20	1
 203	1
-208	1
-214	1
-216	1
-222	1
-224	1
-228	1
+21	1
+226	1
 237	1
-239	1
-241	1
-244	1
-254	1
 255	1
-258	1
-262	1
-264	1
-273	1
-275	1
-28	1
+256	1
+261	1
+271	1
+274	1
+277	1
+281	1
 282	1
-285	1
 286	1
 287	1
-288	1
-29	1
+289	1
 292	1
-298	1
-310	1
-311	1
+308	1
+309	1
+318	1
+327	1
 332	1
-335	1
-336	1
 339	1
+34	1
+341	1
+348	1
 354	1
-360	1
-362	1
-373	1
-384	1
-395	1
-396	1
-402	1
-417	1
-42	1
+356	1
+361	1
+37	1
+372	1
+374	1
+379	1
+382	1
+409	1
+429	1
 43	1
-442	1
-444	1
-449	1
-453	1
-459	1
-47	1
+430	1
+431	1
+432	1
+435	1
+437	1
+439	1
+443	1
+45	1
+457	1
+462	1
+467	1
+470	1
 48	1
 481	1
-482	1
-483	1
-485	1
-489	1
+487	1
 494	1
-502	1
-541	1
-562	1
-574	1
-593	1
-60	1
-621	1
-631	1
-65	1
+51	1
+513	1
+521	1
+523	1
+532	1
+534	1
+552	1
+561	1
+563	1
+571	1
+603	1
+612	1
+62	1
+622	1
+641	1
+644	1
 653	1
 663	1
-664	1
-681	1
-682	1
-683	1
-713	1
-72	1
+68	1
+691	1
+70	1
+724	1
+73	1
+732	1
 74	1
-742	1
-76	1
-763	1
-771	1
+752	1
+754	1
 781	1
+784	1
 79	1
-791	1
 811	1
-812	1
 82	1
-834	1
-852	1
-86	1
+821	1
+83	1
+84	1
 861	1
-87	1
-872	1
-894	1
-903	1
-912	1
-914	1
-932	1
-942	1
-944	1
-96	1
-963	1
+904	1
+91	1
+941	1
+961	1
+971	1
+981	1
+record_4	1
 record_5	1
-0	1
 021	1
-064	1
-08	1
-081	1
-082	1
+03	1
+034	1
+07	1
 084	1
-094	1
-118	1
+09	1
+1	1
 119	1
-12	1
-122	1
+124	1
 125	1
-153	1
-156	1
-163	1
-164	1
-167	1
-168	1
-175	1
-176	1
-183	1
-184	1
-190	1
-193	1
-205	1
-209	1
-221	1
-234	1
-243	1
-247	1
+142	1
+15	1
+172	1
+177	1
+179	1
+18	1
+187	1
+19	1
+192	1
+197	1
+200	1
+202	1
+217	1
+219	1
+228	1
+235	1
 249	1
-251	1
-271	1
-272	1
-281	1
+252	1
+257	1
+265	1
+278	1
+280	1
 283	1
-289	1
+29	1
+291	1
+304	1
+305	1
 306	1
-309	1
-315	1
+311	1
+316	1
 317	1
-318	1
 322	1
 331	1
-34	1
-341	1
+336	1
+344	1
 345	1
-365	1
-366	1
-372	1
-374	1
-375	1
-379	1
-38	1
-382	1
+351	1
+353	1
+369	1
+373	1
+378	1
 391	1
-399	1
+393	1
+395	1
 400	1
-401	1
+404	1
 406	1
-41	1
-413	1
-431	1
-44	1
-443	1
-446	1
-452	1
-463	1
-466	1
-467	1
-469	1
-470	1
-472	1
-473	1
+407	1
+411	1
+418	1
+422	1
+424	1
+436	1
+449	1
+453	1
+46	1
+468	1
+47	1
+477	1
+480	1
+484	1
+485	1
+490	1
 491	1
+497	1
 498	1
-5	1
-51	1
+503	1
+53	1
 54	1
-543	1
-554	1
-561	1
+541	1
+56	1
+562	1
 572	1
-584	1
-594	1
-612	1
+59	1
+591	1
+611	1
 613	1
-64	1
-662	1
-68	1
-692	1
-70	1
-702	1
+631	1
+634	1
+661	1
+67	1
+671	1
+693	1
+694	1
 704	1
-714	1
-724	1
+71	1
+742	1
+75	1
+761	1
+764	1
+772	1
 773	1
-774	1
-782	1
-802	1
+793	1
+794	1
+8	1
+803	1
 81	1
-821	1
-832	1
-84	1
-842	1
+813	1
+822	1
+85	1
 851	1
-873	1
+854	1
+86	1
+864	1
+87	1
+871	1
+872	1
+874	1
+89	1
 892	1
-933	1
-941	1
-971	1
+902	1
+914	1
+92	1
+921	1
+922	1
+95	1
+96	1
 973	1
+974	1
 98	1
-981	1
-984	1
-991	1
-record_1	1
-record_3	1
+record_0	1

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
index 5cd5d41..4ca5f47 100644
--- a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out
@@ -176,6 +176,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	3                   
 	numRows             	15                  
 	rawDataSize         	3483                
@@ -228,6 +229,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	3                   
 	numRows             	15                  
 	rawDataSize         	3483                
@@ -292,6 +294,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	4                   
 	numRows             	20                  
 	rawDataSize         	4552                
@@ -506,10 +509,11 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1069                
-	totalSize           	3243                
+	totalSize           	3245                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -558,10 +562,11 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	15                  
 	rawDataSize         	3320                
-	totalSize           	3243                
+	totalSize           	3245                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -622,10 +627,11 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	20                  
 	rawDataSize         	4389                
-	totalSize           	4616                
+	totalSize           	4618                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/union_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/union_stats.q.out b/ql/src/test/results/clientpositive/llap/union_stats.q.out
index b56807c..5a088f4 100644
--- a/ql/src/test/results/clientpositive/llap/union_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/union_stats.q.out
@@ -62,6 +62,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'
@@ -83,6 +84,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'
@@ -146,6 +148,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'
@@ -167,6 +170,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'
@@ -251,6 +255,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
@@ -299,6 +304,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	10624               
@@ -355,6 +361,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	10624               

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
index e8bb722..451a6e1 100644
--- a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out
@@ -168,9 +168,9 @@ GROUP BY str2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@str_str_orc
 #### A masked pattern was here ####
-y	0.0
-NULL	0.0
 X	0.02
+NULL	0.0
+y	0.0
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
 SELECT COALESCE(str1, 0) as result
 from str_str_orc
@@ -393,9 +393,9 @@ GROUP BY str2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@str_str_orc
 #### A masked pattern was here ####
-y	0.0
-NULL	0.0
 X	0.02
+NULL	0.0
+y	0.0
 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION
 SELECT COALESCE(str1, 0) as result
 from str_str_orc

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
index f2277c1..a123a33 100644
--- a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out
@@ -1112,9 +1112,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_complex
 #### A masked pattern was here ####
 lst	strct
+["g","h","i"]	{"a":"five","b":"six"}
 ["a","b","c"]	{"a":"one","b":"two"}
 ["d","e","f"]	{"a":"three","b":"four"}
-["g","h","i"]	{"a":"five","b":"six"}
 PREHOOK: query: EXPLAIN VECTORIZATION DETAIL
 SELECT str, count(val)  FROM orc_create_complex GROUP BY str
 PREHOOK: type: QUERY
@@ -1253,9 +1253,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_complex
 #### A masked pattern was here ####
 str	_c1
+line2	4501
 line3	4501
 line1	4501
-line2	4501
 PREHOOK: query: EXPLAIN VECTORIZATION DETAIL
 SELECT strct.B, count(val) FROM orc_create_complex GROUP BY strct.B
 PREHOOK: type: QUERY
@@ -1492,6 +1492,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@orc_create_complex
 #### A masked pattern was here ####
 strct	mp	lst	str	_c4
-{"a":"three","b":"four"}	{"key21":"value21","key22":"value22","key23":"value23"}	["d","e","f"]	line2	4501
 {"a":"one","b":"two"}	{"key11":"value11","key12":"value12","key13":"value13"}	["a","b","c"]	line1	4501
+{"a":"three","b":"four"}	{"key21":"value21","key22":"value22","key23":"value23"}	["d","e","f"]	line2	4501
 {"a":"five","b":"six"}	{"key31":"value31","key32":"value32","key33":"value33"}	["g","h","i"]	line3	4501

http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
index ec3e2b8..e31de7d 100644
--- a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
+++ b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out
@@ -247,13 +247,13 @@ POSTHOOK: query: select s_store_id
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store
 #### A masked pattern was here ####
+AAAAAAAACAAAAAAA
+NULL
 AAAAAAAABAAAAAAA
 AAAAAAAAEAAAAAAA
 AAAAAAAAHAAAAAAA
-NULL
 AAAAAAAAIAAAAAAA
 AAAAAAAAKAAAAAAA
-AAAAAAAACAAAAAAA
 PREHOOK: query: explain vectorization expression
 select s_store_id, GROUPING__ID
  from store
@@ -385,13 +385,13 @@ POSTHOOK: query: select s_store_id, GROUPING__ID
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store
 #### A masked pattern was here ####
+AAAAAAAACAAAAAAA	0
+NULL	1
 AAAAAAAABAAAAAAA	0
 AAAAAAAAEAAAAAAA	0
 AAAAAAAAHAAAAAAA	0
-NULL	1
 AAAAAAAAIAAAAAAA	0
 AAAAAAAAKAAAAAAA	0
-AAAAAAAACAAAAAAA	0
 PREHOOK: query: explain
 select s_store_id, GROUPING__ID
  from store