Skip to content

[FLINK-36541][pipeline-connector][paimon] pass checkpointId to StoreSinkWrite#prepareCommit correctly. #3652

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
Nov 12, 2024
Merged

[FLINK-36541][pipeline-connector][paimon] pass checkpointId to StoreSinkWrite#prepareCommit correctly. #3652

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
356d099
[FLINK-36541][pipeline-connector][paimon] pass checkpointId to StoreS…
lvyanquan Nov 7, 2024
4763906
add test.
lvyanquan Nov 7, 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
7 changes: 6 additions & 1 deletion ...ector-paimon/src/main/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.flink.api.connector.sink2.Committer;
import org.apache.flink.api.connector.sink2.Sink;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.runtime.checkpoint.CheckpointIDCounter;
import org.apache.flink.streaming.api.connector.sink2.CommittableMessage;
import org.apache.flink.streaming.api.connector.sink2.CommittableMessageTypeInfo;
import org.apache.flink.streaming.api.connector.sink2.WithPreCommitTopology;
Expand Down Expand Up @@ -61,7 +62,11 @@ public PaimonSink(

@Override
public PaimonWriter<InputT> createWriter(InitContext context) {
return new PaimonWriter<>(catalogOptions, context.metricGroup(), commitUser, serializer);
long lastCheckpointId =
context.getRestoredCheckpointId()
.orElse(CheckpointIDCounter.INITIAL_CHECKPOINT_ID - 1);
return new PaimonWriter<>(
catalogOptions, context.metricGroup(), commitUser, serializer, lastCheckpointId);
}

@Override
Expand Down
22 changes: 18 additions & 4 deletions ...tor-paimon/src/main/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.flink.metrics.MetricGroup;
import org.apache.flink.runtime.io.disk.iomanager.IOManager;
import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync;
import org.apache.flink.streaming.api.operators.StreamOperator;

import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.catalog.Identifier;
Expand Down Expand Up @@ -68,11 +69,15 @@ public class PaimonWriter<InputT>
private final MetricGroup metricGroup;
private final List<MultiTableCommittable> committables;

/** A workaround variable trace the checkpointId in {@link StreamOperator#snapshotState}. */
private long lastCheckpointId;

public PaimonWriter(
Options catalogOptions,
MetricGroup metricGroup,
String commitUser,
PaimonRecordSerializer<InputT> serializer) {
PaimonRecordSerializer<InputT> serializer,
long lastCheckpointId) {
catalog = FlinkCatalogFactory.createPaimonCatalog(catalogOptions);
this.metricGroup = metricGroup;
this.commitUser = commitUser;
Expand All @@ -85,12 +90,14 @@ public PaimonWriter(
new ExecutorThreadFactory(
Thread.currentThread().getName() + "-CdcMultiWrite-Compaction"));
this.serializer = serializer;
this.lastCheckpointId = lastCheckpointId;
}

@Override
public Collection<MultiTableCommittable> prepareCommit() {
Collection<MultiTableCommittable> allCommittables = new ArrayList<>(committables);
committables.clear();
lastCheckpointId++;
return allCommittables;
}

Expand Down Expand Up @@ -156,6 +163,9 @@ private FileStoreTable getTable(Identifier tableId) {
* Called on checkpoint or end of input so that the writer to flush all pending data for
* at-least-once.
*
* <p>Execution order: flush(boolean endOfInput)=>prepareCommit()=>snapshotState(long
* checkpointId).
*
* <p>this method will also be called when receiving {@link FlushEvent}, but we don't need to
* commit the MultiTableCommittables immediately in this case, because {@link PaimonCommitter}
* support committing data of different schemas.
Expand All @@ -166,10 +176,14 @@ public void flush(boolean endOfInput) throws IOException {
Identifier key = entry.getKey();
StoreSinkWrite write = entry.getValue();
boolean waitCompaction = false;
// checkpointId will be updated correctly by PreCommitOperator.
long checkpointId = 1L;
committables.addAll(
write.prepareCommit(waitCompaction, checkpointId).stream()
// here we set it to lastCheckpointId+1 to
// avoid prepareCommit the same checkpointId with the first round.
// One thing to note is that during schema evolution, flush and checkpoint are
// consistent,
// but as long as there is data coming in, it will not trigger any conflict
// issues
write.prepareCommit(waitCompaction, lastCheckpointId + 1).stream()
.map(
committable ->
MultiTableCommittable.fromCommittable(key, committable))
Expand Down
13 changes: 13 additions & 0 deletions ...paimon/src/test/java/org/apache/flink/cdc/connectors/paimon/sink/v2/PaimonSinkITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,19 @@ public void testSinkWithDataChange(String metastore)
.forEachRemaining(result::add);
Assertions.assertEquals(
Collections.singletonList(Row.ofKind(RowKind.INSERT, "2", "x")), result);

result = new ArrayList<>();
tEnv.sqlQuery("select max_sequence_number from paimon_catalog.test.`table1$files`")
.execute()
.collect()
.forEachRemaining(result::add);
// Each commit will generate one sequence number(equal to checkpointId).
Assertions.assertEquals(
Arrays.asList(
Row.ofKind(RowKind.INSERT, 1L),
Row.ofKind(RowKind.INSERT, 2L),
Row.ofKind(RowKind.INSERT, 3L)),
result);
}

@ParameterizedTest
Expand Down