Skip to content

[hotfix] Remove duplicated code to improve performance #3840

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
leonardBang merged 2 commits into from
Jan 8, 2025
Merged

[hotfix] Remove duplicated code to improve performance #3840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e5852d
[hotfix] Remove duplicated code to improve performance
ChaomingZhangCN Jan 8, 2025
10b1ef5
Add CheckReturnValue annotation
ChaomingZhangCN Jan 8, 2025
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
6 changes: 6 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 @@ -37,6 +37,7 @@
import org.apache.flink.cdc.common.types.TimestampType;
import org.apache.flink.cdc.common.types.ZonedTimestampType;

import javax.annotation.CheckReturnValue;
import javax.annotation.Nullable;

import java.util.ArrayList;
Expand All @@ -56,6 +57,7 @@ public class SchemaUtils {
* create a list of {@link RecordData.FieldGetter} from given {@link Schema} to get Object from
* RecordData.
*/
@CheckReturnValue
public static List<RecordData.FieldGetter> createFieldGetters(Schema schema) {
return createFieldGetters(schema.getColumns());
}
Expand All @@ -64,6 +66,7 @@ public static List<RecordData.FieldGetter> createFieldGetters(Schema schema) {
* create a list of {@link RecordData.FieldGetter} from given {@link Column} to get Object from
* RecordData.
*/
@CheckReturnValue
public static List<RecordData.FieldGetter> createFieldGetters(List<Column> columns) {
List<RecordData.FieldGetter> fieldGetters = new ArrayList<>(columns.size());
for (int i = 0; i < columns.size(); i++) {
Expand All @@ -73,6 +76,7 @@ public static List<RecordData.FieldGetter> createFieldGetters(List<Column> colum
}

/** Restore original data fields from RecordData structure. */
@CheckReturnValue
public static List<Object> restoreOriginalData(
@Nullable RecordData recordData, List<RecordData.FieldGetter> fieldGetters) {
if (recordData == null) {
Expand All @@ -86,6 +90,7 @@ public static List<Object> restoreOriginalData(
}

/** apply SchemaChangeEvent to the old schema and return the schema after changing. */
@CheckReturnValue
public static Schema applySchemaChangeEvent(Schema schema, SchemaChangeEvent event) {
return SchemaChangeEventVisitor.visit(
event,
Expand Down Expand Up @@ -210,6 +215,7 @@ private static Schema applyAlterColumnTypeEvent(AlterColumnTypeEvent event, Sche
* position indicators. This is necessary since extra calculated columns might be added, and
* `FIRST` / `LAST` position might differ.
*/
@CheckReturnValue
public static Optional<SchemaChangeEvent> transformSchemaChangeEvent(
boolean hasAsterisk, List<String> referencedColumns, SchemaChangeEvent event) {
Optional<SchemaChangeEvent> evolvedSchemaChangeEvent = Optional.empty();
Expand Down
1 change: 0 additions & 1 deletion ...e/src/main/java/org/apache/flink/cdc/runtime/operators/schema/common/SchemaDerivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ public Optional<DataChangeEvent> coerceDataRecord(

List<RecordData.FieldGetter> upstreamSchemaReader =
upstreamRecordGetterCache.getUnchecked(upstreamSchema);
SchemaUtils.createFieldGetters(upstreamSchema);
BinaryRecordDataGenerator evolvedSchemaWriter =
evolvedRecordWriterCache.getUnchecked(evolvedSchema);

Expand Down
Loading