Skip to content

[FLINK-39257] Remove compatibility code for older versions of Flink. #4317

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
yuxiqian merged 1 commit into from
Mar 17, 2026
Merged

[FLINK-39257] Remove compatibility code for older versions of Flink. #4317

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
46 changes: 6 additions & 40 deletions ...oser/src/main/java/org/apache/flink/cdc/composer/flink/translator/DataSinkTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.apache.flink.cdc.runtime.operators.sink.BatchDataSinkFunctionOperator;
import org.apache.flink.cdc.runtime.operators.sink.DataSinkFunctionOperator;
import org.apache.flink.cdc.runtime.operators.sink.DataSinkWriterOperatorFactory;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.runtime.jobgraph.OperatorID;
import org.apache.flink.streaming.api.connector.sink2.CommittableMessage;
import org.apache.flink.streaming.api.connector.sink2.CommittableMessageTypeInfo;
Expand All @@ -46,12 +45,10 @@
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.api.functions.sink.SinkFunction;
import org.apache.flink.streaming.api.operators.OneInputStreamOperatorFactory;
import org.apache.flink.streaming.api.operators.StreamSink;
import org.apache.flink.streaming.api.transformations.LegacySinkTransformation;
import org.apache.flink.streaming.api.transformations.PhysicalTransformation;

import java.lang.reflect.InvocationTargetException;
import org.apache.flink.streaming.runtime.operators.sink.CommitterOperatorFactory;

/** Translator used to build {@link DataSink} for given {@link DataStream}. */
@Internal
Expand Down Expand Up @@ -178,8 +175,10 @@ private <CommT> void addCommittingTopology(
boolean isBatchMode,
OperatorID schemaOperatorID,
OperatorUidGenerator operatorUidGenerator) {
TwoPhaseCommittingSink<Event, CommT> committingSink =
(TwoPhaseCommittingSink<Event, CommT>) sink;
TypeInformation<CommittableMessage<CommT>> typeInformation =
CommittableMessageTypeInfo.of(() -> getCommittableSerializer(sink));
CommittableMessageTypeInfo.of(committingSink::getCommittableSerializer);
DataStream<CommittableMessage<CommT>> written =
inputStream
.transform(
Expand All @@ -202,8 +201,8 @@ private <CommT> void addCommittingTopology(
.transform(
SINK_COMMITTER_PREFIX + sinkName,
typeInformation,
getCommitterOperatorFactory(
sink, isBatchMode, isCheckpointingEnabled))
new CommitterOperatorFactory<>(
committingSink, isBatchMode, isCheckpointingEnabled))
.uid(operatorUidGenerator.generateUid("sink-committer"));

if (sink instanceof WithPostCommitTopology) {
Expand All @@ -215,37 +214,4 @@ private String generateSinkName(SinkDef sinkDef) {
return sinkDef.getName()
.orElse(String.format("Flink CDC Event Sink: %s", sinkDef.getType()));
}

private static <CommT> SimpleVersionedSerializer<CommT> getCommittableSerializer(Object sink) {
// FIX ME: TwoPhaseCommittingSink has been deprecated, and its signature has changed
// during Flink 1.18 to 1.19. Remove this when Flink 1.18 is no longer supported.
try {
return (SimpleVersionedSerializer<CommT>)
sink.getClass().getDeclaredMethod("getCommittableSerializer").invoke(sink);
} catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException("Failed to get CommittableSerializer", e);
}
}

private static <CommT>
OneInputStreamOperatorFactory<CommittableMessage<CommT>, CommittableMessage<CommT>>
getCommitterOperatorFactory(
Sink<Event> sink, boolean isBatchMode, boolean isCheckpointingEnabled) {
// FIX ME: OneInputStreamOperatorFactory is an @Internal class, and its signature has
// changed during Flink 1.18 to 1.19. Remove this when Flink 1.18 is no longer supported.
try {
return (OneInputStreamOperatorFactory<
CommittableMessage<CommT>, CommittableMessage<CommT>>)
Class.forName(
"org.apache.flink.streaming.runtime.operators.sink.CommitterOperatorFactory")
.getDeclaredConstructors()[0]
.newInstance(sink, isBatchMode, isCheckpointingEnabled);

} catch (ClassNotFoundException
| InstantiationException
| IllegalAccessException
| InvocationTargetException e) {
throw new RuntimeException("Failed to create CommitterOperatorFactory", e);
}
}
}
Loading