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:03 UTC

[23/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/default_constraint.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
index 15cbd84..d987ef2 100644
--- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
@@ -31,6 +31,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -301,6 +302,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -530,6 +532,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -788,6 +791,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1059,6 +1063,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1336,6 +1341,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1490,8 +1496,9 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	1062                
+	totalSize           	1070                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1658,9 +1665,10 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	2124                
+	totalSize           	2140                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1737,9 +1745,10 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	2124                
+	totalSize           	2140                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1913,9 +1922,10 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	3188                
+	totalSize           	3199                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1991,9 +2001,10 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	3188                
+	totalSize           	3199                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2070,9 +2081,10 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	3188                
+	totalSize           	3199                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2259,6 +2271,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2490,6 +2503,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2644,8 +2658,9 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	1062                
+	totalSize           	1070                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
index 16b1152..0d8ad05 100644
--- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
@@ -50,6 +50,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	634                 
@@ -116,6 +117,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
index 6030b56..eecec13 100644
--- a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
+++ b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out
@@ -59,6 +59,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'
@@ -80,6 +81,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'
@@ -121,6 +123,7 @@ STAGE PLANS:
                         COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                         bucket_count 2
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -191,6 +194,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -296,104 +300,93 @@ POSTHOOK: query: select * from bucket2_1 tablesample (bucket 1 out of 2) s order
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@bucket2_1
 #### A masked pattern was here ####
-0	val_0
-0	val_0
-0	val_0
 2	val_2
-4	val_4
-8	val_8
 10	val_10
-12	val_12
-12	val_12
-18	val_18
-18	val_18
+17	val_17
+19	val_19
 20	val_20
-24	val_24
-24	val_24
-26	val_26
-26	val_26
-28	val_28
+27	val_27
 30	val_30
-34	val_34
-42	val_42
-42	val_42
-44	val_44
+41	val_41
+43	val_43
+51	val_51
+51	val_51
 54	val_54
+57	val_57
 58	val_58
 58	val_58
 64	val_64
-66	val_66
+65	val_65
+67	val_67
+67	val_67
+69	val_69
 70	val_70
 70	val_70
 70	val_70
-72	val_72
-72	val_72
-74	val_74
-76	val_76
-76	val_76
-78	val_78
+77	val_77
 80	val_80
-82	val_82
+83	val_83
+83	val_83
 84	val_84
 84	val_84
+85	val_85
 86	val_86
 90	val_90
 90	val_90
 90	val_90
-92	val_92
 96	val_96
+97	val_97
+97	val_97
 98	val_98
 98	val_98
-100	val_100
-100	val_100
-104	val_104
-104	val_104
-114	val_114
+105	val_105
+113	val_113
+113	val_113
 116	val_116
-118	val_118
-118	val_118
-120	val_120
-120	val_120
+119	val_119
+119	val_119
+119	val_119
 126	val_126
-128	val_128
-128	val_128
-128	val_128
+133	val_133
 134	val_134
 134	val_134
-136	val_136
-138	val_138
-138	val_138
-138	val_138
-138	val_138
+137	val_137
+137	val_137
 146	val_146
 146	val_146
-150	val_150
-152	val_152
-152	val_152
+149	val_149
+149	val_149
+153	val_153
 156	val_156
+157	val_157
 158	val_158
-160	val_160
 162	val_162
+163	val_163
 164	val_164
 164	val_164
-166	val_166
-168	val_168
-170	val_170
-172	val_172
-172	val_172
-174	val_174
-174	val_174
-176	val_176
-176	val_176
+165	val_165
+165	val_165
+169	val_169
+169	val_169
+169	val_169
+169	val_169
+177	val_177
 178	val_178
-180	val_180
-186	val_186
+181	val_181
+187	val_187
+187	val_187
+187	val_187
 190	val_190
-192	val_192
-194	val_194
-196	val_196
-200	val_200
-200	val_200
+191	val_191
+191	val_191
+195	val_195
+195	val_195
+197	val_197
+197	val_197
+199	val_199
+199	val_199
+199	val_199
+201	val_201
 202	val_202
 208	val_208
 208	val_208
@@ -401,63 +394,60 @@ POSTHOOK: Input: default@bucket2_1
 214	val_214
 216	val_216
 216	val_216
-218	val_218
-222	val_222
-224	val_224
-224	val_224
+221	val_221
+221	val_221
 226	val_226
-228	val_228
-230	val_230
-230	val_230
-230	val_230
-230	val_230
-230	val_230
+229	val_229
+229	val_229
+233	val_233
+233	val_233
+237	val_237
+237	val_237
 238	val_238
 238	val_238
-242	val_242
-242	val_242
+239	val_239
+239	val_239
 244	val_244
 248	val_248
+249	val_249
 252	val_252
+255	val_255
+255	val_255
 256	val_256
 256	val_256
-258	val_258
 260	val_260
-262	val_262
 266	val_266
 272	val_272
 272	val_272
-274	val_274
-278	val_278
-278	val_278
-280	val_280
-280	val_280
-282	val_282
-282	val_282
 284	val_284
 286	val_286
-288	val_288
-288	val_288
+287	val_287
+289	val_289
+291	val_291
 292	val_292
-296	val_296
-298	val_298
-298	val_298
-298	val_298
-302	val_302
-306	val_306
+307	val_307
+307	val_307
 308	val_308
 310	val_310
+311	val_311
+311	val_311
+311	val_311
+315	val_315
 316	val_316
 316	val_316
 316	val_316
-318	val_318
-318	val_318
-318	val_318
-322	val_322
-322	val_322
+317	val_317
+317	val_317
+325	val_325
+325	val_325
+327	val_327
+327	val_327
+327	val_327
 332	val_332
 336	val_336
 338	val_338
+339	val_339
+341	val_341
 342	val_342
 342	val_342
 344	val_344
@@ -467,79 +457,89 @@ POSTHOOK: Input: default@bucket2_1
 348	val_348
 348	val_348
 348	val_348
-356	val_356
+351	val_351
+353	val_353
+353	val_353
 360	val_360
 362	val_362
 364	val_364
-366	val_366
+365	val_365
 368	val_368
-374	val_374
+369	val_369
+369	val_369
+369	val_369
+377	val_377
 378	val_378
-382	val_382
-382	val_382
 384	val_384
 384	val_384
 384	val_384
 386	val_386
 392	val_392
+393	val_393
 394	val_394
 396	val_396
 396	val_396
 396	val_396
-400	val_400
+397	val_397
+397	val_397
+399	val_399
+399	val_399
 402	val_402
 404	val_404
 404	val_404
-406	val_406
-406	val_406
-406	val_406
-406	val_406
+407	val_407
+409	val_409
+409	val_409
+409	val_409
+411	val_411
 414	val_414
 414	val_414
-418	val_418
-424	val_424
-424	val_424
+417	val_417
+417	val_417
+417	val_417
+419	val_419
+421	val_421
+427	val_427
 430	val_430
 430	val_430
 430	val_430
 432	val_432
-436	val_436
-438	val_438
-438	val_438
-438	val_438
+435	val_435
+437	val_437
+443	val_443
 444	val_444
 446	val_446
-448	val_448
+449	val_449
 452	val_452
+453	val_453
 454	val_454
 454	val_454
 454	val_454
 458	val_458
 458	val_458
-460	val_460
-462	val_462
-462	val_462
+459	val_459
+459	val_459
+463	val_463
+463	val_463
 466	val_466
 466	val_466
 466	val_466
-468	val_468
-468	val_468
-468	val_468
-468	val_468
-470	val_470
+467	val_467
 472	val_472
 478	val_478
 478	val_478
+479	val_479
 480	val_480
 480	val_480
 480	val_480
 482	val_482
+483	val_483
 484	val_484
+485	val_485
 490	val_490
-492	val_492
-492	val_492
-494	val_494
-496	val_496
+491	val_491
+495	val_495
+497	val_497
 498	val_498
 498	val_498
 498	val_498

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
index f468b90..2606363 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out
@@ -14,8 +14,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 distinct hr from srcpart
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -3679,8 +3679,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: EXPLAIN select ds from (select distinct(ds) as ds from srcpart union all select distinct(ds) as ds from srcpart) s where s.ds in (select max(srcpart.ds) from srcpart union all select min(srcpart.ds) from srcpart)
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN select ds from (select distinct(ds) as ds from srcpart union all select distinct(ds) as ds from srcpart) s where s.ds in (select max(srcpart.ds) from srcpart union all select min(srcpart.ds) from srcpart)
@@ -5843,8 +5843,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: create table srcpart_orc (key int, value string) partitioned by (ds string, hr int) stored as orc
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out
index e5a8e68..c609820 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out
@@ -1608,6 +1608,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 
@@ -1651,6 +1652,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 
@@ -1742,6 +1744,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key1,value1
                       columns.comments 
@@ -1785,6 +1788,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key1,value1
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
index af4004e..9b73c34 100644
--- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out
@@ -874,6 +874,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 
@@ -919,6 +920,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 
@@ -1013,6 +1015,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key1,value1
                       columns.comments 
@@ -1058,6 +1061,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key1,value1
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
index ba443d4..fa51dd3 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out
@@ -94,19 +94,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part
-                  Statistics: Num rows: 158 Data size: 60354 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 158 Data size: 60174 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
-                    Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Reducer 2 
@@ -115,10 +115,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -189,7 +189,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part
-                  Statistics: Num rows: 157 Data size: 102875 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 156 Data size: 102424 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1355 Basic stats: COMPLETE Column stats: PARTIAL
@@ -380,19 +380,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part_sdpo
-                  Statistics: Num rows: 174 Data size: 66349 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 173 Data size: 66062 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
-                    Statistics: Num rows: 5 Data size: 1906 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 1906 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 5 Data size: 1906 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Reducer 2 
@@ -401,10 +401,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string)
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 5 Data size: 1906 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 5 Data size: 1906 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 1909 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -475,7 +475,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_part_sdpo
-                  Statistics: Num rows: 169 Data size: 110730 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 168 Data size: 110259 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1355 Basic stats: COMPLETE Column stats: PARTIAL
@@ -675,19 +675,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part
-                  Statistics: Num rows: 154 Data size: 59446 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 155 Data size: 59623 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
-                    Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Reducer 2 
@@ -696,10 +696,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string), 11 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
-                Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -1095,19 +1095,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo
-                  Statistics: Num rows: 154 Data size: 59446 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 155 Data size: 59623 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
-                    Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
             Execution mode: llap
             LLAP IO: may be used (ACID table)
         Reducer 2 
@@ -1116,10 +1116,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string), 11 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4
-                Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 5 Data size: 1930 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 1923 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -1515,7 +1515,7 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_2l_part_sdpo_no_cp
-                  Statistics: Num rows: 95 Data size: 81358 Basic stats: COMPLETE Column stats: PARTIAL
+                  Statistics: Num rows: 95 Data size: 81448 Basic stats: COMPLETE Column stats: PARTIAL
                   Filter Operator
                     predicate: (key = 'foo') (type: boolean)
                     Statistics: Num rows: 5 Data size: 1860 Basic stats: COMPLETE Column stats: PARTIAL

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
index fc60683..8d0e051 100644
--- a/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
+++ b/ql/src/test/results/clientpositive/llap/enforce_constraint_notnull.q.out
@@ -3233,19 +3233,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_uami
-                  Statistics: Num rows: 239 Data size: 75112 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 262 Data size: 82000 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: (((de = 109.23) or (de = 119.23)) and enforce_constraint(vc is not null)) (type: boolean)
-                    Statistics: Num rows: 5 Data size: 1571 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 1564 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc (type: varchar(128))
                       outputColumnNames: _col0, _col1, _col3
-                      Statistics: Num rows: 5 Data size: 1571 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 1564 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 5 Data size: 1571 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 5 Data size: 1564 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: int), _col3 (type: varchar(128))
             Execution mode: vectorized, llap
             LLAP IO: may be used (ACID table)
@@ -3255,10 +3255,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), 3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 5 Data size: 1571 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 1564 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 5 Data size: 1571 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 1564 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -3326,19 +3326,19 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: acid_uami
-                  Statistics: Num rows: 276 Data size: 86592 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 300 Data size: 93808 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: ((de = 3.14) and enforce_constraint((i is not null and vc is not null))) (type: boolean)
-                    Statistics: Num rows: 2 Data size: 627 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 625 Basic stats: COMPLETE Column stats: NONE
                     Select Operator
                       expressions: ROW__ID (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), i (type: int), vc (type: varchar(128))
                       outputColumnNames: _col0, _col1, _col3
-                      Statistics: Num rows: 2 Data size: 627 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 625 Basic stats: COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>)
                         sort order: +
                         Map-reduce partition columns: UDFToInteger(_col0) (type: int)
-                        Statistics: Num rows: 2 Data size: 627 Basic stats: COMPLETE Column stats: NONE
+                        Statistics: Num rows: 2 Data size: 625 Basic stats: COMPLETE Column stats: NONE
                         value expressions: _col1 (type: int), _col3 (type: varchar(128))
             Execution mode: vectorized, llap
             LLAP IO: may be used (ACID table)
@@ -3348,10 +3348,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: struct<writeid:bigint,bucketid:int,rowid:bigint>), VALUE._col0 (type: int), 3.14 (type: decimal(5,2)), VALUE._col1 (type: varchar(128))
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 2 Data size: 627 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 2 Data size: 625 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 2 Data size: 627 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 625 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/except_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/except_distinct.q.out b/ql/src/test/results/clientpositive/llap/except_distinct.q.out
index 1a385ac..96b0e59 100644
--- a/ql/src/test/results/clientpositive/llap/except_distinct.q.out
+++ b/ql/src/test/results/clientpositive/llap/except_distinct.q.out
@@ -199,8 +199,8 @@ POSTHOOK: Input: default@a
 POSTHOOK: Input: default@b
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 2	3
-2	20
 1	2
+2	20
 PREHOOK: query: explain select * from src except distinct select * from src
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from src except distinct select * from src

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
index 1f8c89e..26d858c 100644
--- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out
@@ -471,10 +471,10 @@ order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-13036	1
 -8915	1
 -3799	1
 10782	1
--13036	1
 NULL	6
 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: explain

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
index aa44d33..2b1ec3c 100644
--- a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
+++ b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out
@@ -293,6 +293,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -338,6 +339,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -383,6 +385,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -428,6 +431,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -666,6 +670,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -711,6 +716,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -756,6 +762,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -801,6 +808,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt,zip
                 columns.comments 
@@ -1075,6 +1083,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1121,6 +1130,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1167,6 +1177,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1213,6 +1224,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1259,6 +1271,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1305,6 +1318,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1351,6 +1365,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1397,6 +1412,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1443,6 +1459,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1489,6 +1506,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 
@@ -1535,6 +1553,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns state,locid,cnt
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out
index 3607edf..c473183 100644
--- a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out
@@ -100,6 +100,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 
@@ -177,6 +178,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 
@@ -253,6 +255,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 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/filter_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/filter_union.q.out b/ql/src/test/results/clientpositive/llap/filter_union.q.out
index 926c2fb..f300240 100644
--- a/ql/src/test/results/clientpositive/llap/filter_union.q.out
+++ b/ql/src/test/results/clientpositive/llap/filter_union.q.out
@@ -75,6 +75,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'
@@ -96,6 +97,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'
@@ -153,6 +155,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'
@@ -174,6 +177,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/hybridgrace_hashjoin_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
index d09f42a..67555c0 100644
--- a/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/hybridgrace_hashjoin_2.q.out
@@ -850,8 +850,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 ####
-452
 428
+452
 PREHOOK: query: EXPLAIN
 SELECT COUNT(*)
 FROM src1 x JOIN srcpart z ON (x.key = z.key)
@@ -1100,8 +1100,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 ####
-452
 428
+452
 PREHOOK: query: SELECT 1
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
index 1520232..ac58737 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
@@ -67,7 +67,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table_bucketed
 POSTHOOK: Input: default@test_table_bucketed@part=1
 #### A masked pattern was here ####
-31
+177
 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 2 OUT OF 3) WHERE part = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table_bucketed
@@ -78,7 +78,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table_bucketed
 POSTHOOK: Input: default@test_table_bucketed@part=1
 #### A masked pattern was here ####
-179
+126
 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 3 OUT OF 3) WHERE part = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table_bucketed
@@ -89,7 +89,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table_bucketed
 POSTHOOK: Input: default@test_table_bucketed@part=1
 #### A masked pattern was here ####
-99
+6
 PREHOOK: query: SELECT cnt FROM (SELECT INPUT__FILE__NAME, COUNT(*) cnt FROM test_table_bucketed WHERE part = '1'
 GROUP BY INPUT__FILE__NAME ORDER BY INPUT__FILE__NAME ASC LIMIT 3) a
 PREHOOK: type: QUERY
@@ -102,6 +102,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table_bucketed
 POSTHOOK: Input: default@test_table_bucketed@part=1
 #### A masked pattern was here ####
-31
-179
-99
+177
+126
+6

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
index 80c2a02..b1a00cf 100644
--- a/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_into_default_keyword.q.out
@@ -2368,15 +2368,15 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: t
-                  Statistics: Num rows: 19 Data size: 76 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 20 Data size: 80 Basic stats: COMPLETE Column stats: NONE
                   Filter Operator
                     predicate: enforce_constraint(key is not null) (type: boolean)
-                    Statistics: Num rows: 9 Data size: 36 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: key (type: int)
                       sort order: +
                       Map-reduce partition columns: key (type: int)
-                      Statistics: Num rows: 9 Data size: 36 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 10 Data size: 40 Basic stats: COMPLETE Column stats: NONE
             Execution mode: vectorized, llap
             LLAP IO: may be used (ACID table)
         Map 5 
@@ -2404,18 +2404,18 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 outputColumnNames: _col0, _col6
-                Statistics: Num rows: 9 Data size: 39 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 11 Data size: 44 Basic stats: COMPLETE Column stats: NONE
                 Filter Operator
                   predicate: _col0 is null (type: boolean)
-                  Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col6 (type: int)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       sort order: 
                       Map-reduce partition columns: null (type: string)
-                      Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col0 (type: int)
         Reducer 3 
             Execution mode: llap
@@ -2423,10 +2423,10 @@ STAGE PLANS:
               Select Operator
                 expressions: VALUE._col0 (type: int), 'a1' (type: string), null (type: string)
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat
                       output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat
@@ -2436,7 +2436,7 @@ STAGE PLANS:
                 Select Operator
                   expressions: _col0 (type: int), 'a1' (type: string), null (type: string)
                   outputColumnNames: key, a1, value
-                  Statistics: Num rows: 4 Data size: 17 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 5 Data size: 20 Basic stats: COMPLETE Column stats: NONE
                   Group By Operator
                     aggregations: compute_stats(key, 'hll'), compute_stats(a1, 'hll'), compute_stats(value, 'hll')
                     mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
index 083ea03..b0089ef 100644
--- a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
@@ -102,6 +102,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"cbigint\":\"true\",\"cboolean1\":\"true\",\"cboolean2\":\"true\",\"cdouble\":\"true\",\"cfloat\":\"true\",\"cint\":\"true\",\"csmallint\":\"true\",\"cstring1\":\"true\",\"cstring2\":\"true\",\"ctimestamp1\":\"true\",\"ctimestamp2\":\"true\",\"ctinyint\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -167,6 +168,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	totalSize           	295436              
 	transactional       	true                
@@ -372,6 +374,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	1                   
 	totalSize           	1572                
 	transactional       	true                
@@ -504,6 +507,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	totalSize           	3146                
 	transactional       	true                
@@ -632,6 +636,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
 	totalSize           	298582              
 	transactional       	true                

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