From 55d0d5ad3df9f9dbd5f3bf4beb7d697bc3fb51d0 Mon Sep 17 00:00:00 2001 From: meiyi Date: Thu, 28 Nov 2024 16:55:33 +0800 Subject: [PATCH 1/5] [fix](cluster key) 3.0 forbid mow cluster key --- .../src/main/java/org/apache/doris/analysis/KeysDesc.java | 4 +++- .../nereids/trees/plans/commands/info/CreateTableInfo.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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()) { From cb2bfbdecaac5b6f1b2cce3861edd501f1ba4662 Mon Sep 17 00:00:00 2001 From: meiyi Date: Thu, 28 Nov 2024 18:12:02 +0800 Subject: [PATCH 2/5] fix pipeline --- regression-test/pipeline/p0/conf/regression-conf.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy b/regression-test/pipeline/p0/conf/regression-conf.groovy index 0b8c3a2508934e..433fd606242bf8 100644 --- a/regression-test/pipeline/p0/conf/regression-conf.groovy +++ b/regression-test/pipeline/p0/conf/regression-conf.groovy @@ -65,6 +65,8 @@ 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_profile," + "test_refresh_mtmv," + "test_spark_load," + @@ -80,6 +82,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 From d15cc42d65aabb2f12978d54c985985e65661f05 Mon Sep 17 00:00:00 2001 From: meiyi Date: Fri, 29 Nov 2024 10:19:26 +0800 Subject: [PATCH 3/5] modify pipeline --- .../pipeline/cloud_p0/conf/regression-conf-custom.groovy | 5 +++-- regression-test/pipeline/p0/conf/regression-conf.groovy | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) 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..4921733b92b8fd 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,12 @@ 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_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 433fd606242bf8..98559380afa9e8 100644 --- a/regression-test/pipeline/p0/conf/regression-conf.groovy +++ b/regression-test/pipeline/p0/conf/regression-conf.groovy @@ -67,6 +67,9 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as th "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_profile," + "test_refresh_mtmv," + "test_spark_load," + From e4d8ba3c8137926265b4093cbe9e763c650388f7 Mon Sep 17 00:00:00 2001 From: meiyi Date: Fri, 29 Nov 2024 10:22:50 +0800 Subject: [PATCH 4/5] modify --- .../array_contains/test_index_compaction_unique_keys_arr.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 """ From 9e2266c905ca5c883b7e8a08dfcfd8c200a537b3 Mon Sep 17 00:00:00 2001 From: meiyi Date: Fri, 29 Nov 2024 12:13:06 +0800 Subject: [PATCH 5/5] f --- .../pipeline/cloud_p0/conf/regression-conf-custom.groovy | 1 + regression-test/pipeline/p0/conf/regression-conf.groovy | 1 + 2 files changed, 2 insertions(+) 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 4921733b92b8fd..59a813b0ffa4e9 100644 --- a/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy +++ b/regression-test/pipeline/cloud_p0/conf/regression-conf-custom.groovy @@ -30,6 +30,7 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as th "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," + diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy b/regression-test/pipeline/p0/conf/regression-conf.groovy index 98559380afa9e8..f6cea0e0a20497 100644 --- a/regression-test/pipeline/p0/conf/regression-conf.groovy +++ b/regression-test/pipeline/p0/conf/regression-conf.groovy @@ -70,6 +70,7 @@ excludeSuites = "000_the_start_sentinel_do_not_touch," + // keep this line as th "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," +