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

[fix](mtmv) mtmv disable dynamic partition (#35686) (#35949)

Browse Source 
bp #35686

Co-authored-by: zhangdong <493738387@qq.com>
This commit is contained in:
Mingyu Chen
2024-06-06 14:43:40 +08:00
committed by GitHub
parent 5cecbfc6ea
commit 104fcea725
5 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
View File

@ -18,7 +18,10 @@
package org.apache.doris.analysis;
import org.apache.doris.alter.AlterOpType;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.MTMV;
import org.apache.doris.catalog.ReplicaAllocation;
import org.apache.doris.catalog.Table;
import org.apache.doris.catalog.TableProperty;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.util.DynamicPartitionUtil;
@ -307,6 +310,20 @@ public class ModifyTablePropertiesClause extends AlterTableClause {
} else {
throw new AnalysisException("Unknown table property: " + properties.keySet());
}
analyzeForMTMV();
}
private void analyzeForMTMV() throws AnalysisException {
if (tableName != null) {
Table table = Env.getCurrentInternalCatalog().getDbOrAnalysisException(tableName.getDb())
.getTableOrAnalysisException(tableName.getTbl());
if (!(table instanceof MTMV)) {
return;
}
if (DynamicPartitionUtil.checkDynamicPartitionPropertiesExist(properties)) {
throw new AnalysisException("Not support dynamic partition properties on async materialized view");
}
}
}
@Override

2
fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
View File

@ -32,6 +32,7 @@ import org.apache.doris.catalog.DistributionInfo;
import org.apache.doris.catalog.DynamicPartitionProperty;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.HashDistributionInfo;
import org.apache.doris.catalog.MTMV;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.catalog.Partition;
import org.apache.doris.catalog.PartitionItem;
@ -502,6 +503,7 @@ public class DynamicPartitionScheduler extends MasterDaemon {
olapTable = (OlapTable) db.getTableNullable(tableId);
// Only OlapTable has DynamicPartitionProperty
if (olapTable == null
|| olapTable instanceof MTMV
|| !olapTable.dynamicPartitionExists()
|| !olapTable.getTableProperty().getDynamicPartitionProperty().getEnable()) {
iterator.remove();

4
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateMTMVInfo.java
View File

@ -33,6 +33,7 @@ import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.View;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.common.FeNameFormat;
import org.apache.doris.common.util.DynamicPartitionUtil;
import org.apache.doris.mtmv.EnvInfo;
import org.apache.doris.mtmv.MTMVPartitionInfo;
import org.apache.doris.mtmv.MTMVPartitionInfo.MTMVPartitionType;
@ -178,6 +179,9 @@ public class CreateMTMVInfo {
}
private void analyzeProperties() {
if (DynamicPartitionUtil.checkDynamicPartitionPropertiesExist(properties)) {
throw new AnalysisException("Not support dynamic partition properties on async materialized view");
}
for (String key : MTMVPropertyUtil.mvPropertyKeys) {
if (properties.containsKey(key)) {
MTMVPropertyUtil.analyzeProperty(key, properties.get(key));

6
regression-test/suites/mtmv_p0/test_build_mtmv.groovy
View File

@ -88,10 +88,16 @@ suite("test_build_mtmv") {
logger.info("showCreateTableResult: " + showCreateTableResult.toString())
assertTrue(showCreateTableResult.toString().contains("CREATE MATERIALIZED VIEW `multi_mv_test_create_mtmv` (\n `aa` BIGINT NULL COMMENT 'aaa',\n `bb` VARCHAR(20) NULL\n) ENGINE=MATERIALIZED_VIEW\nCOMMENT 'comment1'\nDISTRIBUTED BY RANDOM BUCKETS 2\nPROPERTIES"))
// desc
def descTableAllResult = sql """desc ${mvName} all"""
logger.info("descTableAllResult: " + descTableAllResult.toString())
assertTrue(descTableAllResult.toString().contains("${mvName}"))
// show data
def showDataResult = sql """show data"""
logger.info("showDataResult: " + showDataResult.toString())
assertTrue(showDataResult.toString().contains("${mvName}"))
// if not exist
try {
sql """

18
regression-test/suites/mtmv_p0/test_limit_op_mtmv.groovy
View File

@ -261,6 +261,24 @@ suite("test_limit_op_mtmv") {
Assert.fail();
}
// not allow dynamic_partition
test {
sql """ALTER TABLE ${mvName} set ("dynamic_partition.enable" = "true")"""
exception "dynamic"
}
sql """drop materialized view if exists ${mvName};"""
test {
sql """
CREATE MATERIALIZED VIEW ${mvName}
BUILD DEFERRED REFRESH AUTO ON MANUAL
partition by(`k3`)
DISTRIBUTED BY RANDOM BUCKETS 2
PROPERTIES ('replication_num' = '1','dynamic_partition.enable'='true')
AS
SELECT * FROM ${tableName};
"""
exception "dynamic"
}
sql """drop table if exists `${tableName}`"""
sql """drop materialized view if exists ${mvName};"""
}