Skip to content

[FLINK-38491][pipeline-connector][iceberg] fixed iceberg compaction parallelism #4150

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

[FLINK-38491][pipeline-connector][iceberg] fixed iceberg compaction parallelism #4150

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ...rg/src/main/java/org/apache/flink/cdc/connectors/iceberg/sink/IcebergDataSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public Set<ConfigOption<?>> optionalOptions() {
options.add(IcebergDataSinkOptions.PARTITION_KEY);
options.add(IcebergDataSinkOptions.SINK_COMPACTION_ENABLED);
options.add(IcebergDataSinkOptions.SINK_COMPACTION_COMMIT_INTERVAL);
options.add(IcebergDataSinkOptions.SINK_COMPACTION_PARALLELISM);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we're lacking a test case to cover all supported options in IcebergDataSinkFactoryTest. Would you like to add one?

return options;
}
}
6 changes: 5 additions & 1 deletion ...or-iceberg/src/main/java/org/apache/flink/cdc/connectors/iceberg/sink/v2/IcebergSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public SimpleVersionedSerializer<WriteResultWrapper> getWriteResultSerializer()
return new WriteResultWrapperSerializer();
}

public int partitionCustom(int bucket, int numPartitions) {
return Math.floorMod(bucket, numPartitions);
}

@Override
public void addPostCommitTopology(
DataStream<CommittableMessage<WriteResultWrapper>> committableMessageDataStream) {
Expand All @@ -136,7 +140,7 @@ public void addPostCommitTopology(
// Shuffle by different table id.
DataStream<CommittableMessage<WriteResultWrapper>> keyedStream =
committableMessageDataStream.partitionCustom(
(bucket, numPartitions) -> bucket % numPartitions,
this::partitionCustom,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just write Math::floorMod here?

(committableMessage) -> {
if (committableMessage instanceof CommittableWithLineage) {
WriteResultWrapper multiTableCommittable =
Expand Down
8 changes: 8 additions & 0 deletions ...berg/src/test/java/org/apache/flink/cdc/connectors/iceberg/sink/v2/IcebergSinkITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,12 @@ private List<String> fetchTableContent(Catalog catalog, TableId tableId) {
}
return results;
}

@Test
public void testPartitionCustom() {
IcebergSink icebergSink =
new IcebergSink(new HashMap<>(), null, null, CompactionOptions.builder().build());
Assertions.assertThat(icebergSink.partitionCustom(-5, 4)).isEqualTo(3);
Assertions.assertThat(icebergSink.partitionCustom(5, 4)).isEqualTo(1);
}
}
Loading