This is an automated email from the ASF dual-hosted git repository.
jcamacho pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 378083e Revert "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)"
378083e is described below
commit 378083ea0716d770bec875c58d02d7e5c5e14c8f
Author: Jesus Camacho Rodriguez <[email protected]>
AuthorDate: Wed Jun 19 13:34:18 2019 -0700
Revert "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)"
This reverts commit 6b6b920a47c46d456513187907ccb2603b91e974.
---
.../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, 200 insertions(+), 396 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 dd45794..0a76ffa 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,17 +143,6 @@ 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);
}
@@ -627,36 +616,4 @@ 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 fa59d44..841378e 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q
@@ -4,13 +4,11 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 d60d5a3..f816fe8 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q
@@ -3,13 +3,11 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 3c88520..6842475 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q
@@ -4,13 +4,11 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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');
@@ -29,8 +27,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE;
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 9311b5c..0a72ddf 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q
@@ -17,8 +17,7 @@ CREATE TABLE stage_bucket_big_n17
key BIGINT,
value STRING
)
-PARTITIONED BY (file_tag STRING)
-TBLPROPERTIES('bucketing_version'='1');
+PARTITIONED BY (file_tag STRING);
CREATE TABLE bucket_big_n17
(
@@ -34,8 +33,7 @@ CREATE TABLE stage_bucket_small_n17
key BIGINT,
value string
)
-PARTITIONED BY (file_tag STRING)
-TBLPROPERTIES('bucketing_version'='1');
+PARTITIONED BY (file_tag STRING);
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 6d912fd..49b82fe 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q
@@ -2,15 +2,13 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 cc9a6a7..22db3f0 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q
@@ -2,16 +2,14 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 9b357c9..eebfedf 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q
@@ -2,8 +2,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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');
@@ -14,8 +13,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 77309dd..10258da 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q
@@ -5,15 +5,13 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
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 0bad648..4a162af 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q
@@ -2,8 +2,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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');
@@ -14,8 +13,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 ab2d909..c9f8a2d 100644
--- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
+++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q
@@ -5,16 +5,14 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 c5c7a09..4658a65 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_1.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_1.q
@@ -2,13 +2,11 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 902318b..e409dae 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_2.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_2.q
@@ -2,15 +2,13 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 e85800f..aaf212b 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_3.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_3.q
@@ -2,16 +2,14 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 118f56b..f5e0150 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_4.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_4.q
@@ -2,8 +2,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_small (key string, value string) partitioned by (ds
string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
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');
@@ -13,8 +12,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_big (key string, value string) partitioned by (ds string)
CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
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 188aacd..0687a1d 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_5.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_5.q
@@ -1,15 +1,13 @@
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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE;
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 f1377f2..35fec2f 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_6.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_6.q
@@ -2,15 +2,13 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key)
SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 11c12b6..b17590c 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_7.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_7.q
@@ -2,8 +2,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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');
@@ -14,8 +13,7 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 e7e9d8e..225c215 100644
--- a/ql/src/test/queries/clientpositive/bucketcontext_8.q
+++ b/ql/src/test/queries/clientpositive/bucketcontext_8.q
@@ -2,16 +2,14 @@ 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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 b2694c4..871f959 100644
--- a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
+++ b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q
@@ -1,13 +1,11 @@
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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
-TBLPROPERTIES('bucketing_version'='1');
+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;
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 862e463..4b0a313 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
@@ -1,10 +1,8 @@
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
@@ -26,12 +24,10 @@ 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
@@ -162,7 +158,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -273,7 +269,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -323,7 +319,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -482,7 +478,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -532,7 +528,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 583db61..8c1af6a 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
@@ -1,10 +1,8 @@
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
@@ -42,12 +40,10 @@ 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
@@ -146,7 +142,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -257,7 +253,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -307,7 +303,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -466,7 +462,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -516,7 +512,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 1e487f3..389bc05 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
@@ -1,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -146,7 +142,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -194,7 +190,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -305,7 +301,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -463,7 +459,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 905e9c3..b770207 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -1,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -162,7 +158,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -210,7 +206,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -321,7 +317,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -479,7 +475,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 6d5112f..5dccb25 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -1,10 +1,8 @@
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
@@ -41,12 +39,10 @@ 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
@@ -158,7 +154,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -181,7 +177,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -304,7 +300,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -327,7 +323,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 c28a2de..2537b62 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -1,10 +1,8 @@
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
@@ -41,12 +39,10 @@ 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
@@ -205,7 +201,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -255,7 +251,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -410,7 +406,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -460,7 +456,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 5a73b3b..11c81ba 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -1,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -181,7 +177,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -229,7 +225,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -340,7 +336,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -390,7 +386,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -553,7 +549,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -603,7 +599,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 71d8795..90ddb33 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -1,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -181,7 +177,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -229,7 +225,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -340,7 +336,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -390,7 +386,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -553,7 +549,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -603,7 +599,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 3eeb9aa..13aada2 100644
--- a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
+++ b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out
@@ -1,10 +1,8 @@
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
@@ -26,12 +24,10 @@ 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 c976238..a75a1a2 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,12 +1,10 @@
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
@@ -28,12 +26,10 @@ 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
@@ -181,7 +177,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -269,7 +265,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -318,7 +314,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -470,7 +466,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -558,7 +554,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -607,7 +603,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -759,7 +755,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -847,7 +843,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -896,7 +892,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 2dbc083..1778d9b 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,10 +1,8 @@
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
@@ -26,12 +24,10 @@ 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
@@ -191,7 +187,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -270,7 +266,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -320,7 +316,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -496,7 +492,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -584,7 +580,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -633,7 +629,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -781,7 +777,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -865,7 +861,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -914,7 +910,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1062,7 +1058,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1125,7 +1121,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1174,7 +1170,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1261,7 +1257,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1310,7 +1306,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 c22a0d7..19e6973 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,12 +1,10 @@
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
@@ -28,12 +26,10 @@ 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
@@ -105,13 +101,11 @@ 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
@@ -224,7 +218,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -291,7 +285,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -375,7 +369,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -424,7 +418,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -496,7 +490,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 3
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 a6d610c..e8bdaa2 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,7 +4,6 @@ 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
@@ -14,7 +13,6 @@ 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
@@ -46,7 +44,6 @@ 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
@@ -56,7 +53,6 @@ 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 d131d9a..80c39b4 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,10 +1,8 @@
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
@@ -42,12 +40,10 @@ 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
@@ -163,7 +159,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -251,7 +247,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -300,7 +296,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -452,7 +448,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -540,7 +536,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -589,7 +585,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 e5f8ba8..53da73b 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,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -163,7 +159,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -212,7 +208,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -301,7 +297,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -452,7 +448,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -501,7 +497,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -590,7 +586,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -741,7 +737,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -790,7 +786,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -879,7 +875,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 502e1e8..d236611 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,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -179,7 +175,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -228,7 +224,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -317,7 +313,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -468,7 +464,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -517,7 +513,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -606,7 +602,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -757,7 +753,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -806,7 +802,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -895,7 +891,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 0929216..f014d39 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,10 +1,8 @@
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
@@ -41,12 +39,10 @@ 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
@@ -113,7 +109,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -136,7 +132,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -201,7 +197,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -224,7 +220,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -340,7 +336,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -363,7 +359,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -428,7 +424,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -451,7 +447,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -567,7 +563,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -590,7 +586,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -655,7 +651,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -678,7 +674,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 f6a4b35..0d93202 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,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -198,7 +194,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -247,7 +243,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -336,7 +332,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -385,7 +381,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -541,7 +537,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -590,7 +586,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -679,7 +675,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -728,7 +724,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -884,7 +880,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -933,7 +929,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1022,7 +1018,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1071,7 +1067,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 2ba69cf..b8bc1bd 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,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -198,7 +194,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -247,7 +243,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -336,7 +332,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -385,7 +381,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -541,7 +537,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -590,7 +586,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -679,7 +675,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -728,7 +724,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -884,7 +880,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -933,7 +929,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1022,7 +1018,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -1071,7 +1067,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 3ddfe79..1640df1 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,12 +1,10 @@
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
@@ -28,12 +26,10 @@ 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
@@ -202,7 +198,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -252,7 +248,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -425,7 +421,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -475,7 +471,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -648,7 +644,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -698,7 +694,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 b764841..da785bb 100644
--- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
@@ -622,4 +622,4 @@ POSTHOOK: Input: default@bucket_medium@ds=2008-04-08
POSTHOOK: Input: default@bucket_small_n15
POSTHOOK: Input: default@bucket_small_n15@ds=2008-04-08
#### A masked pattern was here ####
-570
\ No newline at end of file
+570
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 590e242..9e8d6e7 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,7 +4,6 @@ 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
@@ -14,7 +13,6 @@ 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
@@ -46,7 +44,6 @@ 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
@@ -56,7 +53,6 @@ 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 2ee8ce0..2a129e2 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,7 +4,6 @@ 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
@@ -14,7 +13,6 @@ 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
@@ -46,7 +44,6 @@ 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
@@ -56,7 +53,6 @@ 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 b897f6a..b994df5 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,10 +1,8 @@
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
@@ -42,12 +40,10 @@ 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
@@ -184,7 +180,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -234,7 +230,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -407,7 +403,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -457,7 +453,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 a615418..3a167fa 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,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -184,7 +180,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -356,7 +352,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -528,7 +524,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 01ae46c..85b4510 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,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -200,7 +196,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -372,7 +368,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -544,7 +540,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 f542786..e64ec79 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,10 +1,8 @@
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
@@ -41,12 +39,10 @@ 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
@@ -134,7 +130,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -157,7 +153,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -294,7 +290,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -317,7 +313,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -454,7 +450,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -477,7 +473,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 ce583c5..14d0093 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,10 +1,8 @@
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
@@ -75,12 +73,10 @@ 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
@@ -219,7 +215,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -269,7 +265,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -446,7 +442,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -496,7 +492,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -673,7 +669,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -723,7 +719,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 2
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
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 073de73..0a3eedc 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,10 +1,8 @@
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
@@ -43,12 +41,10 @@ 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
@@ -219,7 +215,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -269,7 +265,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -446,7 +442,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -496,7 +492,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -673,7 +669,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
@@ -723,7 +719,7 @@ STAGE PLANS:
SORTBUCKETCOLSPREFIX TRUE
bucket_count 4
bucket_field_name key
- bucketing_version 1
+ bucketing_version 2
column.name.delimiter ,
columns key,value
columns.comments
