Skip to content

[FLINK-39354] Fix case-insensitive existing-column lookup in SchemaUtils.applyAddColumnEvent #4355

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
llmiao wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −6
Open

[FLINK-39354] Fix case-insensitive existing-column lookup in SchemaUtils.applyAddColumnEvent #4355

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
24 changes: 18 additions & 6 deletions flink-cdc-common/src/main/java/org/apache/flink/cdc/common/utils/SchemaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ private static Schema applyAddColumnEvent(AddColumnEvent event, Schema oldSchema
Preconditions.checkNotNull(
columnWithPosition.getExistedColumnName(),
"existedColumnName could not be null in BEFORE type AddColumnEvent");
List<String> columnNames =
columns.stream().map(Column::getName).collect(Collectors.toList());
int index = columnNames.indexOf(columnWithPosition.getExistedColumnName());
int index =
findColumnIndex(columns, columnWithPosition.getExistedColumnName());
if (index < 0) {
throw new IllegalArgumentException(
String.format(
Expand All @@ -156,9 +155,8 @@ private static Schema applyAddColumnEvent(AddColumnEvent event, Schema oldSchema
Preconditions.checkNotNull(
columnWithPosition.getExistedColumnName(),
"existedColumnName could not be null in AFTER type AddColumnEvent");
List<String> columnNames =
columns.stream().map(Column::getName).collect(Collectors.toList());
int index = columnNames.indexOf(columnWithPosition.getExistedColumnName());
int index =
findColumnIndex(columns, columnWithPosition.getExistedColumnName());
if (index < 0) {
throw new IllegalArgumentException(
String.format(
Expand All @@ -174,6 +172,20 @@ private static Schema applyAddColumnEvent(AddColumnEvent event, Schema oldSchema
return oldSchema.copy(columns);
}

private static int findColumnIndex(List<Column> columns, String existedColumnName) {
for (int i = 0; i < columns.size(); i++) {
if (columns.get(i).getName().equals(existedColumnName)) {
return i;
}
}
for (int i = 0; i < columns.size(); i++) {
if (columns.get(i).getName().equalsIgnoreCase(existedColumnName)) {
return i;
}
}
return -1;
}

private static Schema applyDropColumnEvent(DropColumnEvent event, Schema oldSchema) {
List<Column> columns =
oldSchema.getColumns().stream()
Expand Down
23 changes: 23 additions & 0 deletions flink-cdc-common/src/test/java/org/apache/flink/cdc/common/utils/SchemaUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,29 @@ void testApplyColumnSchemaChangeEvent() {
.build());
}

@Test
void testApplyAddColumnEventWithCaseInsensitiveExistingColumnName() {
TableId tableId = TableId.parse("gc_fps_receivable.billstat");
Schema schema =
Schema.newBuilder().physicalColumn("changetype", DataTypes.STRING()).build();

List<AddColumnEvent.ColumnWithPosition> addedColumns = new ArrayList<>();
addedColumns.add(
new AddColumnEvent.ColumnWithPosition(
Column.physicalColumn("origintypecode", DataTypes.STRING()),
AddColumnEvent.ColumnPosition.AFTER,
"ChangeType"));
AddColumnEvent addColumnEvent = new AddColumnEvent(tableId, addedColumns);

schema = SchemaUtils.applySchemaChangeEvent(schema, addColumnEvent);
Assertions.assertThat(schema)
.isEqualTo(
Schema.newBuilder()
.physicalColumn("changetype", DataTypes.STRING())
.physicalColumn("origintypecode", DataTypes.STRING())
.build());
}

@Test
void testGetNumericPrecision() {
Assertions.assertThat(SchemaUtils.getNumericPrecision(DataTypes.TINYINT())).isEqualTo(3);
Expand Down