Flink: Tests alignment for the Flink Sink v2-based implemenation (IcebergSink) #11219
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * | ||
| * * Licensed to the Apache Software Foundation (ASF) under one | ||
| * * or more contributor license agreements. See the NOTICE file | ||
| * * distributed with this work for additional information | ||
| * * regarding copyright ownership. The ASF licenses this file | ||
| * * to you under the Apache License, Version 2.0 (the | ||
| * * "License"); you may not use this file except in compliance | ||
| * * with the License. You may obtain a copy of the License at | ||
| * * | ||
| * * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * * | ||
| * * Unless required by applicable law or agreed to in writing, | ||
| * * software distributed under the License is distributed on an | ||
| * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * * KIND, either express or implied. See the License for the | ||
| * * specific language governing permissions and limitations | ||
| * * under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.iceberg.flink.sink; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.flink.configuration.ReadableConfig; | ||
| import org.apache.flink.streaming.api.datastream.DataStream; | ||
| import org.apache.flink.streaming.api.datastream.DataStreamSink; | ||
| import org.apache.flink.table.api.TableSchema; | ||
| import org.apache.flink.table.data.RowData; | ||
| import org.apache.flink.types.Row; | ||
| import org.apache.iceberg.DistributionMode; | ||
| import org.apache.iceberg.Table; | ||
| import org.apache.iceberg.flink.TableLoader; | ||
|
|
||
| public interface BaseIcebergSinkBuilder { | ||
|
|
||
| BaseIcebergSinkBuilder tableSchema(TableSchema newTableSchema); | ||
|
|
||
| BaseIcebergSinkBuilder tableLoader(TableLoader newTableLoader); | ||
|
|
||
| BaseIcebergSinkBuilder equalityFieldColumns(List<String> columns); | ||
|
|
||
| BaseIcebergSinkBuilder overwrite(boolean newOverwrite); | ||
|
|
||
| BaseIcebergSinkBuilder setAll(Map<String, String> properties); | ||
|
|
||
| BaseIcebergSinkBuilder flinkConf(ReadableConfig config); | ||
|
|
||
| BaseIcebergSinkBuilder table(Table newTable); | ||
|
|
||
| BaseIcebergSinkBuilder writeParallelism(int newWriteParallelism); | ||
|
|
||
| BaseIcebergSinkBuilder distributionMode(DistributionMode mode); | ||
|
|
||
| BaseIcebergSinkBuilder toBranch(String branch); | ||
|
|
||
| DataStreamSink<?> append(); | ||
|
|
||
| static BaseIcebergSinkBuilder forRow(DataStream<Row> input, TableSchema tableSchema, boolean useV2Sink) { | ||
| if (useV2Sink) { | ||
| return IcebergSink.forRow(input, tableSchema); | ||
| } else { | ||
| return FlinkSink.forRow(input, tableSchema); | ||
| } | ||
| } | ||
|
|
||
| static BaseIcebergSinkBuilder forRowData(DataStream<RowData> input, boolean useV2Sink) { | ||
| if (useV2Sink) { | ||
| return IcebergSink.forRowData(input); | ||
| } else { | ||
| return FlinkSink.forRowData(input); | ||
| } | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand where you are coming from, but we are planning to add features (table maintenance) to the new
IcebergSinkwhich will not be available to theFlinkSink.We also need to think about the deprecation and the eventual removal of the
FlinkSink.Maybe something like I propose for the
MaintenanceTaskBuildercould help: https://github.com/apache/iceberg/pull/11144/files#diff-1b7c33ba8eb300e4a1c92844418384756a07ba32882de39855c74c9a40778f48Or we could just move this class to the tests, and don't add this to the public API?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In my previous solution, it was also possible, because each Builder implementation overrode the return type of each method to the specific one, but your suggestion looks better - changed.
With regards to the visibility, in the referenced PR, we discussed that there is a plan to allow to use
IcebergSinkfor dynamic tables (IcebergTableSink:80). I thought about adding the property allowing to use this implementation there. Thanks to the common parent for builders, we could check the property value at the beginning of method and do rest of builder's chain on it. This would ensure that we keep these builder synchronized. I though about doing this in the next PR. WDYT?