Skip to content

Flink: Upgrade to latest supported Flink versions 2.2 and 2.3 without dropping 2.1 - #17849

Merged
pvary merged 5 commits into
apache:mainfrom
talatuyarer:flink-2.2-2.3
Aug 28, 2026
Merged

pvary merged 5 commits into
apache:mainfrom
talatuyarer:flink-2.2-2.3

Conversation

@talatuyarer

Copy link
Copy Markdown
Contributor

This adds support for Flink 2.2 and 2.3 and removes support for Flink 2.0 as per mailing list discussions:

https://lists.apache.org/thread/r7o3k5l6cv0sd0k5d1tg0s5mjkv9d21g

Consequently, the supported Flink versions are now 1.20, 2.1, 2.2, 2.3 (was: 1.20, 2.0, 2.1).

@uros-b uros-b left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is this related to #17845?

@pvary
pvary merged commit f80a72f into apache:main Aug 28, 2026
43 of 44 checks passed
@pvary

pvary commented Aug 28, 2026

Copy link
Copy Markdown
Contributor

Merged to main.
Thanks @talatuyarer and @mxm for preparing the PR.

@mxm

mxm commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

This looks like a direct copy of the changes in #17845, minus one commit. That's ok but it should have been attributed in that case, e.g. using Co-authored-by.

@pvary

pvary commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

I'm not sure about the direct copy, as there were merge conflicts there, but Co-authored would have been nice anyways. That’s partly on me, as I could have added myself. Sorry for that! 😢

@talatuyarer

talatuyarer commented Aug 29, 2026 •

Copy link
Copy Markdown
Contributor Author

@mxm You are right, and I am sorry. 😢 My PR built heavily on your work in #17845 — the 2.2/2.3 upgrade changes came from your PR, and mine mainly adjusted things to keep 2.1 per the mailing list compromise. I should have added a Co-authored-by tag to credit you, and missing it was an oversight on my part, not an attempt to take credit for your work. Apologies again, and thank you for all the work you put into the Flink upgrade. 🙏

@mxm

mxm commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

No worries @talatuyarer. I know this wasn't your intention. Just something to keep in mind next time. Thanks for taking care to put customers first here by retaining support for Flink 2.1!

nickwu241 added a commit to Affirm/iceberg that referenced this pull request Sep 25, 2026
…-pick apache#18101) (#13)

* Flink: Preserve RowKind in DynamicIcebergSink's DataConverter

RowDataConverter.convert() rebuilt a row as new GenericRowData(fieldGetters.length)
whenever its schema didn't structurally match the target table's, which defaults
RowKind to INSERT and silently drops the source row's actual kind. A CDC
delete/UPDATE_BEFORE routed through this rebuild path was coerced into an INSERT.

Cherry-picked from apache#18101 (closes apache#18100).

* Flink: Backport RowKind-preservation fix to v1.20 and v2.0

v1.20/v2.1 are covered by apache#18196; v2.0 was never covered upstream
(the flink/v2.0 module was dropped from apache/iceberg main by apache#17849
before apache#18196 landed), so this is a manual port rather than a real cherry-pick.
@mxm

mxm commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

We made a mistake here by not moving the Flink 2.1 directory to the Flink 2.3 directory, but copying it instead. Consequently, we lost the commit history for the latest Flink version, because there is no link to the old directory anymore. This is unfortunate because the commit history very important for context. We should be more careful next time.

@pvary

pvary commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

Talked to @talatuyarer and he used move.
The issue is that the github UI mixed things up.
Likely we need to merge these changes manually from the CLI

@mxm

mxm commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

We did not use move here. The relevant commit 7bf39b7 only contains ADDs, no DELETEs. A proper move is a add + delete. We should have deleted Flink 2.1 in the same commit as adding Flink 2.3, then re-added Flink 2.1. We can still fix this though. I've opened #18323.

mxm added a commit that referenced this pull request Sep 30, 2026
The v2.3 directory was added as a copy of v2.1 in #17849, which unlinks the
history and makes commands like git blame unusable. This and the following
commits replace it with a move of v2.1, as done for previous Flink versions. The
final tree is unchanged.
@talatuyarer

Copy link
Copy Markdown
Contributor Author

Next time i will be more careful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants