http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out 
b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
index 30dc8b5..0ee050f 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
@@ -55,6 +55,7 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                           properties:
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,value
                             columns.comments 
@@ -109,6 +110,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'
@@ -157,6 +159,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'
@@ -189,6 +192,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -338,6 +342,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
index 10d12a6..71996fe 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
@@ -173,6 +173,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'
@@ -221,6 +222,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'
@@ -269,6 +271,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'
@@ -317,6 +320,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'

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
index 972a7a8..7fbd873 100644
--- a/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
@@ -62,6 +62,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -83,6 +84,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -162,6 +164,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'
@@ -210,6 +213,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'
@@ -395,6 +399,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'
@@ -443,6 +448,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'
@@ -496,6 +502,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'
@@ -517,6 +524,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'
@@ -682,6 +690,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'
@@ -703,6 +712,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'
@@ -782,6 +792,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'
@@ -830,6 +841,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'
@@ -1015,6 +1027,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'
@@ -1063,6 +1076,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'
@@ -1116,6 +1130,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'
@@ -1137,6 +1152,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/spark/mapjoin_mapjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out 
b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
index f20ac17..ec632a6 100644
--- a/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
@@ -45,6 +45,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'
@@ -66,6 +67,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'
@@ -118,6 +120,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'
@@ -139,6 +142,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'
@@ -260,6 +264,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'
@@ -308,6 +313,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'
@@ -356,6 +362,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'
@@ -404,6 +411,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'

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

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out 
b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
index 5cdd1c1..f5f856b 100644
--- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
@@ -176,6 +176,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'
@@ -197,6 +198,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'
@@ -275,6 +277,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'
@@ -322,6 +325,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'
@@ -369,6 +373,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'
@@ -416,6 +421,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'
@@ -564,6 +570,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'
@@ -585,6 +592,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'
@@ -663,6 +671,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'
@@ -711,6 +720,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'
@@ -759,6 +769,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'
@@ -807,6 +818,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'
@@ -967,6 +979,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'
@@ -988,6 +1001,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'
@@ -1066,6 +1080,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'
@@ -1113,6 +1128,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'
@@ -1160,6 +1176,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'
@@ -1207,6 +1224,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'
@@ -1369,6 +1387,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1390,6 +1409,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'
@@ -1438,6 +1458,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1459,6 +1480,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'
@@ -1591,6 +1613,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'
@@ -1612,6 +1635,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'
@@ -1661,6 +1685,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'
@@ -1682,6 +1707,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'
@@ -1803,6 +1829,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'
@@ -1824,6 +1851,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/spark/outer_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
index c87a311..e949a31 100644
--- a/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
@@ -62,6 +62,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -83,6 +84,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -162,6 +164,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'
@@ -210,6 +213,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'
@@ -370,6 +374,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'
@@ -391,6 +396,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'
@@ -470,6 +476,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'
@@ -518,6 +525,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'

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out 
b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
index eecf43d..f70b17f 100644
--- a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
+++ b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out
@@ -120,6 +120,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                4                   
        numRows                 48                  
        rawDataSize             512                 
@@ -230,6 +231,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                4                   
        numRows                 48                  
        rawDataSize             512                 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out 
b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
index 7d23ba8..2aaf23d 100644
--- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
+++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out
@@ -1817,6 +1817,7 @@ STAGE PLANS:
                   properties:
                     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"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                     columns.comments 
@@ -1838,6 +1839,7 @@ STAGE PLANS:
                     properties:
                       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"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                       columns.comments 
@@ -30637,6 +30639,7 @@ STAGE PLANS:
                   properties:
                     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"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                     columns.comments 
@@ -30658,6 +30661,7 @@ STAGE PLANS:
                     properties:
                       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"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                       columns.comments 
@@ -30750,6 +30754,7 @@ STAGE PLANS:
                   properties:
                     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"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                     columns.comments 
@@ -30771,6 +30776,7 @@ STAGE PLANS:
                     properties:
                       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"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                       columns.comments 
@@ -30864,6 +30870,7 @@ STAGE PLANS:
                   properties:
                     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"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                     columns.comments 
@@ -30885,6 +30892,7 @@ STAGE PLANS:
                     properties:
                       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"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                       columns.comments 
@@ -30968,6 +30976,7 @@ STAGE PLANS:
                   properties:
                     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"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                     columns.comments 
@@ -30989,6 +30998,7 @@ STAGE PLANS:
                     properties:
                       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"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/pcr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out 
b/ql/src/test/results/clientpositive/spark/pcr.q.out
index 74d5ab6..0520b2b 100644
--- a/ql/src/test/results/clientpositive/spark/pcr.q.out
+++ b/ql/src/test/results/clientpositive/spark/pcr.q.out
@@ -121,6 +121,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 
@@ -168,6 +169,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 
@@ -318,6 +320,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 
@@ -365,6 +368,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 
@@ -412,6 +416,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 
@@ -600,6 +605,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 
@@ -647,6 +653,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 
@@ -799,6 +806,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 
@@ -846,6 +854,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 
@@ -1000,6 +1009,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 
@@ -1047,6 +1057,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 
@@ -1094,6 +1105,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 
@@ -1259,6 +1271,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 
@@ -1306,6 +1319,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 
@@ -1353,6 +1367,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 
@@ -1525,6 +1540,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 
@@ -1572,6 +1588,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 
@@ -1707,6 +1724,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 
@@ -1754,6 +1772,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 
@@ -1929,6 +1948,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 
@@ -1976,6 +1996,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 
@@ -2023,6 +2044,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 
@@ -2225,6 +2247,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 
@@ -2272,6 +2295,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 
@@ -2415,6 +2439,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 
@@ -2491,6 +2516,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 
@@ -2691,6 +2717,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 
@@ -2767,6 +2794,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 
@@ -2976,6 +3004,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 
@@ -3023,6 +3052,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 
@@ -3070,6 +3100,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 
@@ -3117,6 +3148,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 
@@ -3304,6 +3336,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 
@@ -3351,6 +3384,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 
@@ -3398,6 +3432,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 
@@ -3570,6 +3605,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 
@@ -3606,6 +3642,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 
@@ -3661,6 +3698,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 
@@ -3690,6 +3728,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 
@@ -3723,6 +3762,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 
@@ -3814,6 +3854,7 @@ STAGE PLANS:
                             properties:
                               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                               bucket_count -1
+                              bucketing_version 2
                               column.name.delimiter ,
                               columns key,value
                               columns.comments 
@@ -3854,6 +3895,7 @@ STAGE PLANS:
                             properties:
                               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                               bucket_count -1
+                              bucketing_version 2
                               column.name.delimiter ,
                               columns key,value
                               columns.comments 
@@ -3909,6 +3951,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 
@@ -3938,6 +3981,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -3971,6 +4015,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -4085,6 +4130,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'
@@ -4224,6 +4270,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'
@@ -4272,6 +4319,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'
@@ -4415,6 +4463,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'
@@ -4463,6 +4512,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'

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out 
b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
index 45c044a..e8eccd9 100644
--- a/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
+++ b/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
@@ -70,6 +70,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'
@@ -91,6 +92,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'
@@ -147,6 +149,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'
@@ -168,6 +171,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'
@@ -364,6 +368,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'
@@ -385,6 +390,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'
@@ -441,6 +447,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'
@@ -462,6 +469,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'
@@ -658,6 +666,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'
@@ -679,6 +688,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'
@@ -735,6 +745,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'
@@ -756,6 +767,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'
@@ -952,6 +964,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'
@@ -973,6 +986,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'
@@ -1029,6 +1043,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'
@@ -1050,6 +1065,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/spark/quotedid_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out 
b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
index c8b2e46..3cda08a 100644
--- a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
+++ b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out
@@ -116,17 +116,17 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
 0      val_0   0       val_0
 0      val_0   0       val_0
 0      val_0   0       val_0
-103    val_103 103     val_103
-103    val_103 103     val_103
-103    val_103 103     val_103
-103    val_103 103     val_103
+104    val_104 104     val_104
+104    val_104 104     val_104
+104    val_104 104     val_104
+104    val_104 104     val_104
 105    val_105 105     val_105
 10     val_10  10      val_10
 100    val_100 100     val_100
 100    val_100 100     val_100
 100    val_100 100     val_100
 100    val_100 100     val_100
-104    val_104 104     val_104
-104    val_104 104     val_104
-104    val_104 104     val_104
-104    val_104 104     val_104
+103    val_103 103     val_103
+103    val_103 103     val_103
+103    val_103 103     val_103
+103    val_103 103     val_103

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out 
b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
index 29ae8af..1069e96 100644
--- a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out
@@ -57,6 +57,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'
@@ -79,6 +80,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 
@@ -154,6 +157,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 
@@ -336,6 +340,7 @@ STAGE PLANS:
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                         properties:
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns aid,bid,t,ctime,etime,l,et
                           columns.comments 
@@ -367,6 +372,7 @@ STAGE PLANS:
               output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns aid,bid,t,ctime,etime,l,et
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
index cb1524e..6291f46 100644
--- a/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
@@ -62,6 +62,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -83,6 +84,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -162,6 +164,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'
@@ -210,6 +213,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'
@@ -395,6 +399,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'
@@ -443,6 +448,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'
@@ -496,6 +502,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'
@@ -517,6 +524,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'
@@ -682,6 +690,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'
@@ -703,6 +712,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'
@@ -782,6 +792,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'
@@ -830,6 +841,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'
@@ -1015,6 +1027,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'
@@ -1063,6 +1076,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'
@@ -1116,6 +1130,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'
@@ -1137,6 +1152,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'

Reply via email to