From a21695adbab0d6a354ca18d38066d90766695381 Mon Sep 17 00:00:00 2001 From: bobhan1 Date: Thu, 17 Apr 2025 14:22:17 +0800 Subject: [PATCH] [Opt](mow) Forbid time_series compaction policy on unique table (#49905) Issue Number: close #xxx Related PR: #xxx Problem Summary: None - Test - [x] Regression test - [ ] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason - Behavior changed: - [ ] No. - [x] Yes. - Does this need documentation? - [ ] No. - [x] Yes. - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label --- .../doris/alter/SchemaChangeHandler.java | 5 ++ .../doris/common/util/PropertyAnalyzer.java | 6 +- .../doris/datasource/InternalCatalog.java | 2 +- .../decimalv3/test_decimalv3_overflow.groovy | 1 - .../test_mow_time_series_compaction.groovy | 81 +++++++++++++++++++ 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 regression-test/suites/unique_with_mow_p0/test_mow_time_series_compaction.groovy 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 f32c9162f570d5..1d9fd18e3dcc8a 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 @@ -2242,6 +2242,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/common/util/PropertyAnalyzer.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java index 0a353508638527..62bd204edcd1ab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java @@ -747,7 +747,8 @@ public static Boolean analyzeSkipWriteIndexOnLoad(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; } @@ -762,6 +763,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 22cb341721cd5f..8ca76357db62a0 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 @@ -2399,7 +2399,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