From c0776c7c0756d602204edba76642cafa92e67cd8 Mon Sep 17 00:00:00 2001 From: yujun Date: Fri, 15 Mar 2024 16:53:32 +0800 Subject: [PATCH] [fix](cloud) ignore some case in cloud mode (#32261) --- .../java/org/apache/doris/catalog/ColocateTableIndex.java | 5 +++++ .../suites/schema_change_p0/test_alter_colocate_table.groovy | 3 +++ .../suites/storage_medium_p0/test_disk_health.groovy | 4 ++++ .../storage_medium_p0/test_storage_medium_has_disk.groovy | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java index fcefcff132..0675b1fbb5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ColocateTableIndex.java @@ -19,6 +19,7 @@ package org.apache.doris.catalog; import org.apache.doris.analysis.AlterColocateGroupStmt; import org.apache.doris.clone.ColocateTableCheckerAndBalancer; +import org.apache.doris.common.Config; import org.apache.doris.common.DdlException; import org.apache.doris.common.FeMetaVersion; import org.apache.doris.common.MetaNotFoundException; @@ -845,6 +846,10 @@ public class ColocateTableIndex implements Writable { if (properties.containsKey(PropertyAnalyzer.PROPERTIES_REPLICATION_NUM) || properties.containsKey(PropertyAnalyzer.PROPERTIES_REPLICATION_ALLOCATION)) { + if (Config.isCloudMode()) { + throw new DdlException("Cann't modify colocate group replication in cloud mode"); + } + ReplicaAllocation replicaAlloc = PropertyAnalyzer.analyzeReplicaAllocation(properties, ""); Preconditions.checkState(!replicaAlloc.isNotSet()); Env.getCurrentSystemInfo().checkReplicaAllocation(replicaAlloc); diff --git a/regression-test/suites/schema_change_p0/test_alter_colocate_table.groovy b/regression-test/suites/schema_change_p0/test_alter_colocate_table.groovy index ce23f70a3e..4a588ac031 100644 --- a/regression-test/suites/schema_change_p0/test_alter_colocate_table.groovy +++ b/regression-test/suites/schema_change_p0/test_alter_colocate_table.groovy @@ -16,6 +16,9 @@ // under the License. suite ("test_alter_colocate_table") { + if (isCloudMode()) { + return + } def tbls = ["col_tbl1", "col_tbl2", "col_tbl3"] for (def tbl : tbls) { sql """ diff --git a/regression-test/suites/storage_medium_p0/test_disk_health.groovy b/regression-test/suites/storage_medium_p0/test_disk_health.groovy index 70e76b2bd9..8c1b269c61 100644 --- a/regression-test/suites/storage_medium_p0/test_disk_health.groovy +++ b/regression-test/suites/storage_medium_p0/test_disk_health.groovy @@ -16,6 +16,10 @@ // under the License. suite('test_disk_health', 'p0,p1,p2') { + if (isCloudMode()) { + return + } + def backends = sql_return_maparray "SHOW PROC '/backends'" backends.each { be -> def disks = sql_return_maparray "SHOW PROC '/backends/${be.BackendId}'" diff --git a/regression-test/suites/storage_medium_p0/test_storage_medium_has_disk.groovy b/regression-test/suites/storage_medium_p0/test_storage_medium_has_disk.groovy index 9c90c89e57..bd06680d2b 100644 --- a/regression-test/suites/storage_medium_p0/test_storage_medium_has_disk.groovy +++ b/regression-test/suites/storage_medium_p0/test_storage_medium_has_disk.groovy @@ -18,6 +18,10 @@ import org.apache.doris.regression.suite.ClusterOptions suite('test_storage_medium_has_disk') { + if (isCloudMode()) { + return + } + def checkPartitionMedium = { table, isHdd -> def partitions = sql_return_maparray "SHOW PARTITIONS FROM ${table}" assertTrue(partitions.size() > 0)