Skip to content
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

[FLINK-36092] Fix schema evolution with wildcarded transform rules #3557

Merged
merged 5 commits into from
Aug 22, 2024
+2,411 −56
Merged

[FLINK-36092] Fix schema evolution with wildcarded transform rules #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8f4dfb
[FLINK-36092] Let schema evolve work with transform
yuxiqian Aug 19, 2024
22b64b2
fix ci, resolve conflicts
yuxiqian Aug 20, 2024
f328961
fix migration failure
yuxiqian Aug 20, 2024
d6f3a9a
Move `transformSchemaChangeEvent` to `SchemaUtils`
yuxiqian Aug 20, 2024
8d0708d
fix: test case since changed schema role has been changed
yuxiqian Aug 22, 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
71 changes: 71 additions & 0 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 @@ -40,7 +40,9 @@
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

Expand Down Expand Up @@ -348,4 +350,73 @@ private static Schema applyAlterColumnTypeEvent(AlterColumnTypeEvent event, Sche
});
return oldSchema.copy(columns);
}

public static Optional<SchemaChangeEvent> transformSchemaChangeEvent(
boolean hasAsterisk, List<String> referencedColumns, SchemaChangeEvent event) {
Optional<SchemaChangeEvent> evolvedSchemaChangeEvent = Optional.empty();
if (event instanceof AddColumnEvent) {
// Send add column events to downstream iff there's an asterisk
if (hasAsterisk) {
List<AddColumnEvent.ColumnWithPosition> addedColumns =
((AddColumnEvent) event)
.getAddedColumns().stream()
.map(
e -> {
if (AddColumnEvent.ColumnPosition.LAST.equals(
e.getPosition())) {
return new AddColumnEvent
.ColumnWithPosition(
e.getAddColumn(),
AddColumnEvent.ColumnPosition.AFTER,
referencedColumns.get(
referencedColumns.size()
- 1));
} else if (AddColumnEvent.ColumnPosition.FIRST
.equals(e.getPosition())) {
return new AddColumnEvent
.ColumnWithPosition(
e.getAddColumn(),
AddColumnEvent.ColumnPosition
.BEFORE,
referencedColumns.get(0));
} else {
return e;
}
})
.collect(Collectors.toList());
evolvedSchemaChangeEvent =
Optional.of(new AddColumnEvent(event.tableId(), addedColumns));
}
} else if (event instanceof AlterColumnTypeEvent) {
AlterColumnTypeEvent alterColumnTypeEvent = (AlterColumnTypeEvent) event;
if (hasAsterisk) {
// In wildcard mode, all alter column type events should be sent to downstream
evolvedSchemaChangeEvent = Optional.of(event);
} else {
// Or, we need to filter out those referenced columns and reconstruct
// SchemaChangeEvents
Map<String, DataType> newDataTypeMap =
alterColumnTypeEvent.getTypeMapping().entrySet().stream()
.filter(e -> referencedColumns.contains(e.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
if (!newDataTypeMap.isEmpty()) {
evolvedSchemaChangeEvent =
Optional.of(
new AlterColumnTypeEvent(
alterColumnTypeEvent.tableId(), newDataTypeMap));
}
}
} else if (event instanceof RenameColumnEvent) {
if (hasAsterisk) {
evolvedSchemaChangeEvent = Optional.of(event);
}
} else if (event instanceof DropColumnEvent) {
if (hasAsterisk) {
evolvedSchemaChangeEvent = Optional.of(event);
}
} else {
evolvedSchemaChangeEvent = Optional.of(event);
}
return evolvedSchemaChangeEvent;
}
}
8 changes: 4 additions & 4 deletions ...mposer/src/test/java/org/apache/flink/cdc/composer/flink/FlinkPipelineComposerITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ void testTransform(ValuesDataSink.SinkApi sinkApi) throws Exception {
"CreateTableEvent{tableId=default_namespace.default_schema.table1, schema=columns={`col1` STRING,`col2` STRING,`col12` STRING}, primaryKeys=col1, partitionKeys=col12, options=({key1=value1})}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[1, 1, 10], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[2, 2, 20], op=INSERT, meta=()}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=LAST, existedColumnName=null}]}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=AFTER, existedColumnName=col2}]}",
"RenameColumnEvent{tableId=default_namespace.default_schema.table1, nameMapping={col2=newCol2, col3=newCol3}}",
"DropColumnEvent{tableId=default_namespace.default_schema.table1, droppedColumnNames=[newCol2]}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[1, 1, 10], after=[], op=DELETE, meta=()}",
Expand Down Expand Up @@ -393,7 +393,7 @@ void testOpTypeMetadataColumn(ValuesDataSink.SinkApi sinkApi) throws Exception {
"CreateTableEvent{tableId=default_namespace.default_schema.table1, schema=columns={`col1` STRING,`col2` STRING,`col12` STRING,`rk` STRING}, primaryKeys=col1, partitionKeys=col12, options=({key1=value1})}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[1, 1, 10, +I], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[2, 2, 20, +I], op=INSERT, meta=()}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=LAST, existedColumnName=null}]}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=AFTER, existedColumnName=col2}]}",
"RenameColumnEvent{tableId=default_namespace.default_schema.table1, nameMapping={col2=newCol2, col3=newCol3}}",
"DropColumnEvent{tableId=default_namespace.default_schema.table1, droppedColumnNames=[newCol2]}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[1, 1, 10, -D], after=[], op=DELETE, meta=()}",
Expand Down Expand Up @@ -461,7 +461,7 @@ void testTransformTwice(ValuesDataSink.SinkApi sinkApi) throws Exception {
"CreateTableEvent{tableId=default_namespace.default_schema.table1, schema=columns={`col1` STRING,`col2` STRING,`col12` STRING}, primaryKeys=col1, partitionKeys=col12, options=({key1=value1})}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[1, 1, 11], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[], after=[2, 2, 22], op=INSERT, meta=()}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=LAST, existedColumnName=null}]}",
"AddColumnEvent{tableId=default_namespace.default_schema.table1, addedColumns=[ColumnWithPosition{column=`col3` STRING, position=AFTER, existedColumnName=col2}]}",
"RenameColumnEvent{tableId=default_namespace.default_schema.table1, nameMapping={col2=newCol2, col3=newCol3}}",
"DropColumnEvent{tableId=default_namespace.default_schema.table1, droppedColumnNames=[newCol2]}",
"DataChangeEvent{tableId=default_namespace.default_schema.table1, before=[1, 1, 11], after=[], op=DELETE, meta=()}",
Expand Down Expand Up @@ -1010,7 +1010,7 @@ void testTransformMergingWithRoute() throws Exception {
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[4, Donald, 25, last_name, student], after=[], op=DELETE, meta=()}",
"AddColumnEvent{tableId=default_namespace.default_schema.merged, addedColumns=[ColumnWithPosition{column=`gender` STRING, position=LAST, existedColumnName=null}]}",
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[], after=[5, Eliza, 24, last_name, null, null], op=INSERT, meta=()}",
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[], after=[6, Frank, 30, male, student, last_name], op=INSERT, meta=()}");
"DataChangeEvent{tableId=default_namespace.default_schema.merged, before=[], after=[6, Frank, 30, last_name, student, male], op=INSERT, meta=()}");
}

@ParameterizedTest
Expand Down
Loading
Loading