Skip to content

Commit ab8a196

Browse files
j1wonparkxxubai
andauthored
[AMORO-4153]: Drop mixed Flink 1.17 support (#4154)
* Drop mixed Flink 1.17 support Flink 1.17 support is removed to enable upgrading Iceberg from 1.6.x to 1.7.x, as Iceberg 1.7.0 dropped the iceberg-flink-1.17 artifact. After this change, only Flink 1.18 is supported for mixed format. - Remove v1.17 module directory (amoro-mixed-flink-1.17, amoro-mixed-flink-runtime-1.17) - Remove v1.17 module entries from parent pom.xml - Update all documentation references from Flink 1.17 to 1.18 - Update Iceberg source reference in MixedCatalog.java * Update AMORO_VERSION to 0.9.0-incubating in flink-get-started.md Signed-off-by: Jiwon Park <jpark92@outlook.kr> Co-authored-by: Xu Bai <tocreationbai@gmail.com>
1 parent 958e209 commit ab8a196

13 files changed

Lines changed: 19 additions & 351 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Amoro support multiple processing engines for Mixed format as below:
8282

8383
| Processing Engine | Version | Batch Read | Batch Write | Batch Overwrite | Streaming Read | Streaming Write | Create Table | Alter Table |
8484
|-------------------|------------------------|-------------|-------------|-----------------|----------------|-----------------|--------------|-------------|
85-
| Flink | 1.17.x, 1.18.x, 1.19.x | &#x2714; | &#x2714; | &#x2716; | &#x2714; | &#x2714; | &#x2714; | &#x2716; |
85+
| Flink | 1.18.x, 1.19.x | &#x2714; | &#x2714; | &#x2716; | &#x2714; | &#x2714; | &#x2714; | &#x2716; |
8686
| Spark | 3.3, 3.4, 3.5 | &#x2714; | &#x2714; | &#x2714; | &#x2716; | &#x2716; | &#x2714; | &#x2714; |
8787
| Hive | 2.x, 3.x | &#x2714; | &#x2716; | &#x2714; | &#x2716; | &#x2716; | &#x2716; | &#x2714; |
8888
| Trino | 406 | &#x2714; | &#x2716; | &#x2714; | &#x2716; | &#x2716; | &#x2716; | &#x2714; |

amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/src/main/java/org/apache/amoro/flink/catalog/MixedCatalog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ private void validateColumnOrder(CatalogBaseTable table) {
665665

666666
/**
667667
* copy from
668-
* https://github.com/apache/iceberg/blob/1.6.x/flink/v1.17/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java#L425-L448
668+
* https://github.com/apache/iceberg/blob/1.6.x/flink/v1.18/flink/src/main/java/org/apache/iceberg/flink/FlinkCatalog.java#L425-L448
669669
*
670670
* @param ct1 CatalogTable before
671671
* @param ct2 CatalogTable after

amoro-format-mixed/amoro-mixed-flink/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
<module>amoro-mixed-flink-common</module>
3737
<module>amoro-mixed-flink-common-format</module>
3838
<module>amoro-mixed-flink-common-iceberg-bridge</module>
39-
<module>v1.17/amoro-mixed-flink-1.17</module>
40-
<module>v1.17/amoro-mixed-flink-runtime-1.17</module>
4139
<module>v1.18/amoro-mixed-flink-1.18</module>
4240
<module>v1.18/amoro-mixed-flink-runtime-1.18</module>
4341
<module>v1.19/amoro-mixed-flink-1.19</module>

amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-1.17/pom.xml

Lines changed: 0 additions & 99 deletions
This file was deleted.

amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-runtime-1.17/pom.xml

Lines changed: 0 additions & 229 deletions
This file was deleted.

docs/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Amoro support multiple processing engines for Mixed format as below:
6969

7070
| Processing Engine | Version | Batch Read | Batch Write | Batch Overwrite | Streaming Read | Streaming Write | Create Table | Alter Table |
7171
|-------------------|------------------------|-------------|-------------|-----------------|----------------|-----------------|--------------|-------------|
72-
| Flink | 1.17.x, 1.18.x, 1.19.x | &#x2714; | &#x2714; | &#x2716; | &#x2714; | &#x2714; | &#x2714; | &#x2716; |
72+
| Flink | 1.18.x, 1.19.x | &#x2714; | &#x2714; | &#x2716; | &#x2714; | &#x2714; | &#x2714; | &#x2716; |
7373
| Spark | 3.3, 3.4, 3.5 | &#x2714; | &#x2714; | &#x2714; | &#x2716; | &#x2716; | &#x2714; | &#x2714; |
7474
| Hive | 2.x, 3.x | &#x2714; | &#x2716; | &#x2714; | &#x2716; | &#x2716; | &#x2716; | &#x2714; |
7575
| Trino | 406 | &#x2714; | &#x2716; | &#x2714; | &#x2716; | &#x2716; | &#x2716; | &#x2714; |

docs/admin-guides/deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ $ cd dist/target/
5353
$ ls
5454
amoro-x.y.z-bin.zip # AMS release package
5555

56-
$ cd ${base_dir}/amoro-format-mixed/amoro-mixed-flink/v1.17/amoro-mixed-flink-runtime-1.17/target
56+
$ cd ${base_dir}/amoro-format-mixed/amoro-mixed-flink/v1.18/amoro-mixed-flink-runtime-1.18/target
5757
$ ls
58-
amoro-format-mixed-flink-runtime-1.17-x.y.z.jar # Flink 1.17 runtime package
58+
amoro-format-mixed-flink-runtime-1.18-x.y.z.jar # Flink 1.18 runtime package
5959

6060
$ cd ${base_dir}/amoro-format-mixed/amoro-mixed-spark/v3.3/amoro-mixed-spark-runtime-3.3/target
6161
$ ls

0 commit comments

Comments
 (0)