Skip to content

Conversation

@vamossagar12
Copy link
Contributor

Purpose

Linked issue: close #2101

Brief change log

Adding support for Flunk 2.2

Tests

Added bunch of unit and Integration tests.

API and Format

No

Documentation

Adds support for Flink 2.2. If we need documentation for this, can add in a separate PR.

@vamossagar12
Copy link
Contributor Author

@leonardBang , I made the changes.

@loserwang1024
Copy link
Contributor

image @vamossagar12 , please format the code with `mvn spotless:apply`. We can also compile before commit with `mvn clean install -DskipTests`

@vamossagar12
Copy link
Contributor Author

Yes, sorry not finding the time. Will do this in the next coulpe of days.

@loserwang1024
Copy link
Contributor

loserwang1024 commented Dec 17, 2025

I also consider whether we need to move Flink21CatalogFactory to fluss-flink-common . Then flink 2.1 and 2.2 can share it. No need too much same code.

FlinkCatalogFactory

  • flink 1.18
  • flink 1.19
  • fink 1.20
  • flink 2.0

FlinkCatalogGreeterThan21Factory

  • fink 2.1
  • fink 2.2

flink below 2.0 won't use FlinkCatalogGreeterThan21Factory code. Thus no problem will occurs.

@vamossagar12 vamossagar12 force-pushed the fluss-2101 branch 2 times, most recently from b7f48ba to 4096401 Compare December 21, 2025 01:35
@vamossagar12
Copy link
Contributor Author

I also consider whether we need to move Flink21CatalogFactory to fluss-flink-common . Then flink 2.1 and 2.2 can share it. No need too much same code.

FlinkCatalogFactory

  • flink 1.18
  • flink 1.19
  • fink 1.20
  • flink 2.0

FlinkCatalogGreeterThan21Factory

  • fink 2.1
  • fink 2.2

flink below 2.0 won't use FlinkCatalogGreeterThan21Factory code. Thus no problem will occurs.

Thanks, I was thinking to do it in a subsequent PR. This PR also doesn't create an adapter layer for Flink 2.2,. we can adopt a similar approach for 2.1 in the common code. Let me know what you think.

@vamossagar12
Copy link
Contributor Author

There are some test failures, will take a look.

@loserwang1024
Copy link
Contributor

loserwang1024 commented Dec 23, 2025

@vamossagar12 I have add some adjusts to the code, you can add this to your commit.

  1. merge flink21Catalog and flink22Catalog to FlinkCatalog
  2. add flink-2.2 to ci tests of flink
  3. fix wrong test.
  4. add MultipleParameterToolAdapter to flink 2.2 so that tierservice can work.

1. merge flink21Catalog and flink22Catalog to FlinkCatalog.
2. add flink-2.2 to ci tests of flink
@loserwang1024
Copy link
Contributor

loserwang1024 commented Dec 23, 2025

image

Currently, flink test spends almost 45 minutes and flink-lake test spends almost 39 minutes. Should we delete a old module?

@wuchong @leonardBang , WDYT?

@leonardBang
Copy link
Contributor

Currently, flink test spends almost 45 minutes and flink-lake test spends almost 39 minutes. Should we delete a old module?

@wuchong @leonardBang , WDYT?

+1 to delete 2.1 module and add support for 2.2, Flink 2.0 and 2.1 are rarely used bye users from my observation, maybe they're not stable enough as Flink's new major version, Flink 2.2 should be more stable than them.

@wuchong
Copy link
Member

wuchong commented Dec 23, 2025

+1 to delete flink 2.1

We can do this just in this PR, making the support of Flink 2.2 as an upgrade from Flink 2.1 to Flink 2.2.

@vamossagar12
Copy link
Contributor Author

Ok, thanks for the chnages @loserwang1024 . LGTM !

@loserwang1024
Copy link
Contributor

@leonardBang @wuchong flink 2.1 has been upgraded to flink 2.2, please help review

Copy link
Member

@wuchong wuchong left a comment

Choose a reason for hiding this comment

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

Thanks @vamossagar12 and @loserwang1024 for this great work.

However, it seems Flink21MultipleParameterToolTest and Flink21MaterializedTableITCase are missed to move to Flink 2.2

@vamossagar12
Copy link
Contributor Author

Thanks @vamossagar12 and @loserwang1024 for this great work.

However, it seems Flink21MultipleParameterToolTest and Flink21MaterializedTableITCase are missed to move to Flink 2.2

Thanks for the review. I addressed the comments and added the 2 missing tests. PTAL.

Copy link
Member

@wuchong wuchong left a comment

Choose a reason for hiding this comment

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

LGTM.

I made another minor fix

@wuchong wuchong merged commit 684a43d into apache:main Dec 24, 2025
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support Flink 2.2 version

4 participants