This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 8e881cedd3e [fix](cluster key) 3.0 forbid mow cluster key (#44737)
8e881cedd3e is described below
commit 8e881cedd3eab3c919b25149f37c011c30ce4b48
Author: meiyi <me...@selectdb.com>
AuthorDate: Mon Dec 2 21:26:04 2024 +0800
[fix](cluster key) 3.0 forbid mow cluster key (#44737)
---
fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java | 4 +++-
.../doris/nereids/trees/plans/commands/info/CreateTableInfo.java | 4 ++++
.../pipeline/cloud_p0/conf/regression-conf-custom.groovy | 6 ++++--
regression-test/pipeline/p0/conf/regression-conf.groovy | 7 +++++++
.../array_contains/test_index_compaction_unique_keys_arr.groovy | 2 +-
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java
index 0076ce74de3..4ead25ab8e0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/KeysDesc.java
@@ -113,7 +113,9 @@ public class KeysDesc implements Writable {
}
if (clusterKeysColumnNames != null) {
- analyzeClusterKeys(cols);
+ // analyzeClusterKeys(cols);
+ // forbid cluster key in 3.0 temporarily
+ throw new AnalysisException("Cluster key is not supported");
}
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
index 442546224c0..0e3c037ecc3 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateTableInfo.java
@@ -777,6 +777,10 @@ public class CreateTableInfo {
}
}
+ if (!clusterKeysColumnNames.isEmpty()) {
+ // forbid cluster key in 3.0 temporarily
+ throw new AnalysisException("Cluster key is not supported");
+ }
if (!clusterKeysColumnNames.isEmpty()) {
// the same code as KeysDesc#analyzeClusterKeys
if (Config.isCloudMode()) {
diff --git
a/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy
b/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy
index 2d9c6ad6978..59a813b0ffa 100644
--- a/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy
+++ b/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy
@@ -27,11 +27,13 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + //
keep this line as th
"test_be_inject_publish_txn_fail," + // not a case for cloud mode, no need
to run
"test_compaction_uniq_cluster_keys_with_delete," +
"test_compaction_uniq_keys_cluster_key," +
+ "test_pk_uk_case_cluster," +
+ "test_point_query_ck," +
+ "test_rowstore_ck," +
+ "test_point_query_partition_ck," +
"test_dump_image," +
"test_index_failure_injection," +
"test_information_schema_external," +
- "test_pk_uk_case_cluster," +
- "test_point_query_cluster_key," +
"test_profile," +
"test_publish_timeout," +
"test_refresh_mtmv," + // not supported yet
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index 0b8c3a25089..f6cea0e0a20 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -65,6 +65,12 @@ excludeGroups = ""
excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as
the first line
"test_dump_image," +
"test_index_failure_injection," +
+ "test_compaction_uniq_cluster_keys_with_delete," +
+ "test_compaction_uniq_keys_cluster_key," +
+ "test_pk_uk_case_cluster," +
+ "test_point_query_ck," +
+ "test_rowstore_ck," +
+ "test_point_query_partition_ck," +
"test_profile," +
"test_refresh_mtmv," +
"test_spark_load," +
@@ -80,6 +86,7 @@ excludeDirectories = "000_the_start_sentinel_do_not_touch," +
// keep this line
"cloud," +
"cloud_p0," +
"nereids_rules_p0/subquery," +
+ "unique_with_mow_c_p0," +
"workload_manager_p1," +
"zzz_the_end_sentinel_do_not_touch"// keep this line as the last line
diff --git
a/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_unique_keys_arr.groovy
b/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_unique_keys_arr.groovy
index f7047735082..f8bf4752a2a 100644
---
a/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_unique_keys_arr.groovy
+++
b/regression-test/suites/inverted_index_p0/array_contains/test_index_compaction_unique_keys_arr.groovy
@@ -253,7 +253,7 @@ suite("test_index_compaction_unique_keys_arr",
"array_contains_inverted_index")
run_test.call(tableName)
// cluster key is not supported in cloud mode at branch-3.0
- if (!isCloudMode) {
+ if (false) {
tableName = "test_index_compaction_unique_keys_arr_cluster_key"
sql """ DROP TABLE IF EXISTS ${tableName}; """
sql """
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
