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

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
index fb7e872..4c73fec 100644
--- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
@@ -38,6 +38,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -80,6 +81,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -214,6 +216,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
@@ -281,6 +284,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -459,6 +463,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -593,6 +598,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
@@ -965,6 +971,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -1007,6 +1014,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
index b327bf8..e83a370 100644
--- a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
@@ -25,6 +25,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
index 7f3cc02..1457932 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
@@ -35,6 +35,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -102,6 +103,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'
@@ -122,6 +124,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'
@@ -211,6 +214,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
@@ -287,6 +291,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	0                   
@@ -383,6 +388,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'
@@ -430,6 +436,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'
@@ -536,6 +543,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	1000                
@@ -693,6 +701,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	0                   
@@ -789,6 +798,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'
@@ -836,6 +846,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'
@@ -942,6 +953,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	1000                
@@ -1099,6 +1111,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	0                   
@@ -1195,6 +1208,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'
@@ -1295,6 +1309,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	500                 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
index 2c8e9ab..5ed5dbf 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
@@ -38,6 +38,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	170                 
@@ -106,6 +107,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'
@@ -127,6 +129,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'
@@ -215,6 +218,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	170                 
@@ -290,6 +294,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	2                   
@@ -383,6 +388,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -427,6 +433,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -532,6 +539,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	2                   
@@ -688,6 +696,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	2                   
@@ -781,6 +790,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -881,6 +891,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	2                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
index b138a2d..29de417 100644
--- a/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
+++ b/ql/src/test/results/clientpositive/llap/correlationoptimizer1.q.out
@@ -1425,22 +1425,22 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+273	val_273	3
+401	val_401	5
+146	val_146	2
+150	val_150	1
+311	val_311	3
+66	val_66	1
 	NULL	10
+128	NULL	1
 213	val_213	2
-238	val_238	2
 406	val_406	4
-66	val_66	1
+98	val_98	2
 224	NULL	1
-278	val_278	2
-128	NULL	1
-150	val_150	1
+238	val_238	2
 255	val_255	2
-273	val_273	3
-401	val_401	5
-146	val_146	2
-311	val_311	3
+278	val_278	2
 369	NULL	1
-98	val_98	2
 PREHOOK: query: EXPLAIN
 SELECT x.key, y.value, count(1) AS cnt
 FROM src1 x LEFT OUTER JOIN src y ON (x.key = y.key AND x.value = y.value)
@@ -1556,22 +1556,22 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
+273	val_273	3
+401	val_401	5
+146	val_146	2
+150	val_150	1
+311	val_311	3
+66	val_66	1
 	NULL	10
+128	NULL	1
 213	val_213	2
-238	val_238	2
 406	val_406	4
-66	val_66	1
+98	val_98	2
 224	NULL	1
-278	val_278	2
-128	NULL	1
-150	val_150	1
+238	val_238	2
 255	val_255	2
-273	val_273	3
-401	val_401	5
-146	val_146	2
-311	val_311	3
+278	val_278	2
 369	NULL	1
-98	val_98	2
 PREHOOK: query: EXPLAIN
 SELECT SUM(HASH(tmp.key)), SUM(HASH(tmp.cnt))
 FROM (SELECT y.key AS key, count(1) AS cnt

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ctas.q.out b/ql/src/test/results/clientpositive/llap/ctas.q.out
index 7240da6..0b85984 100644
--- a/ql/src/test/results/clientpositive/llap/ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas.q.out
@@ -154,6 +154,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
@@ -310,6 +311,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
@@ -466,6 +468,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
@@ -529,6 +532,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
@@ -686,6 +690,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96