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/04/30 05:25:23 UTC
[11/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/ac6b2a3f/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out
index 383ab31..f259c06 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out
@@ -143,11 +143,11 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
+99 0 Alice NULL NULL NULL
100 1 Bob NULL NULL NULL
PREHOOK: query: EXPLAIN
SELECT *
@@ -221,9 +221,9 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat NULL NULL NULL
+99 0 Alice NULL NULL NULL
100 1 Bob NULL NULL NULL
Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
@@ -327,9 +327,9 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 102 2 Del
99 2 Mat NULL NULL NULL
+99 0 Alice NULL NULL NULL
100 1 Bob 102 2 Del
PREHOOK: query: EXPLAIN
SELECT *
@@ -491,12 +491,12 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 105 NULL None
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 104 3 Fli
99 2 Mat NULL NULL NULL
+99 0 Alice NULL NULL NULL
100 1 Bob 105 NULL None
100 1 Bob 103 2 Ema
100 1 Bob 102 2 Del
@@ -598,13 +598,13 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-99 0 Alice 102 2 Del
101 2 Car 105 NULL None
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 104 3 Fli
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
+99 0 Alice 102 2 Del
100 1 Bob 105 NULL None
100 1 Bob 103 2 Ema
100 1 Bob 102 2 Del
@@ -702,13 +702,13 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 105 NULL None
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 104 3 Fli
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
+99 0 Alice NULL NULL NULL
100 1 Bob 105 NULL None
100 1 Bob 103 2 Ema
100 1 Bob 102 2 Del
@@ -806,11 +806,11 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-99 0 Alice 102 2 Del
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
+99 0 Alice 102 2 Del
100 1 Bob 102 2 Del
PREHOOK: query: EXPLAIN
SELECT *
@@ -882,10 +882,10 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None NULL NULL NULL
NULL NULL None NULL NULL NULL
-99 0 Alice NULL NULL NULL
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
99 2 Mat 102 2 Del
+99 0 Alice NULL NULL NULL
100 1 Bob NULL NULL NULL
Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
@@ -989,9 +989,9 @@ POSTHOOK: Input: default@test2
100 1 Bob 103 2 Ema
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-99 0 Alice 102 2 Del
101 2 Car 102 2 Del
99 2 Mat 102 2 Del
+99 0 Alice 102 2 Del
100 1 Bob 102 2 Del
101 2 Car 104 3 Fli
100 1 Bob 104 3 Fli
@@ -1192,9 +1192,9 @@ NULL NULL NULL 105 NULL None
99 2 Mat 103 2 Ema
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-99 0 Alice 102 2 Del
101 2 Car 102 2 Del
99 2 Mat 102 2 Del
+99 0 Alice 102 2 Del
100 1 Bob 102 2 Del
NULL NULL NULL 104 3 Fli
PREHOOK: query: EXPLAIN
@@ -1358,17 +1358,17 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test1
POSTHOOK: Input: default@test2
#### A masked pattern was here ####
+100 1 Bob 104 3 Fli
100 1 Bob 102 2 Del
100 1 Bob 103 2 Ema
100 1 Bob 105 NULL None
-100 1 Bob 104 3 Fli
+99 0 Alice 102 2 Del
99 2 Mat 102 2 Del
99 2 Mat 103 2 Ema
+101 2 Car 104 3 Fli
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
101 2 Car 105 NULL None
-101 2 Car 104 3 Fli
-99 0 Alice 102 2 Del
NULL NULL None 102 2 Del
98 NULL None 102 2 Del
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
@@ -1455,17 +1455,17 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test1
POSTHOOK: Input: default@test2
#### A masked pattern was here ####
+100 1 Bob 104 3 Fli
100 1 Bob 102 2 Del
100 1 Bob 103 2 Ema
100 1 Bob 105 NULL None
-100 1 Bob 104 3 Fli
+99 0 Alice NULL NULL NULL
99 2 Mat 102 2 Del
99 2 Mat 103 2 Ema
+101 2 Car 104 3 Fli
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
101 2 Car 105 NULL None
-101 2 Car 104 3 Fli
-99 0 Alice NULL NULL NULL
NULL NULL None NULL NULL NULL
98 NULL None NULL NULL NULL
Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
@@ -1553,15 +1553,15 @@ POSTHOOK: Input: default@test1
POSTHOOK: Input: default@test2
#### A masked pattern was here ####
100 1 Bob 102 2 Del
+99 0 Alice 102 2 Del
99 2 Mat 102 2 Del
99 2 Mat 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 103 2 Ema
-99 0 Alice 102 2 Del
NULL NULL None 102 2 Del
98 NULL None 102 2 Del
-NULL NULL NULL 105 NULL None
NULL NULL NULL 104 3 Fli
+NULL NULL NULL 105 NULL None
PREHOOK: query: EXPLAIN
SELECT *
FROM test1 FULL OUTER JOIN test2
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
index ab14bb9..73b295c 100644
--- a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
+++ b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out
@@ -445,13 +445,13 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
98 NULL None 102 2 Del
NULL NULL None 102 2 Del
-99 0 Alice 102 2 Del
101 2 Car 105 NULL None
101 2 Car 103 2 Ema
101 2 Car 102 2 Del
101 2 Car 104 3 Fli
99 2 Mat 103 2 Ema
99 2 Mat 102 2 Del
+99 0 Alice 102 2 Del
100 1 Bob 105 NULL None
Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
@@ -653,12 +653,12 @@ POSTHOOK: Input: default@test2
98 NULL None 103 2 Ema
98 NULL None 102 2 Del
98 NULL None 104 3 Fli
-99 0 Alice 105 NULL None
-99 0 Alice 103 2 Ema
-99 0 Alice 102 2 Del
-99 0 Alice 104 3 Fli
101 2 Car 105 NULL None
101 2 Car 103 2 Ema
+101 2 Car 102 2 Del
+101 2 Car 104 3 Fli
+99 2 Mat 105 NULL None
+99 2 Mat 103 2 Ema
Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT *
@@ -850,16 +850,16 @@ POSTHOOK: type: QUERY
POSTHOOK: Input: default@test1
POSTHOOK: Input: default@test2
#### A masked pattern was here ####
-104 3 Fli 99 2 Mat NULL NULL NULL
-104 3 Fli 101 2 Car NULL NULL NULL
-102 2 Del 99 2 Mat 99 2 Mat
-102 2 Del 101 2 Car 99 2 Mat
-103 2 Ema 99 2 Mat 99 2 Mat
-103 2 Ema 101 2 Car 99 2 Mat
-102 2 Del 99 2 Mat 101 2 Car
-102 2 Del 101 2 Car 101 2 Car
-103 2 Ema 99 2 Mat 101 2 Car
-103 2 Ema 101 2 Car 101 2 Car
+104 3 Fli 100 1 Bob NULL NULL NULL
+104 3 Fli 99 0 Alice NULL NULL NULL
+102 2 Del 100 1 Bob 99 2 Mat
+102 2 Del 99 0 Alice 99 2 Mat
+103 2 Ema 100 1 Bob 99 2 Mat
+103 2 Ema 99 0 Alice 99 2 Mat
+102 2 Del 100 1 Bob 101 2 Car
+102 2 Del 99 0 Alice 101 2 Car
+103 2 Ema 100 1 Bob 101 2 Car
+103 2 Ema 99 0 Alice 101 2 Car
Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-1:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT *
@@ -1146,14 +1146,14 @@ POSTHOOK: Input: default@test2
#### A masked pattern was here ####
NULL NULL NULL NULL NULL NULL 98 NULL None
NULL NULL NULL NULL NULL NULL NULL NULL None
-NULL NULL NULL NULL NULL NULL 99 0 Alice
103 2 Ema 98 NULL None 101 2 Car
102 2 Del 98 NULL None 101 2 Car
-103 2 Ema 99 0 Alice 101 2 Car
-102 2 Del 99 0 Alice 101 2 Car
103 2 Ema 101 2 Car 101 2 Car
102 2 Del 101 2 Car 101 2 Car
103 2 Ema 99 2 Mat 101 2 Car
+102 2 Del 99 2 Mat 101 2 Car
+103 2 Ema 99 0 Alice 101 2 Car
+102 2 Del 99 0 Alice 101 2 Car
Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-1:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT *
@@ -1375,15 +1375,15 @@ POSTHOOK: Input: default@test1
POSTHOOK: Input: default@test2
#### A masked pattern was here ####
105 NULL None 100 1 Bob NULL NULL NULL
-105 NULL None 101 2 Car NULL NULL NULL
-105 NULL None 98 NULL None NULL NULL NULL
-105 NULL None 99 2 Mat NULL NULL NULL
105 NULL None 99 0 Alice NULL NULL NULL
-NULL NULL NULL NULL NULL NULL NULL NULL None
+105 NULL None 99 2 Mat NULL NULL NULL
+105 NULL None 98 NULL None NULL NULL NULL
+105 NULL None 101 2 Car NULL NULL NULL
NULL NULL NULL NULL NULL NULL 98 NULL None
+NULL NULL NULL NULL NULL NULL NULL NULL None
NULL NULL NULL NULL NULL NULL 99 0 Alice
NULL NULL NULL NULL NULL NULL 100 1 Bob
-102 2 Del 100 1 Bob 99 2 Mat
+102 2 Del 100 1 Bob 101 2 Car
Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-5:MAPRED' is a cross product
PREHOOK: query: EXPLAIN
SELECT *
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
index 5754a74..38d2b96 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
@@ -128,6 +128,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
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/ac6b2a3f/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
index 23cb97a..64bf678 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
@@ -101,6 +101,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -212,6 +213,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
index 426f63f..77f7792 100644
--- a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
+++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
@@ -137,6 +137,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -184,6 +185,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -286,6 +288,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -335,6 +338,7 @@ STAGE PLANS:
properties:
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
index 2b069ec..9337387 100644
--- a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out
@@ -89,6 +89,7 @@ Retention: 0
Table Type: MANAGED_TABLE
Table Parameters:
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
+ bucketing_version 2
numFiles 3
numRows 1500
rawDataSize 141000
@@ -139,6 +140,7 @@ Retention: 0
Table Type: MANAGED_TABLE
Table Parameters:
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
+ bucketing_version 2
numFiles 1
numRows 1500
rawDataSize 141000
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
index fa8ff3e..2cc4eee 100644
--- a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
@@ -129,6 +129,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -150,6 +151,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -203,6 +205,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -224,6 +227,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -277,6 +281,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -298,6 +303,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -351,6 +357,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -372,6 +379,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns dealid,date,time,cityid,userid
columns.comments
@@ -425,6 +433,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns userid
columns.comments
@@ -446,6 +455,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns userid
columns.comments
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
index a2b5d0f..66168eb 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
@@ -186,6 +186,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -235,6 +236,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -395,6 +397,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -444,6 +447,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -604,6 +608,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -653,6 +658,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
index 449630b..78d2860 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
@@ -212,6 +212,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -261,6 +262,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -339,6 +341,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -416,6 +419,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -485,6 +489,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
index bb5c2a0..23cb078 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
@@ -168,6 +168,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -217,6 +218,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -377,6 +379,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -426,6 +429,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
index e5dcbed..7205eef 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
@@ -168,6 +168,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -327,6 +328,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -486,6 +488,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
index 348a5ea..7e0355e 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
@@ -184,6 +184,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -343,6 +344,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -502,6 +504,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
index fa3dfcc..137ba99 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
@@ -124,6 +124,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -146,6 +147,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -276,6 +278,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -298,6 +301,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -428,6 +432,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -450,6 +455,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
index 99dd880..348765f 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
@@ -201,6 +201,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -250,6 +251,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -412,6 +414,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -461,6 +464,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -623,6 +627,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -672,6 +677,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
index a1aa8cd..6ef2a4f 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out
@@ -201,6 +201,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -250,6 +251,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -412,6 +414,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -461,6 +464,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -623,6 +627,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -672,6 +677,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket2.q.out b/ql/src/test/results/clientpositive/spark/bucket2.q.out
index 11b232d..1e0fbe5 100644
--- a/ql/src/test/results/clientpositive/spark/bucket2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket2.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'
@@ -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
@@ -215,66 +219,59 @@ POSTHOOK: query: select * from bucket2_1 tablesample (bucket 1 out of 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket2_1
#### A masked pattern was here ####
-0 val_0
-0 val_0
-0 val_0
10 val_10
-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
-12 val_12
-12 val_12
-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
+17 val_17
+177 val_177
178 val_178
-18 val_18
-18 val_18
-180 val_180
-186 val_186
+181 val_181
+187 val_187
+187 val_187
+187 val_187
+19 val_19
190 val_190
-192 val_192
-194 val_194
-196 val_196
+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
2 val_2
20 val_20
-200 val_200
-200 val_200
+201 val_201
202 val_202
208 val_208
208 val_208
@@ -282,70 +279,62 @@ 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
-24 val_24
-24 val_24
-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
-26 val_26
-26 val_26
260 val_260
-262 val_262
266 val_266
+27 val_27
272 val_272
272 val_272
-274 val_274
-278 val_278
-278 val_278
-28 val_28
-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
30 val_30
-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
-34 val_34
+339 val_339
+341 val_341
342 val_342
342 val_342
344 val_344
@@ -355,110 +344,121 @@ 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
-4 val_4
-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
+41 val_41
+411 val_411
414 val_414
414 val_414
-418 val_418
-42 val_42
-42 val_42
-424 val_424
-424 val_424
+417 val_417
+417 val_417
+417 val_417
+419 val_419
+421 val_421
+427 val_427
+43 val_43
430 val_430
430 val_430
430 val_430
432 val_432
-436 val_436
-438 val_438
-438 val_438
-438 val_438
-44 val_44
+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
+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
-8 val_8
+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
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket3.q.out b/ql/src/test/results/clientpositive/spark/bucket3.q.out
index ed6766d..8771c8f 100644
--- a/ql/src/test/results/clientpositive/spark/bucket3.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket3.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'
@@ -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:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -149,6 +152,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -226,66 +230,59 @@ 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
10 val_10 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
-12 val_12 1
-12 val_12 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
+17 val_17 1
+177 val_177 1
178 val_178 1
-18 val_18 1
-18 val_18 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
+19 val_19 1
190 val_190 1
-192 val_192 1
-194 val_194 1
-196 val_196 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
2 val_2 1
20 val_20 1
-200 val_200 1
-200 val_200 1
+201 val_201 1
202 val_202 1
208 val_208 1
208 val_208 1
@@ -293,70 +290,62 @@ 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
-24 val_24 1
-24 val_24 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
-26 val_26 1
-26 val_26 1
260 val_260 1
-262 val_262 1
266 val_266 1
+27 val_27 1
272 val_272 1
272 val_272 1
-274 val_274 1
-278 val_278 1
-278 val_278 1
-28 val_28 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
30 val_30 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
-34 val_34 1
+339 val_339 1
+341 val_341 1
342 val_342 1
342 val_342 1
344 val_344 1
@@ -366,110 +355,121 @@ 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
-4 val_4 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
+41 val_41 1
+411 val_411 1
414 val_414 1
414 val_414 1
-418 val_418 1
-42 val_42 1
-42 val_42 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
+43 val_43 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
-44 val_44 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
+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
-8 val_8 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
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket4.q.out b/ql/src/test/results/clientpositive/spark/bucket4.q.out
index cc2cced..043c038 100644
--- a/ql/src/test/results/clientpositive/spark/bucket4.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket4.q.out
@@ -57,6 +57,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments 'default','default'
@@ -79,6 +80,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments 'default','default'
@@ -122,6 +124,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -156,6 +159,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -222,104 +226,93 @@ POSTHOOK: query: select * from bucket4_1 tablesample (bucket 1 out of 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket4_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
@@ -327,63 +320,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
@@ -393,79 +383,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/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket4.q.out_spark
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket4.q.out_spark b/ql/src/test/results/clientpositive/spark/bucket4.q.out_spark
index 1e2cb9a..e11219d 100644
--- a/ql/src/test/results/clientpositive/spark/bucket4.q.out_spark
+++ b/ql/src/test/results/clientpositive/spark/bucket4.q.out_spark
@@ -57,6 +57,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments 'default','default'
@@ -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:
SORTBUCKETCOLSPREFIX 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:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -218,104 +222,93 @@ POSTHOOK: query: select * from bucket4_1 tablesample (bucket 1 out of 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucket4_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
@@ -323,63 +316,60 @@ POSTHOOK: Input: default@bucket4_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
@@ -389,79 +379,89 @@ POSTHOOK: Input: default@bucket4_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/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket5.q.out b/ql/src/test/results/clientpositive/spark/bucket5.q.out
index 51a6711..125f52e 100644
--- a/ql/src/test/results/clientpositive/spark/bucket5.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket5.q.out
@@ -70,6 +70,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments 'default','default'
@@ -92,6 +93,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'
@@ -143,6 +145,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'
@@ -165,6 +168,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'
@@ -208,6 +212,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -249,6 +254,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
@@ -283,6 +289,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -317,6 +324,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
@@ -377,6 +385,7 @@ Table Type: MANAGED_TABLE
Table Parameters:
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"}
SORTBUCKETCOLSPREFIX TRUE
+ bucketing_version 2
numFiles 2
numRows 500
rawDataSize 5312
@@ -401,16 +410,16 @@ POSTHOOK: query: SELECT * FROM bucketed_table TABLESAMPLE (BUCKET 1 OUT OF 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucketed_table
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
+17 val_17
+19 val_19
+20 val_20
+27 val_27
+30 val_30
+41 val_41
+43 val_43
+51 val_51
PREHOOK: query: SELECT * FROM bucketed_table TABLESAMPLE (BUCKET 2 OUT OF 2) s LIMIT 10
PREHOOK: type: QUERY
PREHOOK: Input: default@bucketed_table
@@ -419,16 +428,16 @@ POSTHOOK: query: SELECT * FROM bucketed_table TABLESAMPLE (BUCKET 2 OUT OF 2) s
POSTHOOK: type: QUERY
POSTHOOK: Input: default@bucketed_table
POSTHOOK: Output: hdfs://### HDFS PATH ###
+0 val_0
+0 val_0
+0 val_0
+4 val_4
5 val_5
5 val_5
5 val_5
+8 val_8
9 val_9
11 val_11
-15 val_15
-15 val_15
-17 val_17
-19 val_19
-27 val_27
PREHOOK: query: SELECT COUNT(DISTINCT INPUT__FILE__NAME) FROM bucketed_table
PREHOOK: type: QUERY
PREHOOK: Input: default@bucketed_table
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket6.q.out b/ql/src/test/results/clientpositive/spark/bucket6.q.out
index 4a9e99f..20745df 100644
--- a/ql/src/test/results/clientpositive/spark/bucket6.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket6.q.out
@@ -96,42 +96,18 @@ POSTHOOK: query: select * from src_bucket limit 100
POSTHOOK: type: QUERY
POSTHOOK: Input: default@src_bucket
POSTHOOK: Output: hdfs://### HDFS PATH ###
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-0 val_0
-103 val_103
-103 val_103
-103 val_103
-103 val_103
-103 val_103
-103 val_103
-103 val_103
-103 val_103
-105 val_105
-105 val_105
-105 val_105
-105 val_105
-11 val_11
-11 val_11
-11 val_11
-11 val_11
-114 val_114
-114 val_114
-114 val_114
-114 val_114
-116 val_116
-116 val_116
-116 val_116
-116 val_116
+10 val_10
+10 val_10
+10 val_10
+10 val_10
+104 val_104
+104 val_104
+104 val_104
+104 val_104
+104 val_104
+104 val_104
+104 val_104
+104 val_104
118 val_118
118 val_118
118 val_118
@@ -140,34 +116,50 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
118 val_118
118 val_118
118 val_118
-125 val_125
-125 val_125
-125 val_125
-125 val_125
-125 val_125
-125 val_125
-125 val_125
-125 val_125
-129 val_129
-129 val_129
-129 val_129
-129 val_129
-129 val_129
-129 val_129
-129 val_129
-129 val_129
-134 val_134
-134 val_134
-134 val_134
-134 val_134
-134 val_134
-134 val_134
-134 val_134
-134 val_134
-136 val_136
-136 val_136
-136 val_136
-136 val_136
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+119 val_119
+120 val_120
+120 val_120
+120 val_120
+120 val_120
+120 val_120
+120 val_120
+120 val_120
+120 val_120
+126 val_126
+126 val_126
+126 val_126
+126 val_126
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+128 val_128
+131 val_131
+131 val_131
+131 val_131
+131 val_131
+133 val_133
+133 val_133
+133 val_133
+133 val_133
138 val_138
138 val_138
138 val_138
@@ -184,10 +176,6 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
138 val_138
138 val_138
138 val_138
-143 val_143
-143 val_143
-143 val_143
-143 val_143
145 val_145
145 val_145
145 val_145
@@ -196,3 +184,15 @@ POSTHOOK: Output: hdfs://### HDFS PATH ###
149 val_149
149 val_149
149 val_149
+149 val_149
+149 val_149
+149 val_149
+149 val_149
+15 val_15
+15 val_15
+15 val_15
+15 val_15
+15 val_15
+15 val_15
+15 val_15
+15 val_15
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
index 02902ab..bc7702d 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
@@ -88,6 +88,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name value
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -110,6 +111,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name value
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -183,6 +185,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -205,6 +208,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
index 34650ef..21b6fc1 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
@@ -88,6 +88,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name value
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -110,6 +111,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name value
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -183,6 +185,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -205,6 +208,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 1
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/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out
index 5de2016..dcbbcf4 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out
@@ -189,6 +189,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -254,6 +255,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -316,6 +318,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -345,6 +348,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -492,6 +496,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -556,6 +561,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -613,6 +619,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -642,6 +649,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out
index 22fa0cf..2845b32 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out
@@ -173,6 +173,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -238,6 +239,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -300,6 +302,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -329,6 +332,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -481,6 +485,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -546,6 +551,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -608,6 +614,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -637,6 +644,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
http://git-wip-us.apache.org/repos/asf/hive/blob/ac6b2a3f/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out
index 71c2817..41add79 100644
--- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out
+++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out
@@ -173,6 +173,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -238,6 +239,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -300,6 +302,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -329,6 +332,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -476,6 +480,7 @@ STAGE PLANS:
properties:
bucket_count 2
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -540,6 +545,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments
@@ -597,6 +603,7 @@ STAGE PLANS:
properties:
bucket_count 4
bucket_field_name key
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -626,6 +633,7 @@ STAGE PLANS:
properties:
COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
bucket_count -1
+ bucketing_version 2
column.name.delimiter ,
columns key,value1,value2
columns.comments