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/02 18:33:02 UTC

[22/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/54651c78/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
index 44362be..fb59f10 100644
--- a/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/intersect_distinct.q.out
@@ -281,315 +281,315 @@ POSTHOOK: query: select * from src intersect distinct select * from src
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-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
-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
-386	val_386
-394	val_394
-396	val_396
-399	val_399
-401	val_401
-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
+338	val_338
+339	val_339
+342	val_342
+360	val_360
 365	val_365
-393	val_393
-409	val_409
-411	val_411
+367	val_367
+374	val_374
+378	val_378
+379	val_379
+386	val_386
+389	val_389
+392	val_392
+394	val_394
+400	val_400
+407	val_407
+41	val_41
+414	val_414
 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 * from src intersect distinct select * from src intersect distinct select * from src intersect distinct select * from src
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from src intersect distinct select * from src intersect distinct select * from src intersect distinct select * from src
@@ -826,315 +826,315 @@ POSTHOOK: query: select * from src intersect distinct select * from src intersec
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-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 value from a group by value intersect distinct select key from b group by key
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select value from a group by value intersect distinct select key from b group by key

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
index 65ee468..7664912 100644
--- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out
@@ -90,6 +90,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -111,6 +112,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'
@@ -166,6 +168,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'
@@ -187,6 +190,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'
@@ -266,6 +270,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'
@@ -313,6 +318,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value,val2
                           columns.comments 
@@ -394,6 +400,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,val2
                 columns.comments 
@@ -616,6 +623,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'
@@ -637,6 +645,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'
@@ -692,6 +701,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'
@@ -713,6 +723,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'
@@ -767,6 +778,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'
@@ -788,6 +800,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'
@@ -843,6 +856,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'
@@ -864,6 +878,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'
@@ -935,6 +950,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value,val2
                           columns.comments 
@@ -1016,6 +1032,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,val2
                 columns.comments 
@@ -1245,6 +1262,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'
@@ -1314,6 +1332,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'
@@ -1335,6 +1354,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'
@@ -1390,6 +1410,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'
@@ -1411,6 +1432,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'
@@ -1460,6 +1482,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value,val2
                           columns.comments 
@@ -1541,6 +1564,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,val2
                 columns.comments 
@@ -1772,6 +1796,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'
@@ -1820,6 +1845,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'
@@ -1841,6 +1867,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'
@@ -1896,6 +1923,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'
@@ -1917,6 +1945,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'
@@ -1966,6 +1995,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value,val2
                           columns.comments 
@@ -2073,6 +2103,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,val2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/lateral_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lateral_view.q.out b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
index 80328e9..3fae367 100644
--- a/ql/src/test/results/clientpositive/llap/lateral_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/lateral_view.q.out
@@ -716,16 +716,16 @@ LATERAL VIEW explode(value) myTable AS myCol
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@tmp_pyang_src_rcfile
 #### A masked pattern was here ####
-["val_0"]	val_0
+["val_100"]	val_100
 ["val_10"]	val_10
-["val_104"]	val_104
-["val_105"]	val_105
 ["val_111"]	val_111
 ["val_113"]	val_113
-["val_114"]	val_114
-["val_116"]	val_116
-["val_119"]	val_119
 ["val_103"]	val_103
-["val_100"]	val_100
+["val_104"]	val_104
+["val_105"]	val_105
 ["val_11"]	val_11
+["val_114"]	val_114
 ["val_118"]	val_118
+["val_0"]	val_0
+["val_116"]	val_116
+["val_119"]	val_119

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/lineage2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/lineage2.q.out b/ql/src/test/results/clientpositive/llap/lineage2.q.out
index bac5863..da98117 100644
--- a/ql/src/test/results/clientpositive/llap/lineage2.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage2.q.out
@@ -143,18 +143,18 @@ PREHOOK: Input: default@dest1
 {"version":"1.0","engine":"tez","database":"default","hash":"f74475552dc79e09d4e75116c0cc9f37","queryText":"select key, count(1) a from dest1 group by key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"count(*)","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"key"},{"id":1,"vertexType":"COLUMN","vertexId":"a"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.key"},{"id":3,"vertexType":"TABLE","vertexId":"default.dest1"}]}
 128	2
 213	2
-278	2
-369	2
-	20
-150	2
-238	2
+401	2
 66	2
 146	2
 224	2
-255	2
+238	2
 273	2
+	20
+150	2
+255	2
+278	2
 311	2
-401	2
+369	2
 406	2
 98	2
 PREHOOK: query: select key k, count(*) from dest1 group by key
@@ -164,18 +164,18 @@ PREHOOK: Input: default@dest1
 {"version":"1.0","engine":"tez","database":"default","hash":"3a519d9badc7e8b87b42ba96a6f922ef","queryText":"select key k, count(*) from dest1 group by key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"count(*)","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"k"},{"id":1,"vertexType":"COLUMN","vertexId":"_c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.key"},{"id":3,"vertexType":"TABLE","vertexId":"default.dest1"}]}
 128	2
 213	2
-278	2
-369	2
-	20
-150	2
-238	2
+401	2
 66	2
 146	2
 224	2
-255	2
+238	2
 273	2
+	20
+150	2
+255	2
+278	2
 311	2
-401	2
+369	2
 406	2
 98	2
 PREHOOK: query: select key k, count(value) from dest1 group by key
@@ -185,18 +185,18 @@ PREHOOK: Input: default@dest1
 {"version":"1.0","engine":"tez","database":"default","hash":"1253b0d8b57dc384abbcaa0fb30dff88","queryText":"select key k, count(value) from dest1 group by key","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"count(default.dest1.value)","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"k"},{"id":1,"vertexType":"COLUMN","vertexId":"_c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.key"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest1.value"}]}
 128	2
 213	2
-278	2
-369	2
-	20
-150	2
-238	2
+401	2
 66	2
 146	2
 224	2
-255	2
+238	2
 273	2
+	20
+150	2
+255	2
+278	2
 311	2
-401	2
+369	2
 406	2
 98	2
 PREHOOK: query: select value, max(length(key)) from dest1 group by value
@@ -205,23 +205,23 @@ PREHOOK: Input: default@dest1
 #### A masked pattern was here ####
 {"version":"1.0","engine":"tez","database":"default","hash":"eb9155fd36ab5b8c92dc3c8c21be2378","queryText":"select value, max(length(key)) from dest1 group by value","edges":[{"sources":[2],"targets":[0],"edgeType":"PROJECTION"},{"sources":[3],"targets":[1],"expression":"max(length(dest1.key))","edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"value"},{"id":1,"vertexType":"COLUMN","vertexId":"_c1"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest1.value"},{"id":3,"vertexType":"COLUMN","vertexId":"default.dest1.key"}]}
 val_146	3
-val_27	0
+val_213	3
+val_238	3
+val_278	3
+val_406	3
 val_409	0
-val_484	0
 val_66	2
+val_265	0
+val_27	0
 	3
+val_150	3
 val_165	0
-val_238	3
 val_193	0
-val_213	3
 val_255	3
-val_265	0
 val_273	3
-val_278	3
-val_401	3
-val_150	3
 val_311	3
-val_406	3
+val_401	3
+val_484	0
 val_98	2
 PREHOOK: query: select value, max(length(key)) from dest1 group by value order by value limit 5
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
index 2bf96d0..5e9d191 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
@@ -59,6 +59,7 @@ STAGE PLANS:
                           output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                           properties:
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value
                             columns.comments 
@@ -108,6 +109,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'
@@ -129,6 +131,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'
@@ -201,6 +204,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out b/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out
index 911b65a..aa0e6e4 100644
--- a/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out
@@ -87,6 +87,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value,ds,hr
                     columns.comments 
@@ -109,6 +110,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value,ds,hr
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/llap_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/llap_smb.q.out b/ql/src/test/results/clientpositive/llap/llap_smb.q.out
index 44d78f5..d526fd3 100644
--- a/ql/src/test/results/clientpositive/llap/llap_smb.q.out
+++ b/ql/src/test/results/clientpositive/llap/llap_smb.q.out
@@ -172,26 +172,26 @@ POSTHOOK: Input: default@orc_a@y=2001/q=8
 POSTHOOK: Input: default@orc_a@y=2001/q=9
 POSTHOOK: Input: default@orc_b
 #### A masked pattern was here ####
-2000	2	6578
-2001	8	9438
-2000	3	6149
-2000	5	5720
+2000	0	6721
+2000	4	7865
+2000	7	6149
 2000	9	8151
+2001	3	6149
+2001	7	6149
+2000	2	6578
 2001	0	6721
 2001	1	7493
 2001	2	6578
-2001	4	7865
 2001	9	8151
 2000	1	7493
-2000	7	6149
+2000	3	6149
+2000	5	5720
+2000	6	5577
 2000	8	9438
 2001	6	5577
-2001	7	6149
-2000	0	6721
-2000	4	7865
-2000	6	5577
-2001	3	6149
+2001	4	7865
 2001	5	5720
+2001	8	9438
 PREHOOK: query: explain
 select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q
 PREHOOK: type: QUERY
@@ -321,26 +321,26 @@ POSTHOOK: Input: default@orc_a@y=2001/q=8
 POSTHOOK: Input: default@orc_a@y=2001/q=9
 POSTHOOK: Input: default@orc_b
 #### A masked pattern was here ####
-2000	2	6578
-2001	8	9438
-2000	3	6149
-2000	5	5720
+2000	0	6721
+2000	4	7865
+2000	7	6149
 2000	9	8151
+2001	3	6149
+2001	7	6149
+2000	2	6578
 2001	0	6721
 2001	1	7493
 2001	2	6578
-2001	4	7865
 2001	9	8151
 2000	1	7493
-2000	7	6149
+2000	3	6149
+2000	5	5720
+2000	6	5577
 2000	8	9438
 2001	6	5577
-2001	7	6149
-2000	0	6721
-2000	4	7865
-2000	6	5577
-2001	3	6149
+2001	4	7865
 2001	5	5720
+2001	8	9438
 PREHOOK: query: DROP TABLE orc_a
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@orc_a

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
index 961943d..8433e56 100644
--- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out
@@ -112,6 +112,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'
@@ -160,6 +161,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'
@@ -208,6 +210,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'
@@ -256,6 +259,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'
@@ -311,6 +315,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'
@@ -332,6 +337,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'
@@ -386,6 +392,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'
@@ -407,6 +414,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/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
index 8952304..2181f83 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
@@ -46,6 +46,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1025                
@@ -106,6 +107,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	580                 
@@ -179,8 +181,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_mat_view4
 #### A masked pattern was here ####
 1	10.30
-2	172345.34
 3	988.56
+2	172345.34
 PREHOOK: query: describe extended cmv_mat_view4
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: default@cmv_mat_view4
@@ -240,6 +242,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view5
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 key	value
 numFiles	1
 numRows	5

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
index f9879f7..654a15c 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out
@@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	408
@@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view2
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	232

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
index 9c3c336..66431a5 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out
@@ -126,8 +126,8 @@ POSTHOOK: query: select b from cmv_basetable where c > 20.0 group by a, b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 #### A masked pattern was here ####
-bonnie
 calvin
+bonnie
 PREHOOK: query: create materialized view cmv_mat_view_2 enable rewrite
 as select b, c from cmv_basetable where c > 10.0 group by a, b, c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -216,8 +216,8 @@ POSTHOOK: query: select b from cmv_basetable where c > 20.0 group by a, b
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 #### A masked pattern was here ####
-bonnie
 calvin
+bonnie
 PREHOOK: query: create materialized view cmv_mat_view_3 enable rewrite
 as select a, b, c from cmv_basetable where c > 10.0 group by a, b, c
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -308,8 +308,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_mat_view_3
 #### A masked pattern was here ####
-bonnie
 calvin
+bonnie
 PREHOOK: query: create materialized view cmv_mat_view_4 enable rewrite
 as select a, b from cmv_basetable group by a, b
 PREHOOK: type: CREATE_MATERIALIZED_VIEW
@@ -393,8 +393,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_mat_view_4
 #### A masked pattern was here ####
-bob
 alfred
+bob
 bonnie
 charlie
 calvin
@@ -499,8 +499,8 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view_5
 #### A masked pattern was here ####
-3
 1
+3
 PREHOOK: query: explain
 select cmv_basetable.a
 from cmv_basetable join cmv_basetable_2 on (cmv_basetable.a = cmv_basetable_2.a)

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
index bd0f903..dad8ebe 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out
@@ -278,8 +278,8 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
-3
 1
+3
 PREHOOK: query: insert into cmv_basetable_2 values
  (3, 'charlie', 15.8, 1)
 PREHOOK: type: QUERY
@@ -431,9 +431,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 #### A masked pattern was here ####
+1
 3
 3
-1
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 PREHOOK: type: QUERY
@@ -690,9 +690,9 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
+1
 3
 3
-1
 PREHOOK: query: DELETE FROM cmv_basetable_2 WHERE a = 3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cmv_basetable_2

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
index 8d6216b..918ceaa 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
@@ -264,6 +264,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"_c2\":\"true\",\"a\":\"true\",\"c\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	248                 
@@ -421,8 +422,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 #### A masked pattern was here ####
-3	6
 1	2
+3	6
 PREHOOK: query: insert into cmv_basetable_2 values
  (3, 'charlie', 15.8, 1)
 PREHOOK: type: QUERY
@@ -490,6 +491,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"_c2\":\"true\",\"a\":\"true\",\"c\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	248                 
@@ -647,9 +649,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 #### A masked pattern was here ####
+1	2
 3	2
 3	6
-1	2
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 PREHOOK: type: QUERY
@@ -933,6 +935,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
 	totalSize           	1451                
 	transactional       	true                
@@ -1005,8 +1008,8 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
-3	6
 1	2
+3	6
 3	2
 PREHOOK: query: UPDATE cmv_basetable_2 SET a=2 WHERE a=1
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
index 2ffc9df..4a3fba9 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
@@ -398,6 +398,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	totalSize           	1053                
 	transactional       	true                

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
index f9879f7..654a15c 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out
@@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	408
@@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view2
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	232

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
index af56032..c728546 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out
@@ -89,6 +89,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	408
@@ -121,6 +122,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view2
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 numFiles	1
 numRows	2
 rawDataSize	232

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
index bd0f903..dad8ebe 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out
@@ -278,8 +278,8 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
-3
 1
+3
 PREHOOK: query: insert into cmv_basetable_2 values
  (3, 'charlie', 15.8, 1)
 PREHOOK: type: QUERY
@@ -431,9 +431,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 #### A masked pattern was here ####
+1
 3
 3
-1
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 PREHOOK: type: QUERY
@@ -690,9 +690,9 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
+1
 3
 3
-1
 PREHOOK: query: DELETE FROM cmv_basetable_2 WHERE a = 3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cmv_basetable_2

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
index e820e5c..d45ccde 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
@@ -250,6 +250,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	232                 
@@ -403,8 +404,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 #### A masked pattern was here ####
-3
 1
+3
 PREHOOK: query: insert into cmv_basetable_2 values
  (3, 'charlie', 15.8, 1)
 PREHOOK: type: QUERY
@@ -471,6 +472,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	232                 
@@ -544,8 +546,8 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
-3
 1
+3
 PREHOOK: query: EXPLAIN
 ALTER MATERIALIZED VIEW cmv_mat_view REBUILD
 PREHOOK: type: QUERY
@@ -773,11 +775,12 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"c\":\"true\"}}
-	numFiles            	3                   
+	bucketing_version   	2                   
+	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	348                 
 	rewriting.time.window	300s                
-	totalSize           	877                 
+	totalSize           	616                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -846,9 +849,9 @@ POSTHOOK: Input: default@cmv_basetable
 POSTHOOK: Input: default@cmv_basetable_2
 POSTHOOK: Input: default@cmv_mat_view
 #### A masked pattern was here ####
+1
 3
 3
-1
 PREHOOK: query: drop materialized view cmv_mat_view
 PREHOOK: type: DROP_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_mat_view

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
index efd60d4..b80d7b64 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
@@ -67,6 +67,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	comment             	this is the first view
 	key                 	foo                 
 	numFiles            	1                   
@@ -93,6 +94,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES
 POSTHOOK: query: show tblproperties cmv_mat_view
 POSTHOOK: type: SHOW_TBLPROPERTIES
 COLUMN_STATS_ACCURATE	{"BASIC_STATS":"true"}
+bucketing_version	2
 comment	this is the first view
 key	foo
 numFiles	1
@@ -154,6 +156,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	comment             	this is the second view
 	key                 	alice               
 	key2                	bob                 
@@ -234,6 +237,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	comment             	this is the third view
 	numFiles            	1                   
 	numRows             	5                   
@@ -276,8 +280,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@cmv_mat_view3
 #### A masked pattern was here ####
 1
-2
 3
+2
 PREHOOK: query: drop materialized view cmv_mat_view3
 PREHOOK: type: DROP_MATERIALIZED_VIEW
 PREHOOK: Input: default@cmv_mat_view3
@@ -323,6 +327,7 @@ Retention:          	0
 Table Type:         	MATERIALIZED_VIEW   	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	comment             	this is the last view
 	numFiles            	1                   
 	numRows             	5                   

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
index 1630427..6a7d361 100644
--- a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
@@ -174,6 +174,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -315,6 +316,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -456,6 +458,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -604,6 +607,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -651,6 +655,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -728,6 +733,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -775,6 +781,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1012,6 +1019,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1059,6 +1067,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1106,6 +1115,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1257,6 +1267,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1305,6 +1316,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1353,6 +1365,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1500,6 +1513,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1546,6 +1560,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1631,8 +1646,8 @@ 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 ####
-2008-04-08
 2008-04-09
+2008-04-08
 PREHOOK: query: select min(ds),max(ds) from srcpart
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -1745,6 +1760,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1792,6 +1808,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1839,6 +1856,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1886,6 +1904,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1933,6 +1952,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/mm_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mm_all.q.out b/ql/src/test/results/clientpositive/llap/mm_all.q.out
index 7c8a38f..8a5c9d0 100644
--- a/ql/src/test/results/clientpositive/llap/mm_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/mm_all.q.out
@@ -1815,6 +1815,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
 	numRows             	6                   
 	rawDataSize         	13                  
@@ -1864,6 +1865,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	6                   
 	numRows             	12                  
 	rawDataSize         	26                  
@@ -1922,6 +1924,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{}                  
+	bucketing_version   	2                   
 	numFiles            	55                  
 	numRows             	500                 
 	rawDataSize         	5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
index 3530370..f8adcd4 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
@@ -659,12 +659,12 @@ POSTHOOK: Input: default@smalltbl1
 POSTHOOK: Input: default@smalltbl2
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
+270
 10
+270
 10
 10
 10
-270
-270
 PREHOOK: query: drop table bigTbl
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@bigtbl

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
index 7092837..3e40653 100644
--- a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
@@ -305,8 +305,8 @@ select * from emps where (empno,deptno) in ((1,2),(3,2))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emps
 #### A masked pattern was here ####
-2	5	22
 1	2	11
+2	5	22
 PREHOOK: query: drop view v
 PREHOOK: type: DROPVIEW
 POSTHOOK: query: drop view v
@@ -342,8 +342,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emps
 POSTHOOK: Input: default@v
 #### A masked pattern was here ####
-2	5	22
 1	2	11
+2	5	22
 PREHOOK: query: select subq.e1 from 
 (select (empno*2)|1 as e1, substr(empname,1,1) as n1 from emps)subq
 join

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
index 6c7b4da..9633ae0 100644
--- a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
@@ -292,23 +292,23 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 5	NULL	NULL	NULL
-2	NULL	NULL	1
+5	NULL	M	NULL
 2	1	NULL	1
-2	1	NULL	3
-3	4	NULL	NULL
-2	4	NULL	1
-3	NULL	NULL	NULL
-6	NULL	NULL	NULL
-6	NULL	NULL	2
-5	NULL	F	NULL
-3	1	NULL	NULL
+2	2	NULL	1
 2	2	NULL	3
+2	NULL	NULL	1
 6	NULL	NULL	3
-3	2	NULL	NULL
-2	2	NULL	1
-2	NULL	NULL	NULL
-6	NULL	NULL	1
-5	NULL	M	NULL
+5	NULL	F	NULL
 2	1	NULL	2
+2	NULL	NULL	NULL
+6	NULL	NULL	NULL
 3	3	NULL	NULL
+3	NULL	NULL	NULL
+6	NULL	NULL	1
+6	NULL	NULL	2
+3	1	NULL	NULL
+2	1	NULL	3
+3	2	NULL	NULL
 2	3	NULL	2
+3	4	NULL	NULL
+2	4	NULL	1

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
index 9b60d60..eca9027 100644
--- a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
@@ -180,6 +180,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'
@@ -201,6 +202,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'
@@ -280,6 +282,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'
@@ -327,6 +330,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'
@@ -374,6 +378,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'
@@ -421,6 +426,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'
@@ -573,6 +579,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'
@@ -594,6 +601,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'
@@ -673,6 +681,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'
@@ -721,6 +730,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'
@@ -769,6 +779,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'
@@ -817,6 +828,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'
@@ -981,6 +993,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'
@@ -1002,6 +1015,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'
@@ -1081,6 +1095,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'
@@ -1128,6 +1143,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'
@@ -1175,6 +1191,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'
@@ -1222,6 +1239,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'
@@ -1389,6 +1407,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'
@@ -1410,6 +1429,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'
@@ -1459,6 +1479,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'
@@ -1480,6 +1501,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'
@@ -1622,6 +1644,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'
@@ -1643,6 +1666,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'
@@ -1693,6 +1717,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'
@@ -1714,6 +1739,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'
@@ -1839,6 +1865,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'
@@ -1860,6 +1887,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/54651c78/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index fd33bfd..cde05b3 100644
--- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
@@ -98,6 +98,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -145,6 +146,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -231,6 +233,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\",\"state\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -727,8 +730,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -769,7 +772,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -821,8 +824,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -863,7 +866,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -964,8 +967,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\"}}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1006,7 +1009,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information