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 740632832f..5bf55020e3 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 @@ -146,6 +146,17 @@ protected void optimizeOperatorPlan(ParseContext pCtx, Set inputs, 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); } @@ -626,4 +637,36 @@ protected void optimizeTaskPlan(List> rootTasks, Pa PERF_LOGGER.PerfLogEnd(CLASS_NAME, PerfLogger.SPARK_OPTIMIZE_TASK_TREE); return; } + + private void updateBucketingVersionForUpgrade(OptimizeSparkProcContext procCtx) { + // Fetch all the FileSinkOperators. + Set fsOpsAll = new HashSet<>(); + for (TableScanOperator ts : procCtx.getParseContext().getTopOps().values()) { + Set 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> 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 1fbe8f79cf..fe13a0f800 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_1.q @@ -5,11 +5,13 @@ set hive.mapred.mode=nonstrict; -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds string) -CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n1 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n1 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n1 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n1 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n1 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q index 76e615fbde..79f7e5d41c 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_11.q @@ -4,11 +4,13 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 1 part, 2 bucket & big 2 part, 4 bucket -CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n11 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n11 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n11 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n11 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n11 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q index d68efea393..fd0ba0bf4e 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_12.q @@ -5,11 +5,13 @@ set hive.mapred.mode=nonstrict; -- small 1 part, 2 bucket & big 2 part, 4 bucket CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds string) -CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n15 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n15 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n15 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n15 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n15 partition(ds='2008-04-08'); @@ -28,7 +30,8 @@ set hive.optimize.bucketmapjoin.sortedmerge = true; set hive.auto.convert.join.noconditionaltask.size=10; CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) -CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE; +CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_medium partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_medium partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_medium partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q index 0a72ddfc6b..9311b5c111 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_16.q @@ -17,7 +17,8 @@ CREATE TABLE stage_bucket_big_n17 key BIGINT, value STRING ) -PARTITIONED BY (file_tag STRING); +PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1'); CREATE TABLE bucket_big_n17 ( @@ -33,7 +34,8 @@ CREATE TABLE stage_bucket_small_n17 key BIGINT, value string ) -PARTITIONED BY (file_tag STRING); +PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1'); CREATE TABLE bucket_small_n17 ( diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q index c6d5318f43..0dd93f4105 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_2.q @@ -3,13 +3,15 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 1 part, 4 bucket & big 2 part, 2 bucket -CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n3 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n3 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n3 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0' INTO TABLE bucket_small_n3 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n3 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n3 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q index f41b0970c9..7bdf63205f 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_3.q @@ -3,14 +3,16 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 2 bucket & big 1 part, 4 bucket -CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n9 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n9 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n9 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n9 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n9 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n9 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n9 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q index e28e0ab4a0..19e363aba7 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_4.q @@ -3,7 +3,8 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 4 bucket & big 1 part, 2 bucket -CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n12 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n12 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n12 partition(ds='2008-04-08'); @@ -14,7 +15,8 @@ load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INT load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n12 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0' INTO TABLE bucket_small_n12 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n12 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n12 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q index 9550e21382..506a89ad09 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_5.q @@ -6,13 +6,15 @@ set hive.mapred.mode=nonstrict; -- SORT_QUERY_RESULTS -CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n0; load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n0; load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n0; load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0' INTO TABLE bucket_small_n0; -CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n0; load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n0; diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q index 8c9dbacbba..18d7167d81 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_7.q @@ -3,7 +3,8 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 4 bucket & big 2 part, 2 bucket -CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n6 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n6 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n6 partition(ds='2008-04-08'); @@ -14,7 +15,8 @@ load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INT load data local inpath '../../data/files/auto_sortmerge_join/small/000002_0' INTO TABLE bucket_small_n6 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/small/000003_0' INTO TABLE bucket_small_n6 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n6 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n6 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q index 51647e86b2..afe8311773 100644 --- a/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q +++ b/ql/src/test/queries/clientpositive/auto_sortmerge_join_8.q @@ -6,14 +6,16 @@ set hive.exec.submitviachild=false; set hive.exec.submit.local.task.via.child=false; -- small 2 part, 2 bucket & big 2 part, 4 bucket -CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n5 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n5 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/small/000000_0' INTO TABLE bucket_small_n5 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/small/000001_0' INTO TABLE bucket_small_n5 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n5 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n5 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n5 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_1.q b/ql/src/test/queries/clientpositive/bucketcontext_1.q index efb368e3e6..a8c597c67b 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_1.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_1.q @@ -3,11 +3,13 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 1 part, 2 bucket & big 2 part, 4 bucket -CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n14 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n14 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n14 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n14 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n14 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_2.q b/ql/src/test/queries/clientpositive/bucketcontext_2.q index 9287df85d8..622f93cfc6 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_2.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_2.q @@ -3,13 +3,15 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 1 part, 4 bucket & big 2 part, 2 bucket -CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n8 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n8 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small_n8 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket_small_n8 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n8 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n8 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_3.q b/ql/src/test/queries/clientpositive/bucketcontext_3.q index edfbd570fa..3a3a530cc2 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_3.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_3.q @@ -3,14 +3,16 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 2 bucket & big 1 part, 4 bucket -CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n4 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n4 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n4 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n4 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n4 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n4 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n4 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_4.q b/ql/src/test/queries/clientpositive/bucketcontext_4.q index b3113725f0..229021b3ab 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_4.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_4.q @@ -3,7 +3,8 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 4 bucket & big 1 part, 2 bucket -CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small partition(ds='2008-04-08'); @@ -13,7 +14,8 @@ load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket_small partition(ds='2008-04-09'); -CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big partition(ds='2008-04-08'); set hive.cbo.enable=false; diff --git a/ql/src/test/queries/clientpositive/bucketcontext_5.q b/ql/src/test/queries/clientpositive/bucketcontext_5.q index 331f2c115c..b6ff7d662f 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_5.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_5.q @@ -2,13 +2,15 @@ set hive.strict.checks.bucketing=false; -- small no part, 4 bucket & big no part, 2 bucket -CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n13; load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n13; load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small_n13; load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket_small_n13; -CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n13; load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n13; set hive.cbo.enable=false; diff --git a/ql/src/test/queries/clientpositive/bucketcontext_6.q b/ql/src/test/queries/clientpositive/bucketcontext_6.q index 6ab14c37ec..ab0b3a3b9f 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_6.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_6.q @@ -3,13 +3,15 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small no part, 4 bucket & big 2 part, 2 bucket -CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n7; load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n7; load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small_n7; load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket_small_n7; -CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n7 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n7 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_7.q b/ql/src/test/queries/clientpositive/bucketcontext_7.q index d8de2c57b4..cfc7169919 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_7.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_7.q @@ -3,7 +3,8 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 4 bucket & big 2 part, 2 bucket -CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n2 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n2 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small_n2 partition(ds='2008-04-08'); @@ -14,7 +15,8 @@ load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_small_n2 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/big/000003_0' INTO TABLE bucket_small_n2 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n2 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n2 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketcontext_8.q b/ql/src/test/queries/clientpositive/bucketcontext_8.q index b095cfff46..455a889ce0 100644 --- a/ql/src/test/queries/clientpositive/bucketcontext_8.q +++ b/ql/src/test/queries/clientpositive/bucketcontext_8.q @@ -3,14 +3,16 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -- small 2 part, 2 bucket & big 2 part, 4 bucket -CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n10 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n10 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n10 partition(ds='2008-04-09'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n10 partition(ds='2008-04-09'); -CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n10 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n10 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n10 partition(ds='2008-04-08'); diff --git a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q index 871f959cc7..b2694c456d 100644 --- a/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q +++ b/ql/src/test/queries/clientpositive/bucketizedhiveinputformat_auto.q @@ -1,11 +1,13 @@ set hive.strict.checks.bucketing=false; set hive.mapred.mode=nonstrict; -CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_small_n16 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_small_n16 partition(ds='2008-04-08'); -CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE; +CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1'); load data local inpath '../../data/files/auto_sortmerge_join/big/000000_0' INTO TABLE bucket_big_n16 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000001_0' INTO TABLE bucket_big_n16 partition(ds='2008-04-08'); load data local inpath '../../data/files/auto_sortmerge_join/big/000002_0' INTO TABLE bucket_big_n16 partition(ds='2008-04-08'); diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out index c7815fef28..b136f293a7 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n14 POSTHOOK: query: CREATE TABLE bucket_small_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n14 @@ -24,10 +26,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n14@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n14 POSTHOOK: query: CREATE TABLE bucket_big_n14 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n14 @@ -158,7 +162,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -272,7 +276,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -322,7 +326,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -483,7 +487,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -533,7 +537,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out index afc937e0ae..139b04bd18 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n8 POSTHOOK: query: CREATE TABLE bucket_small_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n8 @@ -40,10 +42,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n8@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n8 POSTHOOK: query: CREATE TABLE bucket_big_n8 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n8 @@ -142,7 +146,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -256,7 +260,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -306,7 +310,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -467,7 +471,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -517,7 +521,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out index 1922cada0f..dbe68ee125 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n4 POSTHOOK: query: CREATE TABLE bucket_small_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n4 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n4@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n4 POSTHOOK: query: CREATE TABLE bucket_big_n4 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n4 @@ -142,7 +146,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -190,7 +194,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -304,7 +308,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -464,7 +468,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out index 307b620507..0cc4d7e9fa 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small POSTHOOK: query: CREATE TABLE bucket_small (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big POSTHOOK: query: CREATE TABLE bucket_big (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big @@ -158,7 +162,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -206,7 +210,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -320,7 +324,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -480,7 +484,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out index 88f83fb89e..25f89a89d0 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n13 POSTHOOK: query: CREATE TABLE bucket_small_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n13 @@ -39,10 +41,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n13 PREHOOK: query: CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n13 POSTHOOK: query: CREATE TABLE bucket_big_n13 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n13 @@ -157,7 +161,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -180,7 +184,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -305,7 +309,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -328,7 +332,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out index fbb5a0b96b..0a5baeba6d 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n7 POSTHOOK: query: CREATE TABLE bucket_small_n7 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n7 @@ -39,10 +41,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n7 PREHOOK: query: CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n7 POSTHOOK: query: CREATE TABLE bucket_big_n7 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n7 @@ -204,7 +208,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -254,7 +258,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -411,7 +415,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -461,7 +465,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out index 432c0421fc..734dd0f3b2 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n2 POSTHOOK: query: CREATE TABLE bucket_small_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n2 @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n2@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n2 POSTHOOK: query: CREATE TABLE bucket_big_n2 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n2 @@ -177,7 +181,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -225,7 +229,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -339,7 +343,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -389,7 +393,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -554,7 +558,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -604,7 +608,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out b/ql/src/test/results/clientpositive/bucketcontext_8.q.out index e92e92ea3c..8260858cd7 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n10 POSTHOOK: query: CREATE TABLE bucket_small_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n10 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n10@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n10 POSTHOOK: query: CREATE TABLE bucket_big_n10 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n10 @@ -177,7 +181,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -225,7 +229,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -339,7 +343,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -389,7 +393,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -554,7 +558,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -604,7 +608,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out index 13aada2ade..3eeb9aaddf 100644 --- a/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out +++ b/ql/src/test/results/clientpositive/bucketizedhiveinputformat_auto.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n16 POSTHOOK: query: CREATE TABLE bucket_small_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n16 @@ -24,10 +26,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n16@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n16 POSTHOOK: query: CREATE TABLE bucket_big_n16 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n16 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out index 06853e1961..e212a028d1 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out @@ -1,10 +1,12 @@ PREHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n1 POSTHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n1 @@ -26,10 +28,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n1@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n1 POSTHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n1 @@ -185,7 +189,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -275,7 +279,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -324,7 +328,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -484,7 +488,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -574,7 +578,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -623,7 +627,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -783,7 +787,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -873,7 +877,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -922,7 +926,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out index 3aa74ff90d..7ca07b9f41 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n11 POSTHOOK: query: CREATE TABLE bucket_small_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (KEY) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n11 @@ -24,10 +26,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n11@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n11 POSTHOOK: query: CREATE TABLE bucket_big_n11 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY(KEY) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n11 @@ -195,7 +199,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -275,7 +279,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -325,7 +329,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -510,7 +514,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -600,7 +604,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -649,7 +653,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -798,7 +802,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -884,7 +888,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -933,7 +937,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1083,7 +1087,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1165,7 +1169,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1214,7 +1218,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1291,7 +1295,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1341,7 +1345,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out index f88896d289..2a8bac694b 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out @@ -1,10 +1,12 @@ PREHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n15 POSTHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n15 @@ -26,10 +28,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n15@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n15 POSTHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n15 @@ -101,11 +105,13 @@ POSTHOOK: type: LOAD POSTHOOK: Output: default@bucket_big_n15@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_medium POSTHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_medium @@ -237,7 +243,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -306,7 +312,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -393,7 +399,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -442,7 +448,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -523,7 +529,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out index 68428156f1..ae19cfbd8c 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_16.q.out @@ -4,6 +4,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_big_n17 @@ -13,6 +14,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_big_n17 @@ -44,6 +46,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_small_n17 @@ -53,6 +56,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_small_n17 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out index f73763a076..006bf58ab9 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n3 POSTHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n3 @@ -40,10 +42,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n3@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n3 POSTHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n3 @@ -167,7 +171,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -257,7 +261,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -306,7 +310,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -466,7 +470,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -556,7 +560,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -605,7 +609,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out index 1aa6df108c..bf3daeaf21 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n9 POSTHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n9 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n9@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n9 POSTHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n9 @@ -167,7 +171,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -216,7 +220,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -307,7 +311,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -466,7 +470,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -515,7 +519,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -606,7 +610,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -765,7 +769,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -814,7 +818,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -905,7 +909,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out index 9d285bff61..3648092b13 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n12 POSTHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n12 @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n12@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n12 POSTHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n12 @@ -183,7 +187,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -232,7 +236,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -323,7 +327,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -482,7 +486,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -531,7 +535,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -622,7 +626,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -781,7 +785,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -830,7 +834,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -921,7 +925,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out index ea4ff04857..4bb3bb8a2e 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n0 POSTHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n0 @@ -39,10 +41,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n0 PREHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n0 POSTHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n0 @@ -117,7 +121,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -140,7 +144,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -207,7 +211,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -230,7 +234,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -354,7 +358,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -377,7 +381,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -444,7 +448,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -467,7 +471,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -591,7 +595,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -614,7 +618,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -681,7 +685,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -704,7 +708,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out index 7a0b54f941..9b1eb56d85 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n6 POSTHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n6 @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n6@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n6 POSTHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n6 @@ -202,7 +206,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -251,7 +255,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -342,7 +346,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -391,7 +395,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -555,7 +559,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -604,7 +608,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -695,7 +699,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -744,7 +748,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -908,7 +912,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -957,7 +961,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1048,7 +1052,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1097,7 +1101,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out index 1a23947fec..a13d2a382a 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n5 POSTHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n5 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n5@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n5 POSTHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n5 @@ -202,7 +206,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -251,7 +255,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -342,7 +346,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -391,7 +395,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -555,7 +559,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -604,7 +608,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -695,7 +699,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -744,7 +748,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -908,7 +912,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -957,7 +961,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1048,7 +1052,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -1097,7 +1101,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out index d76fca3be9..e6112b2c91 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out @@ -1,10 +1,12 @@ PREHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n1 POSTHOOK: query: CREATE TABLE bucket_small_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n1 @@ -26,10 +28,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n1@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n1 POSTHOOK: query: CREATE TABLE bucket_big_n1 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n1 @@ -207,7 +211,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -257,7 +261,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -439,7 +443,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -489,7 +493,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -671,7 +675,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -721,7 +725,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out index fb64e4d9e0..d1fc7060f8 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 @@ -1,10 +1,12 @@ PREHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n15 POSTHOOK: query: CREATE TABLE bucket_small_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n15 @@ -26,10 +28,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n15@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n15 POSTHOOK: query: CREATE TABLE bucket_big_n15 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n15 @@ -101,11 +105,13 @@ POSTHOOK: type: LOAD POSTHOOK: Output: default@bucket_big_n15@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_medium POSTHOOK: query: CREATE TABLE bucket_medium (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 3 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_medium @@ -235,7 +241,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -314,7 +320,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -364,7 +370,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -444,7 +450,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -523,7 +529,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out index 61cb8cf425..804377467b 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out @@ -4,6 +4,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_big_n17 @@ -13,6 +14,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_big_n17 @@ -44,6 +46,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_small_n17 @@ -53,6 +56,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_small_n17 diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark index 7dbc3bc2aa..bf97d7e3b9 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_16.q.out_spark @@ -4,6 +4,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_big_n17 @@ -13,6 +14,7 @@ key BIGINT, value STRING ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_big_n17 @@ -44,6 +46,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@stage_bucket_small_n17 @@ -53,6 +56,7 @@ key BIGINT, value string ) PARTITIONED BY (file_tag STRING) +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@stage_bucket_small_n17 diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out index 437293a798..7071892a65 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n3 POSTHOOK: query: CREATE TABLE bucket_small_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n3 @@ -40,10 +42,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n3@ds=2008-04-08 PREHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n3 POSTHOOK: query: CREATE TABLE bucket_big_n3 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n3 @@ -189,7 +193,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -239,7 +243,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -421,7 +425,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -471,7 +475,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments 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 d69cbe61d7..095c796580 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n9 POSTHOOK: query: CREATE TABLE bucket_small_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n9 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n9@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n9 POSTHOOK: query: CREATE TABLE bucket_big_n9 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n9 @@ -189,7 +193,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -370,7 +374,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -551,7 +555,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out index 4dd22e9119..52323b1edd 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n12 POSTHOOK: query: CREATE TABLE bucket_small_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n12 @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n12@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n12 POSTHOOK: query: CREATE TABLE bucket_big_n12 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n12 @@ -205,7 +209,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -386,7 +390,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -567,7 +571,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out index 4fae899a49..99f061a2d9 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n0 POSTHOOK: query: CREATE TABLE bucket_small_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n0 @@ -39,10 +41,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n0 PREHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n0 POSTHOOK: query: CREATE TABLE bucket_big_n0 (key string, value string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n0 @@ -139,7 +143,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -162,7 +166,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -308,7 +312,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -331,7 +335,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -477,7 +481,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -500,7 +504,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out index 027b7433c0..b8311894d4 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n6 POSTHOOK: query: CREATE TABLE bucket_small_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n6 @@ -73,10 +75,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n6@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n6 POSTHOOK: query: CREATE TABLE bucket_big_n6 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n6 @@ -224,7 +228,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -274,7 +278,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -460,7 +464,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -510,7 +514,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -696,7 +700,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -746,7 +750,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out index b6aa014bb8..42a4cec001 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out @@ -1,8 +1,10 @@ PREHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_small_n5 POSTHOOK: query: CREATE TABLE bucket_small_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_small_n5 @@ -41,10 +43,12 @@ POSTHOOK: type: LOAD #### A masked pattern was here #### POSTHOOK: Output: default@bucket_small_n5@ds=2008-04-09 PREHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@bucket_big_n5 POSTHOOK: query: CREATE TABLE bucket_big_n5 (key string, value string) partitioned by (ds string) CLUSTERED BY (key) SORTED BY (key) INTO 4 BUCKETS STORED AS TEXTFILE +TBLPROPERTIES('bucketing_version'='1') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@bucket_big_n5 @@ -224,7 +228,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -274,7 +278,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -460,7 +464,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -510,7 +514,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -696,7 +700,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments @@ -746,7 +750,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key - bucketing_version 2 + bucketing_version 1 column.name.delimiter , columns key,value columns.comments