Skip to content

enhancement: support alter modify columns' type and position #357

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

enhancement: support alter modify columns' type and position #357

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
70 changes: 70 additions & 0 deletions src/main/java/com/starrocks/connector/flink/catalog/StarRocksCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

/** Responsible for reading and writing metadata such as database/table from StarRocks. */
Expand Down Expand Up @@ -367,6 +370,48 @@ public void alterDropColumns(
}
}

/**
* Rename columns of a table.
*
* @param databaseName Name of the database
* @param tableName Name of the table
* @param modifyColumnsTypeMap Columns to modify types
* @param modifyColumnsPositionMap Columns to modify positions
* @param timeoutSecond Timeout for a schema change on StarRocks side
* @throws StarRocksCatalogException in case of any runtime exception
*/
public void alterModifyColumns(
String databaseName, String tableName, Map<String, String> modifyColumnsTypeMap,
Map<String, String> modifyColumnsPositionMap,
long timeoutSecond)
throws StarRocksCatalogException {
Preconditions.checkArgument(
!StringUtils.isNullOrWhitespaceOnly(databaseName),
"database name cannot be null or empty.");
Preconditions.checkArgument(
!StringUtils.isNullOrWhitespaceOnly(tableName),
"table name cannot be null or empty.");

Preconditions.checkArgument(!modifyColumnsTypeMap.isEmpty(), "Modified columns should not be empty.");

Set<String> extraneousColumns = new HashSet<>(modifyColumnsPositionMap.keySet());
extraneousColumns.removeAll(modifyColumnsTypeMap.keySet());
Preconditions.checkArgument(extraneousColumns.isEmpty(), "Position-modified columns should provide types too.");

String alterSql =
buildAlterModifyColumnsSql(databaseName, tableName, modifyColumnsTypeMap, modifyColumnsPositionMap, timeoutSecond);
try {
long startTimeMillis = System.currentTimeMillis();
executeAlter(databaseName, tableName, alterSql, timeoutSecond);
LOG.info("Success to modify columns from {}.{}, duration: {}ms, sql: {}",
databaseName, tableName, System.currentTimeMillis() - startTimeMillis, alterSql);
} catch (Exception e) {
LOG.error("Failed to modify columns from {}.{}, sql: {}", databaseName, tableName, alterSql);
throw new StarRocksCatalogException(
String.format("Failed to modify columns from %s.%s ", databaseName, tableName), e);
}
}

private void executeAlter(
String databaseName, String tableName, String alterSql, long timeoutSecond)
throws StarRocksCatalogException {
Expand Down Expand Up @@ -607,6 +652,31 @@ private String buildAlterDropColumnsSql(
return builder.toString();
}

private String buildAlterModifyColumnsSql(
String databaseName, String tableName,
Map<String, String> modifyColumnsTypeMap,
Map<String, String> modifyColumnsPositionMap,
long timeoutSecond
) {
StringBuilder builder = new StringBuilder();
builder.append(String.format("ALTER TABLE `%s`.`%s` ", databaseName, tableName));
String columnsStmt =
modifyColumnsTypeMap.entrySet().stream()
.map(col -> {
String stmt = String.format("MODIFY COLUMN `%s` %s", col.getKey(), col.getValue());
if (modifyColumnsPositionMap.containsKey(col.getKey())) {
String position = modifyColumnsPositionMap.get(col.getKey());
stmt += position.isEmpty() ? " FIRST" : String.format(" AFTER `%s`", position);
}
return stmt;
})
.collect(Collectors.joining(", "));
builder.append(columnsStmt);
builder.append(String.format(" PROPERTIES (\"timeout\" = \"%s\")", timeoutSecond));
builder.append(";");
return builder.toString();
}

private String buildColumnStmt(StarRocksColumn column) {
StringBuilder builder = new StringBuilder();
builder.append("`");
Expand Down
55 changes: 55 additions & 0 deletions src/test/java/com/starrocks/connector/flink/it/catalog/StarRocksCatalogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -136,4 +138,57 @@ public void testAlterDropColumns() throws Exception {
.collect(Collectors.toList());
assertEquals(expectedColumns, newTable.getColumns());
}

@Test
public void testAlterModifyColumns() throws Exception {
StarRocksTable oldTable = catalog.getTable(DB_NAME, tableName).orElse(null);
assertNotNull(oldTable);
Map<String, String> modifyColumnsTypeMap = new HashMap<>();
modifyColumnsTypeMap.put("c1", "DOUBLE");
modifyColumnsTypeMap.put("c2", "BOOLEAN");
Map<String, String> modifyColumnsPositionMap = new HashMap<>();
modifyColumnsPositionMap.put("c1", "c3");

catalog.alterModifyColumns(DB_NAME, tableName, modifyColumnsTypeMap, modifyColumnsPositionMap, 60);
StarRocksTable newTable = catalog.getTable(DB_NAME, tableName).orElse(null);
assertNotNull(newTable);

List<StarRocksColumn> expectedColumns = Arrays.asList(
new StarRocksColumn.Builder()
.setColumnName("c0")
.setOrdinalPosition(0)
.setDataType("int")
.setNullable(false)
.setColumnSize(10)
.setDecimalDigits(0)
.setColumnComment("")
.build(),
new StarRocksColumn.Builder()
.setColumnName("c2")
.setOrdinalPosition(1)
.setDataType("boolean")
.setDecimalDigits(0)
.setNullable(true)
.setColumnComment("")
.build(),
new StarRocksColumn.Builder()
.setColumnName("c3")
.setOrdinalPosition(2)
.setDataType("date")
.setNullable(true)
.setColumnComment("")
.build(),
new StarRocksColumn.Builder()
.setColumnName("c1")
.setOrdinalPosition(3)
.setDataType("double")
.setColumnSize(15)
.setDecimalDigits(15)
.setNullable(true)
.setColumnComment("")
.build()
);

assertEquals(expectedColumns, newTable.getColumns());
}
}