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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out
index 3e8ea6f..9b14b92 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out
@@ -193,18 +193,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 2	val_2val_2	1
-4	val_4val_4	1
-8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -215,6 +204,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_4val_4	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -224,6 +223,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -344,6 +344,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+2	val_2val_2	1
+2	val_2val_2	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
@@ -362,22 +374,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
-2	val_2val_2	1
-2	val_2val_2	1
 4	val_4val_4	1
 4	val_4val_4	1
-8	val_8val_8	1
-8	val_8val_8	1
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -396,6 +394,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
+8	val_8val_8	1
 9	val_9val_9	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
@@ -517,6 +517,18 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+2	val_2val_2	1
+2	val_2val_2	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
@@ -535,22 +547,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	val_0val_0	1
 0	val_0val_0	1
 0	val_0val_0	1
-2	val_2val_2	1
-2	val_2val_2	1
 4	val_4val_4	1
 4	val_4val_4	1
-8	val_8val_8	1
-8	val_8val_8	1
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -569,6 +567,8 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
+8	val_8val_8	1
 9	val_9val_9	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
@@ -700,18 +700,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 2	val_2val_2	1
-4	val_4val_4	1
-8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -722,6 +711,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_4val_4	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -731,6 +730,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
+8	val_8val_8	1
 9	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -861,18 +861,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
-0	val_0val_0val_0val_0	1
 2	val_2val_2val_2val_2	1
-4	val_4val_4val_4val_4	1
-8	val_8val_8val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -883,6 +872,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+0	val_0val_0val_0val_0	1
+4	val_4val_4val_4val_4	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
@@ -892,6 +891,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
 5	val_5val_5val_5val_5	1
+8	val_8val_8val_8val_8	1
 9	val_9val_9val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -1022,17 +1022,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-4	val_2val_2	1
-8	val_4val_4	1
 10	val_5val_5	1
 10	val_5val_5	1
 10	val_5val_5	1
@@ -1042,8 +1031,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 10	val_5val_5	1
 10	val_5val_5	1
 10	val_5val_5	1
-16	val_8val_8	1
-18	val_9val_9	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -1054,3 +1041,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+4	val_2val_2	1
+8	val_4val_4	1
+16	val_8val_8	1
+18	val_9val_9	1

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
index faada6f..1633458 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
@@ -190,18 +190,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
 2	2	val_2val_2	1
-4	4	val_4val_4	1
-8	8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -212,6 +201,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+4	4	val_4val_4	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
@@ -221,6 +220,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
+8	8	val_8val_8	1
 9	9	val_9val_9	1
 PREHOOK: query: DROP TABLE test_table3
 PREHOOK: type: DROPTABLE
@@ -393,6 +393,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 2	val_2	1
 4	val_4	1
 8	val_8	1
+9	val_9	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -412,7 +413,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	val_5	1
 5	val_5	1
 5	val_5	1
-9	val_9	1
 PREHOOK: query: DROP TABLE test_table3
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@test_table3

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out
index 8282a5a..e4b6703 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out
@@ -200,16 +200,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -221,6 +211,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -230,7 +231,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -390,16 +390,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -411,6 +401,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -420,7 +421,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -824,16 +824,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -845,6 +835,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -854,7 +855,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -1026,16 +1026,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@test_table3
-PREHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
-POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@test_table3
-POSTHOOK: Input: default@test_table3@ds=1
-#### A masked pattern was here ####
 0	1	val_0val_0	1
 0	1	val_0val_0	1
 0	1	val_0val_0	1
@@ -1047,6 +1037,17 @@ POSTHOOK: Input: default@test_table3@ds=1
 0	1	val_0val_0	1
 2	3	val_2val_2	1
 4	5	val_4val_4	1
+8	9	val_8val_8	1
+PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@test_table3
+PREHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
+POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@test_table3
+POSTHOOK: Input: default@test_table3@ds=1
+#### A masked pattern was here ####
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
@@ -1056,7 +1057,6 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
 5	6	val_5val_5	1
-8	9	val_8val_8	1
 9	10	val_9val_9	1
 PREHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING)
 CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
index 192689a..9b8e835 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
@@ -173,15 +173,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -192,6 +183,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -330,15 +330,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -349,6 +340,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1
@@ -491,15 +491,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
-0	val_0val_0	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -510,6 +501,15 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
+0	val_0val_0	1
 5	val_5val_5	1
 5	val_5val_5	1
 5	val_5val_5	1

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out
index 2198dc2..864c3ff 100644
--- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out
@@ -198,18 +198,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
 2	2	val_2val_2	1
-4	4	val_4val_4	1
-8	8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -220,6 +209,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+4	4	val_4val_4	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
@@ -229,6 +228,7 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
+8	8	val_8val_8	1
 9	9	val_9val_9	1
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1')
@@ -376,18 +376,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
-0	0	val_0val_0	1
 2	2	val_2val_2	1
-4	4	val_4val_4	1
-8	8	val_8val_8	1
 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table3
@@ -398,6 +387,16 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table3
 POSTHOOK: Input: default@test_table3@ds=1
 #### A masked pattern was here ####
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+0	0	val_0val_0	1
+4	4	val_4val_4	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
@@ -407,4 +406,5 @@ POSTHOOK: Input: default@test_table3@ds=1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
 5	5	val_5val_5	1
+8	8	val_8val_8	1
 9	9	val_9val_9	1

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/cbo_semijoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/cbo_semijoin.q.out b/ql/src/test/results/clientpositive/spark/cbo_semijoin.q.out
index 6f79549..e7d2da4 100644
--- a/ql/src/test/results/clientpositive/spark/cbo_semijoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/cbo_semijoin.q.out
@@ -82,6 +82,8 @@ POSTHOOK: Input: default@cbo_t3
 1.0	1	 1
 1.0	1	 1 
 1.0	1	 1 
+1.0	1	1 
+1.0	1	1 
 1.0	1	1
 1.0	1	1
 1.0	1	1
@@ -94,8 +96,6 @@ POSTHOOK: Input: default@cbo_t3
 1.0	1	1
 1.0	1	1
 1.0	1	1
-1.0	1	1 
-1.0	1	1 
 PREHOOK: query: select * from (select cbo_t3.c_int, cbo_t1.c, b from (select key as a, c_int as b, cbo_t1.c_float as c from cbo_t1  where (cbo_t1.c_int + 1 = 2) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)) cbo_t1 left semi join (select cbo_t2.key as p, cbo_t2.c_int as q, c_float as r from cbo_t2  where (cbo_t2.c_int + 1 == 2) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t3.c_int  == 2) and (b > 0 or c_int >= 0)) R where  (R.c_int + 1 = 2) and (R.b > 0 or c_int >= 0)
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/ctas.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/ctas.q.out b/ql/src/test/results/clientpositive/spark/ctas.q.out
index c781688..0b5027e 100644
--- a/ql/src/test/results/clientpositive/spark/ctas.q.out
+++ b/ql/src/test/results/clientpositive/spark/ctas.q.out
@@ -148,6 +148,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
@@ -298,6 +299,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
@@ -448,6 +450,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
@@ -511,6 +514,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
@@ -662,6 +666,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  

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

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

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
index 9287d78..547f9e0 100644
--- a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
+++ b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
@@ -98,6 +98,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -174,6 +175,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -249,6 +251,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
index d1fcd48..4a073d9 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
@@ -93,6 +93,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -141,6 +142,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -185,6 +187,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,c1,c2
                           columns.comments 
@@ -216,6 +219,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,c1,c2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
index 30e5daa..cdac070 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
@@ -93,6 +93,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -141,6 +142,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -185,6 +187,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,c1,c2,c3,c4
                           columns.comments 
@@ -216,6 +219,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,c1,c2,c3,c4
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
index 16543c6..7cd32f9 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
@@ -87,6 +87,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -135,6 +136,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -179,6 +181,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,c1,c2
                           columns.comments 
@@ -210,6 +213,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,c1,c2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
index d350f13..61579a4 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
@@ -87,6 +87,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -135,6 +136,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -179,6 +181,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,c1,c2,c3,c4
                           columns.comments 
@@ -210,6 +213,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,c1,c2,c3,c4
                 columns.comments 
@@ -356,6 +360,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -404,6 +409,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -448,6 +454,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,c1,c2,c3,c4
                           columns.comments 
@@ -479,6 +486,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,c1,c2,c3,c4
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/54651c78/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
index d0bb3b4..85595ca 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
@@ -85,6 +85,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -118,6 +119,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -141,6 +143,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -172,6 +175,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -286,6 +290,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -309,6 +314,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -355,6 +361,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key1,key2,cnt
                           columns.comments 
@@ -386,6 +393,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,cnt
                 columns.comments 
@@ -486,6 +494,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -519,6 +528,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -542,6 +552,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -573,6 +584,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -671,6 +683,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -704,6 +717,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -727,6 +741,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -758,6 +773,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -864,6 +880,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key1,key2,cnt
                                 columns.comments 
@@ -897,6 +914,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -920,6 +938,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -951,6 +970,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,cnt
                 columns.comments 
@@ -1066,6 +1086,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -1089,6 +1110,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -1135,6 +1157,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key1,key2,key3,cnt
                           columns.comments 
@@ -1166,6 +1189,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,key3,cnt
                 columns.comments 
@@ -1275,6 +1299,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -1298,6 +1323,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -1344,6 +1370,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key1,key2,cnt
                           columns.comments 
@@ -1375,6 +1402,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,cnt
                 columns.comments 
@@ -1496,6 +1524,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -1519,6 +1548,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -1565,6 +1595,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,cnt
                           columns.comments 
@@ -1596,6 +1627,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -1706,6 +1738,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -1739,6 +1772,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -1762,6 +1796,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -1814,6 +1849,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -1847,6 +1883,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -1870,6 +1907,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -1901,6 +1939,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -2022,6 +2061,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key,cnt
                                 columns.comments 
@@ -2055,6 +2095,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2078,6 +2119,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2136,6 +2178,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2159,6 +2202,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2209,6 +2253,7 @@ STAGE PLANS:
                           properties:
                             COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                             bucket_count -1
+                            bucketing_version 2
                             column.name.delimiter ,
                             columns key,cnt
                             columns.comments 
@@ -2240,6 +2285,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -2367,6 +2413,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2390,6 +2437,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2448,6 +2496,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2471,6 +2520,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2518,6 +2568,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,cnt
                           columns.comments 
@@ -2549,6 +2600,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -2669,6 +2721,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2692,6 +2745,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2750,6 +2804,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2773,6 +2828,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -2931,6 +2987,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -2954,6 +3011,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -3000,6 +3058,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,cnt
                           columns.comments 
@@ -3031,6 +3090,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,cnt
                 columns.comments 
@@ -3129,6 +3189,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key1,key2,key3,cnt
                                 columns.comments 
@@ -3162,6 +3223,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -3185,6 +3247,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -3216,6 +3279,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,key3,cnt
                 columns.comments 
@@ -3325,6 +3389,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key1,key2,key3,key4,cnt
                                 columns.comments 
@@ -3358,6 +3423,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -3381,6 +3447,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -3412,6 +3479,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,key3,key4,cnt
                 columns.comments 
@@ -3520,6 +3588,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key1,key2,key3,cnt
                                 columns.comments 
@@ -3553,6 +3622,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -3576,6 +3646,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -3607,6 +3678,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,key3,cnt
                 columns.comments 
@@ -3722,6 +3794,7 @@ STAGE PLANS:
                               properties:
                                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                                 bucket_count -1
+                                bucketing_version 2
                                 column.name.delimiter ,
                                 columns key1,key2,key3,cnt
                                 columns.comments 
@@ -3755,6 +3828,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,val
                     columns.comments 
@@ -3778,6 +3852,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,val
                       columns.comments 
@@ -3809,6 +3884,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key1,key2,key3,cnt
                 columns.comments