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 0076ce74de3351..4ead25ab8e0deb 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 void analyze(List cols) throws AnalysisException { } 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 442546224c08ca..0e3c037ecc390c 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 @@ private void validateKeyColumns() { } } + 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 2d9c6ad6978ab5..59a813b0ffa4e9 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 0b8c3a2508934e..f6cea0e0a20497 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 f70477350821f6..f8bf4752a2a65e 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 """