Skip to content

branch-3.0: [fix](ccr) Wrong tosql for alt tbl enable feature #46620 #47208

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
dataroaring merged 1 commit into from
Jan 21, 2025
Merged

branch-3.0: [fix](ccr) Wrong tosql for alt tbl enable feature #46620 #47208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@
import org.apache.doris.qe.ConnectContext;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

// Alter table statement.
public class AlterTableStmt extends DdlStmt implements NotFallbackInParser {
private TableName tbl;
private List<AlterClause> ops;
private List<AlterClause> originOps;

public AlterTableStmt(TableName tbl, List<AlterClause> ops) {
this.tbl = tbl;
this.ops = ops;
this.originOps = ops;
}

public void setTableName(String newTableName) {
Expand Down Expand Up @@ -104,7 +107,7 @@ public void rewriteAlterClause(OlapTable table) throws UserException {
// analyse sequence column
Type sequenceColType = null;
if (alterFeature == EnableFeatureClause.Features.SEQUENCE_LOAD) {
Map<String, String> propertyMap = alterClause.getProperties();
Map<String, String> propertyMap = new HashMap<>(alterClause.getProperties());
try {
sequenceColType = PropertyAnalyzer.analyzeSequenceType(propertyMap, table.getKeysType());
if (sequenceColType == null) {
Expand Down Expand Up @@ -181,7 +184,7 @@ public String toSql() {
StringBuilder sb = new StringBuilder();
sb.append("ALTER TABLE ").append(tbl.toSql()).append(" ");
int idx = 0;
for (AlterClause op : ops) {
for (AlterClause op : originOps) {
if (idx != 0) {
sb.append(", \n");
}
Expand Down
21 changes: 21 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.junit.Before;
import org.junit.Test;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -178,4 +179,24 @@ public void testDropIndexStmt() throws UserException {
Assert.assertEquals("DROP INDEX `index1` ON `db`.`table`", dropIndexClause.toSql());
Assert.assertEquals("ALTER TABLE `testDb`.`testTbl` DROP INDEX `index1`", stmt.toSql());
}

@Test
public void testEnableFeatureClause() {
List<AlterClause> ops = Lists.newArrayList();
ops.add(new EnableFeatureClause("BATCH_DELETE"));
AlterTableStmt alterTableStmt = new AlterTableStmt(new TableName(internalCtl, "db", "test"), ops);
Assert.assertEquals(alterTableStmt.toSql(), "ALTER TABLE `db`.`test` ENABLE FEATURE \"BATCH_DELETE\"");
ops.clear();
ops.add(new EnableFeatureClause("UPDATE_FLEXIBLE_COLUMNS"));
alterTableStmt = new AlterTableStmt(new TableName(internalCtl, "db", "test"), ops);
Assert.assertEquals(alterTableStmt.toSql(),
"ALTER TABLE `db`.`test` ENABLE FEATURE \"UPDATE_FLEXIBLE_COLUMNS\"");
ops.clear();
Map<String, String> properties = new HashMap<>();
properties.put("function_column.sequence_type", "int");
ops.add(new EnableFeatureClause("SEQUENCE_LOAD", properties));
alterTableStmt = new AlterTableStmt(new TableName(internalCtl, "db", "test"), ops);
Assert.assertEquals(alterTableStmt.toSql(),
"ALTER TABLE `db`.`test` ENABLE FEATURE \"SEQUENCE_LOAD\" WITH PROPERTIES (\"function_column.sequence_type\" = \"int\")");
}
}
Loading