http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out
index 6f1ab06..1b2bcf8 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out
@@ -141,6 +141,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -180,6 +181,7 @@ STAGE PLANS:
                         SORTBUCKETCOLSPREFIX TRUE
                         bucket_count 16
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -212,6 +214,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -266,7 +269,7 @@ POSTHOOK: Input: default@test_table1@ds=1
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-879
+420
 PREHOOK: query: explain extended
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '2') 
 SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3 a JOIN 
test_table1 b ON a.key = b.key AND a.ds = '1' AND b.ds='1'
@@ -358,6 +361,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -397,6 +401,7 @@ STAGE PLANS:
                         SORTBUCKETCOLSPREFIX TRUE
                         bucket_count 16
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -429,6 +434,7 @@ STAGE PLANS:
                 SORTBUCKETCOLSPREFIX TRUE
                 bucket_count 16
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -477,4 +483,4 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=2
 #### A masked pattern was here ####
-879
+420

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
index d8bd846..821641a 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
@@ -124,6 +124,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -147,6 +148,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -271,6 +273,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -294,6 +297,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -370,6 +374,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -393,6 +398,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
index 1916075..2319acf 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
@@ -86,6 +86,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -109,6 +110,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -164,6 +166,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -187,6 +190,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -392,6 +396,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -415,6 +420,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -470,6 +476,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -493,6 +500,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -646,6 +654,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -669,6 +678,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -724,6 +734,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -747,6 +758,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -900,6 +912,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -923,6 +936,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -978,6 +992,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -1001,6 +1016,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
index 90d0e0e..4f77202 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out
@@ -137,7 +137,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
@@ -148,7 +148,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -190,7 +190,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -201,7 +201,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2')
 SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
index 71267d6..344b673 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out
@@ -159,7 +159,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-40
+19
 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 13 out of 
16) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
@@ -170,7 +170,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-29
+33
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -234,7 +234,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-40
+19
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 13 out of 
16) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -245,4 +245,4 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-29
+33

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out 
b/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out
index e4681ba..1f74f5f 100644
--- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out
+++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out
@@ -107,7 +107,7 @@ POSTHOOK: query: select count(*) from test_table1 
tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -125,7 +125,7 @@ POSTHOOK: query: select count(*) from test_table2 
tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: drop table test_table1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_table1
@@ -251,7 +251,7 @@ POSTHOOK: query: select count(*) from test_table1 
tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -269,4 +269,4 @@ POSTHOOK: query: select count(*) from test_table2 
tablesample (bucket 2 out of 2
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 #### A masked pattern was here ####
-253
+257

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_7.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_7.q.out
 
b/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_7.q.out
deleted file mode 100644
index 1b8c06c..0000000
--- 
a/ql/src/test/results/clientpositive/spark/spark_dynamic_partition_pruning_7.q.out
+++ /dev/null
@@ -1,329 +0,0 @@
-PREHOOK: query: explain
-select * from
-  (select srcpart.ds,srcpart.key from srcpart join src on srcpart.ds=src.key) a
-union all
-  (select srcpart.ds,srcpart.key from srcpart join src on srcpart.ds=src.value)
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select * from
-  (select srcpart.ds,srcpart.key from srcpart join src on srcpart.ds=src.key) a
-union all
-  (select srcpart.ds,srcpart.key from srcpart join src on srcpart.ds=src.value)
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-2 is a root stage
-  Stage-1 depends on stages: Stage-2
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-2
-    Spark
-#### A masked pattern was here ####
-      Vertices:
-        Map 7 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: _col0 (type: string)
-                        outputColumnNames: _col0
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          keys: _col0 (type: string)
-                          mode: hash
-                          outputColumnNames: _col0
-                          Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-                          Spark Partition Pruning Sink Operator
-                            Target Columns: [Map 1 -> [ds:string (ds)]]
-                            Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-        Map 8 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: value is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: value (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: _col0 (type: string)
-                        outputColumnNames: _col0
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          keys: _col0 (type: string)
-                          mode: hash
-                          outputColumnNames: _col0
-                          Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-                          Spark Partition Pruning Sink Operator
-                            Target Columns: [Map 4 -> [ds:string (ds)]]
-                            Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-
-  Stage: Stage-1
-    Spark
-      Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL 
SORT, 4)
-        Reducer 5 <- Map 4 (PARTITION-LEVEL SORT, 4), Map 6 (PARTITION-LEVEL 
SORT, 4)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: srcpart
-                  Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: key (type: string), ds (type: string)
-                    outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col1 (type: string)
-                      sort order: +
-                      Map-reduce partition columns: _col1 (type: string)
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string)
-        Map 3 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-        Map 4 
-            Map Operator Tree:
-                TableScan
-                  alias: srcpart
-                  Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: key (type: string), ds (type: string)
-                    outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col1 (type: string)
-                      sort order: +
-                      Map-reduce partition columns: _col1 (type: string)
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string)
-        Map 6 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: value is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: value (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-        Reducer 2 
-            Reduce Operator Tree:
-              Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: string), _col0 (type: string)
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 4400 Data size: 46744 Basic stats: 
COMPLETE Column stats: NONE
-                    table:
-                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 5 
-            Reduce Operator Tree:
-              Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: string), _col0 (type: string)
-                  outputColumnNames: _col0, _col1
-                  Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 4400 Data size: 46744 Basic stats: 
COMPLETE Column stats: NONE
-                    table:
-                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: explain
-select * from
-  (select srcpart.ds,srcpart.hr,srcpart.key from srcpart join src on 
srcpart.ds=src.key) a
-union all
-  (select srcpart.ds,srcpart.hr,srcpart.key from srcpart join src on 
srcpart.hr=src.key)
-PREHOOK: type: QUERY
-POSTHOOK: query: explain
-select * from
-  (select srcpart.ds,srcpart.hr,srcpart.key from srcpart join src on 
srcpart.ds=src.key) a
-union all
-  (select srcpart.ds,srcpart.hr,srcpart.key from srcpart join src on 
srcpart.hr=src.key)
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-2 is a root stage
-  Stage-1 depends on stages: Stage-2
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-2
-    Spark
-#### A masked pattern was here ####
-      Vertices:
-        Map 7 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Select Operator
-                        expressions: _col0 (type: string)
-                        outputColumnNames: _col0
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          keys: _col0 (type: string)
-                          mode: hash
-                          outputColumnNames: _col0
-                          Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-                          Spark Partition Pruning Sink Operator
-                            Target Columns: [Map 1 -> [ds:string (ds)], Map 4 
-> [hr:string (hr)]]
-                            Statistics: Num rows: 500 Data size: 5312 Basic 
stats: COMPLETE Column stats: NONE
-
-  Stage: Stage-1
-    Spark
-      Edges:
-        Reducer 2 <- Map 1 (PARTITION-LEVEL SORT, 4), Map 3 (PARTITION-LEVEL 
SORT, 4)
-        Reducer 5 <- Map 3 (PARTITION-LEVEL SORT, 4), Map 4 (PARTITION-LEVEL 
SORT, 4)
-#### A masked pattern was here ####
-      Vertices:
-        Map 1 
-            Map Operator Tree:
-                TableScan
-                  alias: srcpart
-                  Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: key (type: string), ds (type: string), hr 
(type: string)
-                    outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col1 (type: string)
-                      sort order: +
-                      Map-reduce partition columns: _col1 (type: string)
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string), _col2 (type: 
string)
-        Map 3 
-            Map Operator Tree:
-                TableScan
-                  alias: src
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Filter Operator
-                    predicate: key is not null (type: boolean)
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                    Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                      Reduce Output Operator
-                        key expressions: _col0 (type: string)
-                        sort order: +
-                        Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-        Map 4 
-            Map Operator Tree:
-                TableScan
-                  alias: srcpart
-                  Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: key (type: string), ds (type: string), hr 
(type: string)
-                    outputColumnNames: _col0, _col1, _col2
-                    Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                    Reduce Output Operator
-                      key expressions: _col2 (type: string)
-                      sort order: +
-                      Map-reduce partition columns: _col2 (type: string)
-                      Statistics: Num rows: 2000 Data size: 21248 Basic stats: 
COMPLETE Column stats: NONE
-                      value expressions: _col0 (type: string), _col1 (type: 
string)
-        Reducer 2 
-            Reduce Operator Tree:
-              Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: string), _col2 (type: string), 
_col0 (type: string)
-                  outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 4400 Data size: 46744 Basic stats: 
COMPLETE Column stats: NONE
-                    table:
-                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-        Reducer 5 
-            Reduce Operator Tree:
-              Join Operator
-                condition map:
-                     Inner Join 0 to 1
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                Select Operator
-                  expressions: _col1 (type: string), _col2 (type: string), 
_col0 (type: string)
-                  outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 2200 Data size: 23372 Basic stats: 
COMPLETE Column stats: NONE
-                  File Output Operator
-                    compressed: false
-                    Statistics: Num rows: 4400 Data size: 46744 Basic stats: 
COMPLETE Column stats: NONE
-                    table:
-                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out 
b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
index 16f1277..4137ccf 100644
--- a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
+++ b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out
@@ -67,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'
@@ -88,6 +89,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'
@@ -151,6 +153,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'
@@ -172,6 +175,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'
@@ -293,6 +297,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'
@@ -314,6 +319,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'
@@ -377,6 +383,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'
@@ -398,6 +405,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/091fd962/ql/src/test/results/clientpositive/spark/stats0.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats0.q.out 
b/ql/src/test/results/clientpositive/spark/stats0.q.out
index 0fae83b..9fbc428 100644
--- a/ql/src/test/results/clientpositive/spark/stats0.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats0.q.out
@@ -47,6 +47,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 
@@ -77,6 +78,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'
@@ -98,6 +100,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -129,6 +132,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 
@@ -1365,6 +1369,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 
@@ -1395,6 +1400,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'
@@ -1416,6 +1422,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'
@@ -1447,6 +1454,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 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/stats1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats1.q.out 
b/ql/src/test/results/clientpositive/spark/stats1.q.out
index 29777f9..892a200 100644
--- a/ql/src/test/results/clientpositive/spark/stats1.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats1.q.out
@@ -171,6 +171,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                2                   
        numRows                 26                  
        rawDataSize             199                 
@@ -212,6 +213,7 @@ Retention:                  0
 #### A masked pattern was here ####
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
+       bucketing_version       2                   
        numFiles                3                   
        numRows                 26                  
        rawDataSize             199                 

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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/stats16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats16.q.out 
b/ql/src/test/results/clientpositive/spark/stats16.q.out
index 659d581..ba56284 100644
--- a/ql/src/test/results/clientpositive/spark/stats16.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats16.q.out
@@ -27,6 +27,7 @@ Retention:            0
 #### A masked pattern was here ####
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
+       bucketing_version       2                   
 #### A masked pattern was here ####
                 
 # Storage Information           
@@ -75,6 +76,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 500                 
        rawDataSize             5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/stats3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats3.q.out 
b/ql/src/test/results/clientpositive/spark/stats3.q.out
index 212ddcc..2c2801d 100644
--- a/ql/src/test/results/clientpositive/spark/stats3.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats3.q.out
@@ -36,6 +36,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns col1
                 columns.comments 
@@ -81,6 +82,7 @@ Retention:            0
 #### A masked pattern was here ####
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 0                   
        rawDataSize             0                   
@@ -219,6 +221,7 @@ Retention:                  0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numPartitions           1                   
        numRows                 6                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/stats5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats5.q.out 
b/ql/src/test/results/clientpositive/spark/stats5.q.out
index 1204200..6e88634 100644
--- a/ql/src/test/results/clientpositive/spark/stats5.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats5.q.out
@@ -59,6 +59,7 @@ Retention:            0
 Table Type:            MANAGED_TABLE            
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 500                 
        rawDataSize             5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out 
b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
index 1f5bd0c..7bc3296 100644
--- a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out
@@ -48,6 +48,7 @@ Table Type:           EXTERNAL_TABLE
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                1                   
        totalSize               11                  
 #### A masked pattern was here ####
@@ -88,6 +89,7 @@ Table Type:           EXTERNAL_TABLE
 Table Parameters:               
        COLUMN_STATS_ACCURATE   {\"BASIC_STATS\":\"true\"}
        EXTERNAL                TRUE                
+       bucketing_version       2                   
        numFiles                1                   
        numRows                 6                   
        rawDataSize             6                   

Reply via email to