Flink: use correct metric config for position deletes #6313
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ | |
| import org.apache.iceberg.PartitionSpec; | ||
| import org.apache.iceberg.Schema; | ||
| import org.apache.iceberg.StructLike; | ||
| import org.apache.iceberg.Table; | ||
| import org.apache.iceberg.avro.Avro; | ||
| import org.apache.iceberg.deletes.EqualityDeleteWriter; | ||
| import org.apache.iceberg.deletes.PositionDeleteWriter; | ||
|
|
@@ -55,13 +56,14 @@ public class FlinkAppenderFactory implements FileAppenderFactory<RowData>, Seria | |
| private final int[] equalityFieldIds; | ||
| private final Schema eqDeleteRowSchema; | ||
| private final Schema posDeleteRowSchema; | ||
| private final Table table; | ||
|
|
||
| private RowType eqDeleteFlinkSchema = null; | ||
| private RowType posDeleteFlinkSchema = null; | ||
|
|
||
| public FlinkAppenderFactory( | ||
| Schema schema, RowType flinkSchema, Map<String, String> props, PartitionSpec spec) { | ||
| this(null, schema, flinkSchema, props, spec, null, null, null); | ||
| } | ||
|
|
||
| public FlinkAppenderFactory( | ||
|
|
@@ -72,6 +74,27 @@ public FlinkAppenderFactory( | |
| int[] equalityFieldIds, | ||
| Schema eqDeleteRowSchema, | ||
| Schema posDeleteRowSchema) { | ||
| this( | ||
| null, | ||
| schema, | ||
| flinkSchema, | ||
| props, | ||
| spec, | ||
| equalityFieldIds, | ||
| eqDeleteRowSchema, | ||
| posDeleteRowSchema); | ||
| } | ||
|
|
||
| public FlinkAppenderFactory( | ||
| Table table, | ||
| Schema schema, | ||
| RowType flinkSchema, | ||
| Map<String, String> props, | ||
| PartitionSpec spec, | ||
| int[] equalityFieldIds, | ||
| Schema eqDeleteRowSchema, | ||
| Schema posDeleteRowSchema) { | ||
| this.table = table; | ||
| this.schema = schema; | ||
| this.flinkSchema = flinkSchema; | ||
| this.props = props; | ||
|
|
@@ -99,7 +122,8 @@ private RowType lazyPosDeleteFlinkSchema() { | |
|
|
||
| @Override | ||
| public FileAppender<RowData> newAppender(OutputFile outputFile, FileFormat format) { | ||
| MetricsConfig metricsConfig = | ||
| table != null ? MetricsConfig.forTable(table) : MetricsConfig.fromProperties(props); | ||
|
||
| try { | ||
| switch (format) { | ||
| case AVRO: | ||
|
|
@@ -160,7 +184,8 @@ public EqualityDeleteWriter<RowData> newEqDeleteWriter( | |
| eqDeleteRowSchema, | ||
| "Equality delete row schema shouldn't be null when creating equality-delete writer"); | ||
|
|
||
| MetricsConfig metricsConfig = | ||
| table != null ? MetricsConfig.forTable(table) : MetricsConfig.fromProperties(props); | ||
| try { | ||
| switch (format) { | ||
| case AVRO: | ||
|
|
@@ -216,7 +241,8 @@ public EqualityDeleteWriter<RowData> newEqDeleteWriter( | |
| @Override | ||
| public PositionDeleteWriter<RowData> newPosDeleteWriter( | ||
| EncryptedOutputFile outputFile, FileFormat format, StructLike partition) { | ||
| MetricsConfig metricsConfig = | ||
| table != null ? MetricsConfig.forTable(table) : MetricsConfig.fromProperties(props); | ||
|
||
| try { | ||
| switch (format) { | ||
| case AVRO: | ||
|
|
||
This file contains hidden or 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
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.
The data row in equality delete should share the same metrics config as the table, so I change this as well.
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.
this actually makes a stronger case that we should pass in a valid
Tableobject to theFlinkAppenderFactoryas I mentioned in the other comment. we should also useforTablefor position delete although it doesn't need schema or SortOrder as you said.