diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java index 2b1d2b5aefe210..53a7a629228f41 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java @@ -2374,6 +2374,11 @@ public void updateTableProperties(Database db, String tableName, Map timeSeriesCompactionConfig = new HashMap<>(); if (properties.containsKey(PropertyAnalyzer.PROPERTIES_TIME_SERIES_COMPACTION_GOAL_SIZE_MBYTES)) { timeSeriesCompactionConfig diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/alter/CloudSchemaChangeHandler.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/alter/CloudSchemaChangeHandler.java index cc6af7b2c12a8b..9277982b573457 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/alter/CloudSchemaChangeHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/alter/CloudSchemaChangeHandler.java @@ -20,6 +20,7 @@ import org.apache.doris.alter.SchemaChangeHandler; import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Env; +import org.apache.doris.catalog.KeysType; import org.apache.doris.catalog.MaterializedIndex; import org.apache.doris.catalog.MaterializedIndex.IndexExtState; import org.apache.doris.catalog.OlapTable; @@ -179,6 +180,10 @@ public void updateTableProperties(Database db, String tableName, Map properties + " must be `true` or `false`"); } - public static String analyzeCompactionPolicy(Map properties) throws AnalysisException { + public static String analyzeCompactionPolicy(Map properties, KeysType keysType) + throws AnalysisException { if (properties == null || properties.isEmpty()) { return SIZE_BASED_COMPACTION_POLICY; } @@ -913,6 +914,9 @@ public static String analyzeCompactionPolicy(Map properties) thr } } + if (keysType == KeysType.UNIQUE_KEYS && compactionPolicy.equals(TIME_SERIES_COMPACTION_POLICY)) { + throw new AnalysisException("Time series compaction policy is not supported for unique key table"); + } return compactionPolicy; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index c01443caa4c8db..2a9cac1ea98bc6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -2565,7 +2565,7 @@ private boolean createOlapTable(Database db, CreateTableStmt stmt) throws UserEx // set compaction policy String compactionPolicy = PropertyAnalyzer.SIZE_BASED_COMPACTION_POLICY; try { - compactionPolicy = PropertyAnalyzer.analyzeCompactionPolicy(properties); + compactionPolicy = PropertyAnalyzer.analyzeCompactionPolicy(properties, olapTable.getKeysType()); } catch (AnalysisException e) { throw new DdlException(e.getMessage()); } diff --git a/regression-test/suites/datatype_p0/decimalv3/test_decimalv3_overflow.groovy b/regression-test/suites/datatype_p0/decimalv3/test_decimalv3_overflow.groovy index b5cfe16a77f85d..cfea7df12f52d1 100644 --- a/regression-test/suites/datatype_p0/decimalv3/test_decimalv3_overflow.groovy +++ b/regression-test/suites/datatype_p0/decimalv3/test_decimalv3_overflow.groovy @@ -643,7 +643,6 @@ suite("test_decimalv3_overflow") { DISTRIBUTED BY HASH(`id`) BUCKETS 10 PROPERTIES( "replication_num"="1", - "compaction_policy" = "time_series", "enable_unique_key_merge_on_write" = "true" ); """ sql """ insert into test4 values(1, 62324, 0.00273) """ diff --git a/regression-test/suites/unique_with_mow_p0/test_mow_time_series_compaction.groovy b/regression-test/suites/unique_with_mow_p0/test_mow_time_series_compaction.groovy new file mode 100644 index 00000000000000..4d422edc36ab58 --- /dev/null +++ b/regression-test/suites/unique_with_mow_p0/test_mow_time_series_compaction.groovy @@ -0,0 +1,81 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +suite("test_mow_time_series_compaction") { + def tableName = "test_mow_time_series_compaction" + sql """ DROP TABLE IF EXISTS ${tableName} """ + test { + sql """ CREATE TABLE ${tableName} + (k int, v1 int, v2 int ) + UNIQUE KEY(k) + DISTRIBUTED BY HASH (k) + BUCKETS 1 PROPERTIES( + "replication_num" = "1", + "enable_unique_key_merge_on_write"="true", + "compaction_policy" = "time_series"); + """ + exception "Time series compaction policy is not supported for unique key table" + } + + tableName = "test_mor_time_series_compaction" + sql """ DROP TABLE IF EXISTS ${tableName} """ + test { + sql """ CREATE TABLE ${tableName} + (k int, v1 int, v2 int ) + UNIQUE KEY(k) + DISTRIBUTED BY HASH (k) + BUCKETS 1 PROPERTIES( + "replication_num" = "1", + "enable_unique_key_merge_on_write"="false", + "compaction_policy" = "time_series"); + """ + exception "Time series compaction policy is not supported for unique key table" + } + + tableName = "test_mow_time_series_compaction_2" + sql """ DROP TABLE IF EXISTS ${tableName} """ + sql """ CREATE TABLE ${tableName} + (k int, v1 int, v2 int ) + UNIQUE KEY(k) + DISTRIBUTED BY HASH (k) + BUCKETS 1 PROPERTIES( + "replication_num" = "1", + "enable_unique_key_merge_on_write"="true"); + """ + sql "insert into ${tableName} values (1, 1, 1),(2,2,2),(3,3,3);" + test { + sql "alter table ${tableName} set (\"compaction_policy\" = \"time_series\");" + exception "Time series compaction policy is not supported for unique key table" + } + + tableName = "test_mor_time_series_compaction_2" + sql """ DROP TABLE IF EXISTS ${tableName} """ + sql """ CREATE TABLE ${tableName} + (k int, v1 int, v2 int ) + UNIQUE KEY(k) + DISTRIBUTED BY HASH (k) + BUCKETS 1 PROPERTIES( + "replication_num" = "1", + "enable_unique_key_merge_on_write"="false"); + """ + sql "insert into ${tableName} values (1, 1, 1),(2,2,2),(3,3,3);" + test { + sql "alter table ${tableName} set (\"compaction_policy\" = \"time_series\");" + exception "Time series compaction policy is not supported for unique key table" + } + +} \ No newline at end of file