This is an automated email from the ASF dual-hosted git repository.
jcamacho pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 6b6b920 HIVE-21872: Bucketed tables that load data from
data/files/auto_sortmerge_join should be tagged as 'bucketing_version'='1'
(Jesus Camacho Rodriguez, reviewed by Vineet Garg)
6b6b920 is described below
commit 6b6b920a47c46d456513187907ccb2603b91e974
Author: Jesus Camacho Rodriguez <[email protected]>
AuthorDate: Fri Jun 14 11:06:35 2019 -0700
HIVE-21872: Bucketed tables that load data from
data/files/auto_sortmerge_join should be tagged as 'bucketing_version'='1'
(Jesus Camacho Rodriguez, reviewed by Vineet Garg)
---
.../hadoop/hive/ql/parse/spark/SparkCompiler.java | 43 ++++++++++++++++++++++
.../queries/clientpositive/auto_sortmerge_join_1.q | 6 ++-
.../clientpositive/auto_sortmerge_join_11.q | 6 ++-
.../clientpositive/auto_sortmerge_join_12.q | 9 +++--
.../clientpositive/auto_sortmerge_join_16.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_2.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_3.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_4.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_5.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_7.q | 6 ++-
.../queries/clientpositive/auto_sortmerge_join_8.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_1.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_2.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_3.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_4.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_5.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_6.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_7.q | 6 ++-
.../test/queries/clientpositive/bucketcontext_8.q | 6 ++-
.../bucketizedhiveinputformat_auto.q | 6 ++-
.../results/clientpositive/bucketcontext_1.q.out | 14 ++++---
.../results/clientpositive/bucketcontext_2.q.out | 14 ++++---
.../results/clientpositive/bucketcontext_3.q.out | 12 ++++--
.../results/clientpositive/bucketcontext_4.q.out | 12 ++++--
.../results/clientpositive/bucketcontext_5.q.out | 12 ++++--
.../results/clientpositive/bucketcontext_6.q.out | 12 ++++--
.../results/clientpositive/bucketcontext_7.q.out | 16 +++++---
.../results/clientpositive/bucketcontext_8.q.out | 16 +++++---
.../bucketizedhiveinputformat_auto.q.out | 4 ++
.../llap/auto_sortmerge_join_1.q.out | 22 ++++++-----
.../llap/auto_sortmerge_join_11.q.out | 32 +++++++++-------
.../llap/auto_sortmerge_join_12.q.out | 16 +++++---
.../llap/auto_sortmerge_join_16.q.out | 4 ++
.../llap/auto_sortmerge_join_2.q.out | 16 +++++---
.../llap/auto_sortmerge_join_3.q.out | 22 ++++++-----
.../llap/auto_sortmerge_join_4.q.out | 22 ++++++-----
.../llap/auto_sortmerge_join_5.q.out | 28 ++++++++------
.../llap/auto_sortmerge_join_7.q.out | 28 ++++++++------
.../llap/auto_sortmerge_join_8.q.out | 28 ++++++++------
.../spark/auto_sortmerge_join_1.q.out | 16 +++++---
.../spark/auto_sortmerge_join_12.q.out | 2 +-
.../spark/auto_sortmerge_join_16.q.out | 4 ++
.../spark/auto_sortmerge_join_16.q.out_spark | 4 ++
.../spark/auto_sortmerge_join_2.q.out | 12 ++++--
.../spark/auto_sortmerge_join_3.q.out | 10 +++--
.../spark/auto_sortmerge_join_4.q.out | 10 +++--
.../spark/auto_sortmerge_join_5.q.out | 16 +++++---
.../spark/auto_sortmerge_join_7.q.out | 16 +++++---
.../spark/auto_sortmerge_join_8.q.out | 16 +++++---
49 files changed, 396 insertions(+), 200 deletions(-)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkCompiler.java
b/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkCompiler.java
index 0a76ffa..dd45794 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkCompiler.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/spark/SparkCompiler.java
@@ -143,6 +143,17 @@ public class SparkCompiler extends TaskCompiler {
new
ConstantPropagate(ConstantPropagateProcCtx.ConstantPropagateOption.SHORTCUT).transform(pCtx);
}
+ // ATTENTION : DO NOT, I REPEAT, DO NOT WRITE ANYTHING AFTER
updateBucketingVersionForUpgrade()
+ // ANYTHING WHICH NEEDS TO BE ADDED MUST BE ADDED ABOVE
+ // This call updates the bucketing version of final ReduceSinkOp based on
+ // the bucketing version of FileSinkOp. This operation must happen at the
+ // end to ensure there is no further rewrite of plan which may end up
+ // removing/updating the ReduceSinkOp as was the case with
SortedDynPartitionOptimizer
+ // Update bucketing version of ReduceSinkOp if needed
+ // Note: This has been copied here from TezCompiler, change seems needed
for bucketing to work
+ // properly moving forward.
+ updateBucketingVersionForUpgrade(procCtx);
+
PERF_LOGGER.PerfLogEnd(CLASS_NAME,
PerfLogger.SPARK_OPTIMIZE_OPERATOR_TREE);
}
@@ -616,4 +627,36 @@ public class SparkCompiler extends TaskCompiler {
PERF_LOGGER.PerfLogEnd(CLASS_NAME, PerfLogger.SPARK_OPTIMIZE_TASK_TREE);
return;
}
+
+ private void updateBucketingVersionForUpgrade(OptimizeSparkProcContext
procCtx) {
+ // Fetch all the FileSinkOperators.
+ Set<FileSinkOperator> fsOpsAll = new HashSet<>();
+ for (TableScanOperator ts :
procCtx.getParseContext().getTopOps().values()) {
+ Set<FileSinkOperator> fsOps = OperatorUtils.findOperators(
+ ts, FileSinkOperator.class);
+ fsOpsAll.addAll(fsOps);
+ }
+
+
+ for (FileSinkOperator fsOp : fsOpsAll) {
+ if (!fsOp.getConf().getTableInfo().isSetBucketingVersion()) {
+ continue;
+ }
+ // Look for direct parent ReduceSinkOp
+ // If there are more than 1 parent, bail out.
+ Operator<?> parent = fsOp;
+ List<Operator<?>> parentOps = parent.getParentOperators();
+ while (parentOps != null && parentOps.size() == 1) {
+ parent = parentOps.get(0);
+ if (!(parent instanceof ReduceSinkOperator)) {
+ parentOps = parent.getParentOperators();
+ continue;
+ }
+
+ // Found the target RSOp
+
parent.setBucketingVersion(fsOp.getConf().getTableInfo().getBucketingVersion());
+ break;
+ }
+ }
+ }
}
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
index 841378e..fa59d44 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
@@ -4,11 +4,13 @@ set hive.mapred.mode=nonstrict;
-- small 1 part, 2 bucket & big 2 part, 4 bucket
CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds
string)
-CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n1 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n1 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n1 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n1 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n1 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
index f816fe8..d60d5a3 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
@@ -3,11 +3,13 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 1 part, 2 bucket & big 2 part, 4 bucket
-CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n11 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n11 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n11 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n11 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n11 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
index 6842475..3c88520 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
@@ -4,11 +4,13 @@ set hive.mapred.mode=nonstrict;
-- small 1 part, 2 bucket & big 2 part, 4 bucket
CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds
string)
-CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n15 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n15 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n15 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n15 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n15 partition(ds='2008-04-08');
@@ -27,7 +29,8 @@ set hive.optimize.bucketmapjoin.sortedmerge = true;
set hive.auto.convert.join.noconditionaltask.size=10;
CREATE TABLE bucket_medium (key string, value string) partitioned by (ds
string)
-CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE;
+CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_medium partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_medium partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_medium partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
index 0a72ddf..9311b5c 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
@@ -17,7 +17,8 @@ CREATE TABLE stage_bucket_big_n17
key BIGINT,
value STRING
)
-PARTITIONED BY (file_tag STRING);
+PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1');
CREATE TABLE bucket_big_n17
(
@@ -33,7 +34,8 @@ CREATE TABLE stage_bucket_small_n17
key BIGINT,
value string
)
-PARTITIONED BY (file_tag STRING);
+PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1');
CREATE TABLE bucket_small_n17
(
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
index 49b82fe..6d912fd 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
@@ -2,13 +2,15 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 1 part, 4 bucket & big 2 part, 2 bucket
-CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n3 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n3 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n3 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0'
INTO TABLE bucket_small_n3 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n3 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n3 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
index 22db3f0..cc9a6a7 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
@@ -2,14 +2,16 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 2 bucket & big 1 part, 4 bucket
-CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n9 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n9 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n9 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n9 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n9 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n9 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n9 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
index eebfedf..9b357c9 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
@@ -2,7 +2,8 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 4 bucket & big 1 part, 2 bucket
-CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n12 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n12 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n12 partition(ds='2008-04-08');
@@ -13,7 +14,8 @@ load data local inpath
'../../data/files/auto_sortmerge_join/small/000001_0' INT
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n12 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0'
INTO TABLE bucket_small_n12 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n12 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n12 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
index 10258da..77309dd 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
@@ -5,13 +5,15 @@ set hive.mapred.mode=nonstrict;
-- SORT_QUERY_RESULTS
-CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n0;
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n0;
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n0;
load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0'
INTO TABLE bucket_small_n0;
-CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n0;
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n0;
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
index 4a162af..0bad648 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
@@ -2,7 +2,8 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 4 bucket & big 2 part, 2 bucket
-CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n6 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n6 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n6 partition(ds='2008-04-08');
@@ -13,7 +14,8 @@ load data local inpath
'../../data/files/auto_sortmerge_join/small/000001_0' INT
load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0'
INTO TABLE bucket_small_n6 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0'
INTO TABLE bucket_small_n6 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n6 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n6 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
index c9f8a2d..ab2d909 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
@@ -5,14 +5,16 @@ set hive.exec.submitviachild=false;
set hive.exec.submit.local.task.via.child=false;
-- small 2 part, 2 bucket & big 2 part, 4 bucket
-CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n5 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n5 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0'
INTO TABLE bucket_small_n5 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0'
INTO TABLE bucket_small_n5 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n5 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n5 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n5 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_1.q
b/ql/src/test/queries/clientpositive/bucketcontext_1.q
index 4658a65..c5c7a09 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_1.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_1.q
@@ -2,11 +2,13 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 1 part, 2 bucket & big 2 part, 4 bucket
-CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n14 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n14 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n14 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n14 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n14 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_2.q
b/ql/src/test/queries/clientpositive/bucketcontext_2.q
index e409dae..902318b 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_2.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_2.q
@@ -2,13 +2,15 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 1 part, 4 bucket & big 2 part, 2 bucket
-CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n8 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n8 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small_n8 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0'
INTO TABLE bucket_small_n8 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n8 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n8 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_3.q
b/ql/src/test/queries/clientpositive/bucketcontext_3.q
index aaf212b..e85800f 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_3.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_3.q
@@ -2,14 +2,16 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 2 bucket & big 1 part, 4 bucket
-CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n4 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n4 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n4 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n4 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n4 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n4 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n4 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_4.q
b/ql/src/test/queries/clientpositive/bucketcontext_4.q
index f5e0150..118f56b 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_4.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_4.q
@@ -2,7 +2,8 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 4 bucket & big 1 part, 2 bucket
-CREATE TABLE bucket_small (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small partition(ds='2008-04-08');
@@ -12,7 +13,8 @@ load data local inpath
'../../data/files/auto_sortmerge_join/big/000000_0' INTO
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0'
INTO TABLE bucket_small partition(ds='2008-04-09');
-CREATE TABLE bucket_big (key string, value string) partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big (key string, value string) partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big partition(ds='2008-04-08');
set hive.cbo.enable=false;
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_5.q
b/ql/src/test/queries/clientpositive/bucketcontext_5.q
index 0687a1d..188aacd 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_5.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_5.q
@@ -1,13 +1,15 @@
set hive.strict.checks.bucketing=false;
-- small no part, 4 bucket & big no part, 2 bucket
-CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n13;
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n13;
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small_n13;
load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0'
INTO TABLE bucket_small_n13;
-CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n13;
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n13;
set hive.cbo.enable=false;
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_6.q
b/ql/src/test/queries/clientpositive/bucketcontext_6.q
index 35fec2f..f1377f2 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_6.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_6.q
@@ -2,13 +2,15 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small no part, 4 bucket & big 2 part, 2 bucket
-CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n7;
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n7;
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small_n7;
load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0'
INTO TABLE bucket_small_n7;
-CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n7 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n7 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_7.q
b/ql/src/test/queries/clientpositive/bucketcontext_7.q
index b17590c..11c12b6 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_7.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_7.q
@@ -2,7 +2,8 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 4 bucket & big 2 part, 2 bucket
-CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n2 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n2 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small_n2 partition(ds='2008-04-08');
@@ -13,7 +14,8 @@ load data local inpath
'../../data/files/auto_sortmerge_join/big/000001_0' INTO
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_small_n2 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0'
INTO TABLE bucket_small_n2 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n2 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n2 partition(ds='2008-04-08');
diff --git a/ql/src/test/queries/clientpositive/bucketcontext_8.q
b/ql/src/test/queries/clientpositive/bucketcontext_8.q
index 225c215..e7e9d8e 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_8.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_8.q
@@ -2,14 +2,16 @@ set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-- small 2 part, 2 bucket & big 2 part, 4 bucket
-CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n10 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n10 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n10 partition(ds='2008-04-09');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n10 partition(ds='2008-04-09');
-CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n10 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n10 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n10 partition(ds='2008-04-08');
diff --git
a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
index 871f959..b2694c4 100644
--- a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
+++ b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
@@ -1,11 +1,13 @@
set hive.strict.checks.bucketing=false;
set hive.mapred.mode=nonstrict;
-CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_small_n16 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_small_n16 partition(ds='2008-04-08');
-CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
+CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1');
load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0'
INTO TABLE bucket_big_n16 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0'
INTO TABLE bucket_big_n16 partition(ds='2008-04-08');
load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0'
INTO TABLE bucket_big_n16 partition(ds='2008-04-08');
diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
index 4b0a313..862e463 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n14 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n14
POSTHOOK: query: CREATE TABLE bucket_small_n14 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n14
@@ -24,10 +26,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n14@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n14 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n14
POSTHOOK: query: CREATE TABLE bucket_big_n14 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n14
@@ -158,7 +162,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -269,7 +273,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -319,7 +323,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -478,7 +482,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -528,7 +532,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
index 8c1af6a..583db61 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n8 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n8
POSTHOOK: query: CREATE TABLE bucket_small_n8 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n8
@@ -40,10 +42,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n8@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n8 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n8
POSTHOOK: query: CREATE TABLE bucket_big_n8 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n8
@@ -142,7 +146,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -253,7 +257,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -303,7 +307,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -462,7 +466,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -512,7 +516,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
index 389bc05..1e487f3 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n4 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n4
POSTHOOK: query: CREATE TABLE bucket_small_n4 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n4
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n4@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n4 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n4
POSTHOOK: query: CREATE TABLE bucket_big_n4 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n4
@@ -142,7 +146,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -190,7 +194,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -301,7 +305,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -459,7 +463,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
index b770207..905e9c3 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small
POSTHOOK: query: CREATE TABLE bucket_small (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned
by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS
TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big
POSTHOOK: query: CREATE TABLE bucket_big (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big
@@ -158,7 +162,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -206,7 +210,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -317,7 +321,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -475,7 +479,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
index 5dccb25..6d5112f 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n13 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n13
POSTHOOK: query: CREATE TABLE bucket_small_n13 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n13
@@ -39,10 +41,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n13
PREHOOK: query: CREATE TABLE bucket_big_n13 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n13
POSTHOOK: query: CREATE TABLE bucket_big_n13 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n13
@@ -154,7 +158,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -177,7 +181,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -300,7 +304,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -323,7 +327,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
index 2537b62..c28a2de 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n7 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n7
POSTHOOK: query: CREATE TABLE bucket_small_n7 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n7
@@ -39,10 +41,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n7
PREHOOK: query: CREATE TABLE bucket_big_n7 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n7
POSTHOOK: query: CREATE TABLE bucket_big_n7 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n7
@@ -201,7 +205,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -251,7 +255,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -406,7 +410,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -456,7 +460,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
index 11c81ba..5a73b3b 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n2 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n2
POSTHOOK: query: CREATE TABLE bucket_small_n2 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n2
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n2@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n2 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n2
POSTHOOK: query: CREATE TABLE bucket_big_n2 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n2
@@ -177,7 +181,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -225,7 +229,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -336,7 +340,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -386,7 +390,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -549,7 +553,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -599,7 +603,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
index 90ddb33..71d8795 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n10 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n10
POSTHOOK: query: CREATE TABLE bucket_small_n10 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n10
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n10@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n10 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n10
POSTHOOK: query: CREATE TABLE bucket_big_n10 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n10
@@ -177,7 +181,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -225,7 +229,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -336,7 +340,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -386,7 +390,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -549,7 +553,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -599,7 +603,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
index 13aada2..3eeb9aa 100644
--- a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
+++ b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n16 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n16
POSTHOOK: query: CREATE TABLE bucket_small_n16 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n16
@@ -24,10 +26,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n16@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n16 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n16
POSTHOOK: query: CREATE TABLE bucket_big_n16 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n16
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
index a75a1a2..c976238 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out
@@ -1,10 +1,12 @@
PREHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n1
POSTHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n1
@@ -26,10 +28,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n1@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n1
POSTHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n1
@@ -177,7 +181,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -265,7 +269,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -314,7 +318,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -466,7 +470,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -554,7 +558,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -603,7 +607,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -755,7 +759,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -843,7 +847,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -892,7 +896,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
index 1778d9b..2dbc083 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n11 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n11
POSTHOOK: query: CREATE TABLE bucket_small_n11 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n11
@@ -24,10 +26,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n11@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n11 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n11
POSTHOOK: query: CREATE TABLE bucket_big_n11 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n11
@@ -187,7 +191,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -266,7 +270,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -316,7 +320,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -492,7 +496,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -580,7 +584,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -629,7 +633,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -777,7 +781,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -861,7 +865,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -910,7 +914,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1058,7 +1062,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1121,7 +1125,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1170,7 +1174,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1257,7 +1261,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1306,7 +1310,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
index 19e6973..c22a0d7 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out
@@ -1,10 +1,12 @@
PREHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n15
POSTHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n15
@@ -26,10 +28,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n15@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n15
POSTHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n15
@@ -101,11 +105,13 @@ POSTHOOK: type: LOAD
POSTHOOK: Output: default@bucket_big_n15@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_medium (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_medium
POSTHOOK: query: CREATE TABLE bucket_medium (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_medium
@@ -218,7 +224,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -285,7 +291,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -369,7 +375,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -418,7 +424,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -490,7 +496,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
index e8bdaa2..a6d610c 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out
@@ -4,6 +4,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_big_n17
@@ -13,6 +14,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_big_n17
@@ -44,6 +46,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_small_n17
@@ -53,6 +56,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_small_n17
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
index 80c39b4..d131d9a 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n3
POSTHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n3
@@ -40,10 +42,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n3@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n3
POSTHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n3
@@ -159,7 +163,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -247,7 +251,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -296,7 +300,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -448,7 +452,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -536,7 +540,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -585,7 +589,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
index 53da73b..e5f8ba8 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n9
POSTHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n9
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n9@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n9
POSTHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n9
@@ -159,7 +163,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -208,7 +212,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -297,7 +301,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -448,7 +452,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -497,7 +501,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -586,7 +590,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -737,7 +741,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -786,7 +790,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -875,7 +879,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
index d236611..502e1e8 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n12
POSTHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n12
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n12@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n12
POSTHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n12
@@ -175,7 +179,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -224,7 +228,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -313,7 +317,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -464,7 +468,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -513,7 +517,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -602,7 +606,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -753,7 +757,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -802,7 +806,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -891,7 +895,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
index f014d39..0929216 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n0
POSTHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n0
@@ -39,10 +41,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n0
PREHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n0
POSTHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n0
@@ -109,7 +113,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -132,7 +136,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -197,7 +201,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -220,7 +224,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -336,7 +340,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -359,7 +363,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -424,7 +428,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -447,7 +451,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -563,7 +567,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -586,7 +590,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -651,7 +655,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -674,7 +678,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
index 0d93202..f6a4b35 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n6
POSTHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n6
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n6@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n6
POSTHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n6
@@ -194,7 +198,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -243,7 +247,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -332,7 +336,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -381,7 +385,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -537,7 +541,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -586,7 +590,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -675,7 +679,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -724,7 +728,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -880,7 +884,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -929,7 +933,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1018,7 +1022,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1067,7 +1071,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
diff --git
a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
index b8bc1bd..2ba69cf 100644
--- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
+++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n5
POSTHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n5
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n5@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n5
POSTHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n5
@@ -194,7 +198,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -243,7 +247,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -332,7 +336,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -381,7 +385,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -537,7 +541,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -586,7 +590,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -675,7 +679,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -724,7 +728,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -880,7 +884,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -929,7 +933,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1018,7 +1022,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -1067,7 +1071,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 1640df1..3ddfe79 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
@@ -1,10 +1,12 @@
PREHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n1
POSTHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string)
partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n1
@@ -26,10 +28,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n1@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n1
POSTHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n1
@@ -198,7 +202,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -248,7 +252,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -421,7 +425,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -471,7 +475,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -644,7 +648,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -694,7 +698,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 da785bb..b764841 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
@@ -622,4 +622,4 @@ POSTHOOK: Input: default@bucket_medium@ds=2008-04-08
POSTHOOK: Input: default@bucket_small_n15
POSTHOOK: Input: default@bucket_small_n15@ds=2008-04-08
#### A masked pattern was here ####
-570
+570
\ No newline at end of file
diff --git
a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
index 9e8d6e7..590e242 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out
@@ -4,6 +4,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_big_n17
@@ -13,6 +14,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_big_n17
@@ -44,6 +46,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_small_n17
@@ -53,6 +56,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_small_n17
diff --git
a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark
b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark
index 2a129e2..2ee8ce0 100644
---
a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark
+++
b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark
@@ -4,6 +4,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_big_n17
@@ -13,6 +14,7 @@ key BIGINT,
value STRING
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_big_n17
@@ -44,6 +46,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@stage_bucket_small_n17
@@ -53,6 +56,7 @@ key BIGINT,
value string
)
PARTITIONED BY (file_tag STRING)
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@stage_bucket_small_n17
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 b994df5..b897f6a 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n3
POSTHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n3
@@ -40,10 +42,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n3@ds=2008-04-08
PREHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n3
POSTHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n3
@@ -180,7 +184,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -230,7 +234,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -403,7 +407,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -453,7 +457,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 3a167fa..a615418 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n9
POSTHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n9
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n9@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n9
POSTHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n9
@@ -180,7 +184,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -352,7 +356,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -524,7 +528,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 85b4510..01ae46c 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n12
POSTHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n12
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n12@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n12
POSTHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n12
@@ -196,7 +200,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -368,7 +372,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -540,7 +544,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 e64ec79..f542786 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n0
POSTHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n0
@@ -39,10 +41,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n0
PREHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n0
POSTHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n0
@@ -130,7 +134,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -153,7 +157,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -290,7 +294,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -313,7 +317,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -450,7 +454,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -473,7 +477,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 14d0093..ce583c5 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n6
POSTHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n6
@@ -73,10 +75,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n6@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n6
POSTHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n6
@@ -215,7 +219,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -265,7 +269,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -442,7 +446,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -492,7 +496,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -669,7 +673,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -719,7 +723,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
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 0a3eedc..073de73 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
@@ -1,8 +1,10 @@
PREHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_small_n5
POSTHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_small_n5
@@ -41,10 +43,12 @@ POSTHOOK: type: LOAD
#### A masked pattern was here ####
POSTHOOK: Output: default@bucket_small_n5@ds=2008-04-09
PREHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
PREHOOK: type: CREATETABLE
PREHOOK: Output: database:default
PREHOOK: Output: default@bucket_big_n5
POSTHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string)
partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS
STORED AS TEXTFILE
+TBLPROPERTIES('bucketing_version'='1')
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@bucket_big_n5
@@ -215,7 +219,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -265,7 +269,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -442,7 +446,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -492,7 +496,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -669,7 +673,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -719,7 +723,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
