This is an automated email from the ASF dual-hosted git repository.
jcamacho pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new ff598bc 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)
ff598bc is described below
commit ff598bc6a7ca349b8f0a9291b347bdec3fdc2487
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 93f9046..6fcdff4 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 9986ead..36813b5 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 f180fe8..d267d51 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 83ca352..ea9640d 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 471288a..4c1ab0a 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 a87d058..be2b9af 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 53a9771..125b451 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 ee712c0..d4e550a 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
@@ -184,7 +188,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
@@ -272,7 +276,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
@@ -321,7 +325,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
@@ -480,7 +484,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
@@ -568,7 +572,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
@@ -617,7 +621,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
@@ -776,7 +780,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
@@ -864,7 +868,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
@@ -913,7 +917,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 3d71f2e..3a3d5aa 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
@@ -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
@@ -273,7 +277,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
@@ -323,7 +327,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
@@ -506,7 +510,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
@@ -594,7 +598,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
@@ -643,7 +647,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
@@ -791,7 +795,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
@@ -924,7 +928,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
@@ -1072,7 +1076,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
@@ -1135,7 +1139,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
@@ -1184,7 +1188,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
@@ -1271,7 +1275,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
@@ -1320,7 +1324,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 c0fb13a..13ace5b 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
@@ -230,7 +236,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
@@ -297,7 +303,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 +387,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
@@ -430,7 +436,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
@@ -502,7 +508,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 e24f448..a2dc857 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
@@ -166,7 +170,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
@@ -254,7 +258,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 4
bucket_field_name key
- bucketing_version 2
+ bucketing_version 1
column.name.delimiter ,
columns key,value
columns.comments
@@ -550,7 +554,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/llap/auto_sortmerge_join_3.q.out
b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out
index 12fb353..3e41f29 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
@@ -166,7 +170,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
@@ -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
@@ -304,7 +308,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
@@ -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
@@ -511,7 +515,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
@@ -600,7 +604,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
@@ -758,7 +762,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
@@ -807,7 +811,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
@@ -896,7 +900,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 c811827..d75bc1e 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
@@ -182,7 +186,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
@@ -231,7 +235,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
@@ -320,7 +324,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
@@ -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
@@ -527,7 +531,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
@@ -616,7 +620,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
@@ -774,7 +778,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
@@ -823,7 +827,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
@@ -912,7 +916,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 dd78af9..ad707b9 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
@@ -116,7 +120,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
@@ -139,7 +143,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
@@ -204,7 +208,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
@@ -227,7 +231,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
@@ -350,7 +354,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
@@ -373,7 +377,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
@@ -438,7 +442,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
@@ -461,7 +465,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
@@ -584,7 +588,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
@@ -607,7 +611,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
@@ -672,7 +676,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
@@ -695,7 +699,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 9cda07c..9a53f80 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
@@ -201,7 +205,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
@@ -250,7 +254,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
@@ -339,7 +343,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
@@ -388,7 +392,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
@@ -551,7 +555,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
@@ -600,7 +604,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
@@ -689,7 +693,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
@@ -738,7 +742,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
@@ -901,7 +905,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
@@ -950,7 +954,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
@@ -1039,7 +1043,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
@@ -1088,7 +1092,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 3e9c06e..d3b6265 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
@@ -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
@@ -250,7 +254,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
@@ -339,7 +343,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
@@ -388,7 +392,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
@@ -551,7 +555,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
@@ -600,7 +604,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
@@ -689,7 +693,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
@@ -738,7 +742,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
@@ -901,7 +905,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
@@ -950,7 +954,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
@@ -1039,7 +1043,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
@@ -1088,7 +1092,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 9f873ed..ca1ed10 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
@@ -205,7 +209,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
@@ -255,7 +259,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
@@ -435,7 +439,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
@@ -485,7 +489,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
@@ -665,7 +669,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
@@ -715,7 +719,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 3994502..9f0ffca 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
@@ -634,4 +634,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 956da91..ba3042c 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
@@ -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
@@ -237,7 +241,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
@@ -417,7 +421,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
@@ -467,7 +471,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 9376058..65a5bc0 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
@@ -187,7 +191,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
@@ -366,7 +370,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
@@ -545,7 +549,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 d10807a..e381e89 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
@@ -203,7 +207,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
@@ -382,7 +386,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
@@ -561,7 +565,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 09fb9db..b9ea513 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
@@ -137,7 +141,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
@@ -160,7 +164,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
@@ -304,7 +308,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
@@ -327,7 +331,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
@@ -471,7 +475,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
@@ -494,7 +498,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 12945fd..cedaf42 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
@@ -222,7 +226,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
@@ -272,7 +276,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
@@ -506,7 +510,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
@@ -690,7 +694,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
@@ -740,7 +744,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 72bc72e..aa70744 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
@@ -222,7 +226,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
@@ -272,7 +276,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
@@ -456,7 +460,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
@@ -506,7 +510,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
@@ -690,7 +694,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
@@ -740,7 +744,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
