Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ limitations under the License.
<artifactId>flink-cdc-pipeline-connector-paimon</artifactId>

<properties>
<paimon.version>1.3.1</paimon.version>
<paimon.version>1.4.1</paimon.version>
<hadoop.version>2.8.5</hadoop.version>
<hive.version>2.3.9</hive.version>
<mockito.version>3.12.4</mockito.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ public void prepareSnapshotPreBarrier(long checkpointId) {
multiTableCommittable.getDatabase(),
multiTableCommittable.getTable(),
checkpointId,
multiTableCommittable.kind(),
multiTableCommittable.wrappedCommittable()));
multiTableCommittable.commitMessage()));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ private TableWriteImpl<?> newTableWrite(FileStoreTable table) {
if (memoryPoolFactory != null) {
return tableWrite.withMemoryPoolFactory(memoryPoolFactory);
} else {
return (TableWriteImpl<?>)
tableWrite.withMemoryPool(
return tableWrite.withMemoryPoolFactory(
new MemoryPoolFactory(
memoryPool != null
? memoryPool
: new HeapMemorySegmentPool(
table.coreOptions().writeBufferSize(),
table.coreOptions().pageSize()));
table.coreOptions().pageSize())));
}
}

Expand All @@ -159,11 +159,6 @@ public SinkRecord write(InternalRow internalRow, int i) throws Exception {
return write.writeAndReturn(internalRow, i);
}

@Override
public SinkRecord toLogRecord(SinkRecord record) {
return write.toLogRecord(record);
}

@Override
public void compact(BinaryRow partition, int bucket, boolean fullCompaction) throws Exception {
write.compact(partition, bucket, fullCompaction);
Expand Down Expand Up @@ -191,8 +186,7 @@ public List<Committable> prepareCommit(boolean waitCompaction, long checkpointId
try {
for (CommitMessage committable :
write.prepareCommit(this.waitCompaction || waitCompaction, checkpointId)) {
committables.add(
new Committable(checkpointId, Committable.Kind.FILE, committable));
committables.add(new Committable(checkpointId, committable));
}
} catch (Exception e) {
throw new IOException(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,7 @@ private MultiTableCommittable correctCheckpointId(MultiTableCommittable committa
committable.getDatabase(),
committable.getTable(),
checkpointId++,
committable.kind(),
committable.wrappedCommittable());
committable.commitMessage());
}

private static class MockCommitRequestImpl<CommT> extends CommitRequestImpl<CommT> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ void testChannel() {
computer.setup(4);
List<MultiTableCommittable> commits =
Arrays.asList(
new MultiTableCommittable("database", "table1", 1L, null, null),
new MultiTableCommittable("database", "table2", 1L, null, null),
new MultiTableCommittable("database", "table1", 1L, null, null),
new MultiTableCommittable("database", "table5", 1L, null, null),
new MultiTableCommittable("database", "table3", 1L, null, null),
new MultiTableCommittable("database", "table8", 1L, null, null),
new MultiTableCommittable("database", "table5", 1L, null, null),
new MultiTableCommittable("database", "table1", 1L, null, null),
new MultiTableCommittable("database", "table9", 1L, null, null),
new MultiTableCommittable("database", "table5", 1L, null, null),
new MultiTableCommittable("database", "table3", 1L, null, null),
new MultiTableCommittable("database", "table8", 1L, null, null));
new MultiTableCommittable("database", "table1", 1L, null),
new MultiTableCommittable("database", "table2", 1L, null),
new MultiTableCommittable("database", "table1", 1L, null),
new MultiTableCommittable("database", "table5", 1L, null),
new MultiTableCommittable("database", "table3", 1L, null),
new MultiTableCommittable("database", "table8", 1L, null),
new MultiTableCommittable("database", "table5", 1L, null),
new MultiTableCommittable("database", "table1", 1L, null),
new MultiTableCommittable("database", "table9", 1L, null),
new MultiTableCommittable("database", "table5", 1L, null),
new MultiTableCommittable("database", "table3", 1L, null),
new MultiTableCommittable("database", "table8", 1L, null));
Map<Integer, Set<String>> map = new HashMap<>();
commits.forEach(
(commit) -> {
Expand Down
2 changes: 1 addition & 1 deletion flink-cdc-e2e-tests/flink-cdc-pipeline-e2e-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ limitations under the License.
<flink-major-1.20>1.20</flink-major-1.20>
<mysql.driver.version>8.0.27</mysql.driver.version>
<starrocks.connector.version>1.2.14_flink-${flink-major-1.20}</starrocks.connector.version>
<paimon.version>1.3.1</paimon.version>
<paimon.version>1.4.1</paimon.version>
<flink.release.download.skip>false</flink.release.download.skip>
<flink.release.name>flink-${flink.version}-bin-scala_${scala.binary.version}.tgz</flink.release.name>
<flink.release.mirror>https://dlcdn.apache.org/flink/flink-${flink.version}</flink.release.mirror>
Expand Down
Loading