database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1-pick: [Opt](mow) Forbid time_series compaction policy on unique table (#49905) (#50132)

Browse Source 
pick https://github.com/apache/doris/pull/49905
This commit is contained in:
bobhan1
2025-04-18 11:34:18 +08:00
committed by GitHub
parent 77ea907b54
commit 4146cbbbbb
5 changed files with 92 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
View File

@ -2242,6 +2242,11 @@ public class SchemaChangeHandler extends AlterHandler {
+ " or " + PropertyAnalyzer.SIZE_BASED_COMPACTION_POLICY);
}
if (compactionPolicy != null && compactionPolicy.equals(PropertyAnalyzer.TIME_SERIES_COMPACTION_POLICY)
&& olapTable.getKeysType() == KeysType.UNIQUE_KEYS) {
throw new UserException("Time series compaction policy is not supported for unique key table");
}
Map<String, Long> timeSeriesCompactionConfig = new HashMap<>();
if (properties.containsKey(PropertyAnalyzer.PROPERTIES_TIME_SERIES_COMPACTION_GOAL_SIZE_MBYTES)) {
timeSeriesCompactionConfig

6
fe/fe-core/src/main/java/org/apache/doris/common/util/PropertyAnalyzer.java
View File

@ -747,7 +747,8 @@ public class PropertyAnalyzer {
+ " must be `true` or `false`");
}
public static String analyzeCompactionPolicy(Map<String, String> properties) throws AnalysisException {
public static String analyzeCompactionPolicy(Map<String, String> properties, KeysType keysType)
throws AnalysisException {
if (properties == null || properties.isEmpty()) {
return SIZE_BASED_COMPACTION_POLICY;
}
@ -762,6 +763,9 @@ public class PropertyAnalyzer {
}
}
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;
}

2
fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
View File

@ -2399,7 +2399,7 @@ public class InternalCatalog implements CatalogIf<Database> {
// 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());
}

1
regression-test/suites/datatype_p0/decimalv3/test_decimalv3_overflow.groovy
View File

@ -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) """

81
regression-test/suites/unique_with_mow_p0/test_mow_time_series_compaction.groovy Normal file
View File

@ -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"
}
}