Skip to content

[enhance](mtmv)reduce the behavior of triggering the mtmv state to change to schema_change #36513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morrySnow merged 9 commits into from
Jun 20, 2024
Merged

[enhance](mtmv)reduce the behavior of triggering the mtmv state to change to schema_change #36513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7e2a156
1
zddr Jun 19, 2024
d6b8b96
1
zddr Jun 19, 2024
402b395
1
zddr Jun 19, 2024
ae36197
1
zddr Jun 19, 2024
3dca313
1
zddr Jun 19, 2024
53ac3b8
1
zddr Jun 19, 2024
9e06a57
1
zddr Jun 19, 2024
7b1f118
1
zddr Jun 19, 2024
bdc0bc3
1
zddr Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/alter/Alter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ private boolean processAlterOlapTable(AlterTableStmt stmt, OlapTable olapTable,
} else if (currentAlterOps.hasSchemaChangeOp()) {
// if modify storage type to v2, do schema change to convert all related tablets to segment v2 format
schemaChangeHandler.process(stmt.toSql(), alterClauses, db, olapTable);
// if base table schemaChanged, need change mtmv status
Env.getCurrentEnv().getMtmvService().alterTable(olapTable);
} else if (currentAlterOps.hasRollupOp()) {
materializedViewHandler.process(alterClauses, db, olapTable);
} else if (currentAlterOps.hasPartitionOp()) {
Expand Down Expand Up @@ -263,7 +261,6 @@ private boolean processAlterOlapTable(AlterTableStmt stmt, OlapTable olapTable,
}
} else if (currentAlterOps.hasRenameOp()) {
processRename(db, olapTable, alterClauses);
Env.getCurrentEnv().getMtmvService().alterTable(olapTable);
} else if (currentAlterOps.hasReplaceTableOp()) {
processReplaceTable(db, olapTable, alterClauses);
} else if (currentAlterOps.contains(AlterOpType.MODIFY_TABLE_PROPERTY_SYNC)) {
Expand All @@ -282,10 +279,21 @@ private boolean processAlterOlapTable(AlterTableStmt stmt, OlapTable olapTable,
} else {
throw new DdlException("Invalid alter operations: " + currentAlterOps);
}

if (needChangeMTMVState(alterClauses)) {
Env.getCurrentEnv().getMtmvService().alterTable(olapTable);
}
return needProcessOutsideTableLock;
}

private boolean needChangeMTMVState(List<AlterClause> alterClauses) {
for (AlterClause alterClause : alterClauses) {
if (alterClause.needChangeMTMVState()) {
return true;
}
}
return false;
}

private void processModifyTableComment(Database db, OlapTable tbl, AlterClause alterClause)
throws DdlException {
tbl.writeLockOrDdlException();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnsClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddPartitionLikeClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddRollupClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder stringBuilder = new StringBuilder();
Expand Down
4 changes: 4 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AlterClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,8 @@ public AlterOpType getOpType() {
public boolean allowOpMTMV() {
return true;
}

public boolean needChangeMTMVState() {
return false;
}
}
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ public void setTableName(TableName tableName) {
}

public abstract boolean allowOpMTMV();

public abstract boolean needChangeMTMVState();
Copy link
Contributor

@seawinde seawinde Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this may be add a default impl and value such as true, when add new cluse later, maybe safe

Copy link
Contributor Author

@zddr zddr Jun 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intentional to avoid ignoring this method when creating new classes, and adding some comments in other PRs

}
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/BuildIndexClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
if (alter) {
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ColumnRenameClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return true;
}

@Override
public String toSql() {
return "RENAME COLUMN " + colName + " " + newColName;
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/CreateIndexClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
if (alter) {
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropColumnClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return true;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropIndexClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder stringBuilder = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropPartitionClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropPartitionFromIndexClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DropRollupClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder stringBuilder = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/EnableFeatureClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return true;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnCommentClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyDistributionClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyEngineClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyPartitionClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTableCommentClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyTablePropertiesClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/PartitionRenameClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
return "RENAME PARTITION " + partitionName + " " + newPartitionName;
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ReorderColumnsClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ReplacePartitionClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/ReplaceTableClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return true;
}

@Override
public String toSql() {
StringBuilder sb = new StringBuilder();
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/RollupRenameClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ public boolean allowOpMTMV() {
return true;
}

@Override
public boolean needChangeMTMVState() {
return false;
}

@Override
public String toSql() {
return "RENAME ROLLUP " + rollupName + " " + newRollupName;
Expand Down
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/TableRenameClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ public boolean allowOpMTMV() {
return false;
}

@Override
public boolean needChangeMTMVState() {
return true;
}

@Override
public String toSql() {
return "RENAME " + newTableName;
Expand Down
Loading