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

[fix][alter table property] fix alter table property failed (#22791)

Browse Source
This commit is contained in:
Chenyang Sun
2023-08-10 17:12:42 +08:00
committed by GitHub
parent 58e7952eea
commit df26fb2de4
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2166,16 +2166,17 @@ public class SchemaChangeHandler extends AlterHandler {
.get(PropertyAnalyzer.PROPERTIES_TIME_SERIES_COMPACTION_TIME_THRESHOLD_SECONDS)));
}
if (isInMemory < 0 && storagePolicyId < 0 && compactionPolicy == null && timeSeriesCompactionConfig.isEmpty()
&& !properties.containsKey(PropertyAnalyzer.PROPERTIES_IS_BEING_SYNCED)) {
LOG.info("Properties already up-to-date");
return;
}
for (Partition partition : partitions) {
updatePartitionProperties(db, olapTable.getName(), partition.getName(), storagePolicyId, isInMemory,
null, compactionPolicy, timeSeriesCompactionConfig);
}
if (isInMemory < 0 && storagePolicyId < 0 && compactionPolicy == null && timeSeriesCompactionConfig.isEmpty()) {
LOG.info("Properties already up-to-date");
return;
}
olapTable.writeLockOrDdlException();
try {
Env.getCurrentEnv().modifyTableProperties(db, olapTable, properties);

4
fe/fe-core/src/main/java/org/apache/doris/catalog/TableProperty.java
View File

@ -124,6 +124,10 @@ public class TableProperty implements Writable {
buildInMemory();
buildStoragePolicy();
buildIsBeingSynced();
buildCompactionPolicy();
buildTimeSeriesCompactionGoalSizeMbytes();
buildTimeSeriesCompactionFileCountThreshold();
buildTimeSeriesCompactionTimeThresholdSeconds();
break;
default:
break;

11
regression-test/suites/compaction/test_table_level_compaction_policy.groovy
View File

@ -38,6 +38,8 @@ suite("test_table_level_compaction_policy") {
"time_series_compaction_time_threshold_seconds" = "86400"
);
"""
sql """sync"""
def showResult1 = sql """show create table ${tableName}"""
logger.info("${showResult1}")
assertTrue(showResult1.toString().containsIgnoreCase('"compaction_policy" = "time_series"'))
@ -48,6 +50,7 @@ suite("test_table_level_compaction_policy") {
sql """
alter table ${tableName} set ("time_series_compaction_goal_size_mbytes" = "1024")
"""
sql """sync"""
def showResult2 = sql """show create table ${tableName}"""
logger.info("${showResult2}")
@ -56,6 +59,7 @@ suite("test_table_level_compaction_policy") {
sql """
alter table ${tableName} set ("time_series_compaction_file_count_threshold" = "6000")
"""
sql """sync"""
def showResult3 = sql """show create table ${tableName}"""
logger.info("${showResult3}")
@ -64,12 +68,14 @@ suite("test_table_level_compaction_policy") {
sql """
alter table ${tableName} set ("time_series_compaction_time_threshold_seconds" = "3000")
"""
sql """sync"""
def showResult4 = sql """show create table ${tableName}"""
logger.info("${showResult4}")
assertTrue(showResult4.toString().containsIgnoreCase('"time_series_compaction_time_threshold_seconds" = "3000"'))
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """sync"""
sql """
CREATE TABLE ${tableName} (
@ -84,11 +90,14 @@ suite("test_table_level_compaction_policy") {
"replication_num" = "1"
);
"""
sql """sync"""
def showResult5 = sql """show create table ${tableName}"""
logger.info("${showResult5}")
assertFalse(showResult5.toString().containsIgnoreCase('"compaction_policy"'))
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """sync"""
test {
sql """
@ -197,6 +206,7 @@ suite("test_table_level_compaction_policy") {
"replication_num" = "1"
);
"""
sql """sync"""
sql """
alter table ${tableName} set ("compaction_policy" = "ok")
@ -204,4 +214,5 @@ suite("test_table_level_compaction_policy") {
exception "Table compaction policy only support for time_series or size_based"
}
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """sync"""
}