This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 370b1abf5d [flink] Fix stability of Flink 2.0 test workflow (#5877)
370b1abf5d is described below
commit 370b1abf5d24c8dbbf3c4ccbaa770e1643f98107
Author: yunfengzhou-hub <[email protected]>
AuthorDate: Fri Jul 11 17:39:02 2025 +0800
[flink] Fix stability of Flink 2.0 test workflow (#5877)
---
.github/workflows/utitcase-flink-2.x-jdk11.yml | 62 ++++++++++++++++++++++
.../apache/paimon/flink/CatalogTableITCase.java | 2 +-
paimon-flink/paimon-flink1-common/pom.xml | 2 +-
paimon-flink/pom.xml | 2 +
pom.xml | 2 -
5 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/utitcase-flink-2.x-jdk11.yml
b/.github/workflows/utitcase-flink-2.x-jdk11.yml
new file mode 100644
index 0000000000..75999430b3
--- /dev/null
+++ b/.github/workflows/utitcase-flink-2.x-jdk11.yml
@@ -0,0 +1,62 @@
+################################################################################
+# 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.
+################################################################################
+
+name: UTCase and ITCase Flink 2.x on JDK 11
+
+on:
+ push:
+ pull_request:
+ paths-ignore:
+ - 'docs/**'
+ - '**/*.md'
+
+env:
+ JDK_VERSION: 11
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ timeout-minutes: 120
+
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v4
+ - name: Set up JDK ${{ env.JDK_VERSION }}
+ uses: actions/setup-java@v4
+ with:
+ java-version: ${{ env.JDK_VERSION }}
+ distribution: 'temurin'
+
+ - name: Build Flink
+ run: |
+ mvn -T 2C -B clean install -DskipTests -Pflink2,spark3
+
+ - name: Test Flink
+ run: |
+ # run tests with random timezone to find out timezone related bugs
+ . .github/workflows/utils.sh
+ jvm_timezone=$(random_timezone)
+ echo "JVM timezone is set to $jvm_timezone"
+ test_modules=""
+ for suffix in 2.0 common; do
+ test_modules+="org.apache.paimon:paimon-flink-${suffix},"
+ done
+ test_modules="${test_modules%,}"
+ mvn -T 2C -B test verify -Pflink2,spark3 -pl "${test_modules}"
-Duser.timezone=$jvm_timezone
+ env:
+ MAVEN_OPTS: -Xmx4096m
\ No newline at end of file
diff --git
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
index 46baaa3eef..989446c059 100644
---
a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
+++
b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/CatalogTableITCase.java
@@ -955,9 +955,9 @@ public class CatalogTableITCase extends CatalogITCaseBase {
BlockingIterator.of(
streamSqlIter(
"SELECT * FROM T /*+
OPTIONS('consumer-id'='my1','consumer.expiration-time'='3h') */"));
+ assertThat(iterator.collect(2)).containsExactlyInAnyOrder(Row.of(1,
2), Row.of(3, 4));
batchSql("INSERT INTO T VALUES (5, 6), (7, 8)");
- assertThat(iterator.collect(2)).containsExactlyInAnyOrder(Row.of(1,
2), Row.of(3, 4));
List<Row> result;
do {
diff --git a/paimon-flink/paimon-flink1-common/pom.xml
b/paimon-flink/paimon-flink1-common/pom.xml
index 9de6335935..ed92429654 100644
--- a/paimon-flink/paimon-flink1-common/pom.xml
+++ b/paimon-flink/paimon-flink1-common/pom.xml
@@ -33,7 +33,7 @@ under the License.
<name>Paimon : Flink 1.x : Common</name>
<properties>
- <flink.version>${paimon-flink-common.flink.version}</flink.version>
+ <flink.version>1.20.1</flink.version>
</properties>
<dependencies>
diff --git a/paimon-flink/pom.xml b/paimon-flink/pom.xml
index 43ec0590d9..6e665ad7b3 100644
--- a/paimon-flink/pom.xml
+++ b/paimon-flink/pom.xml
@@ -34,8 +34,10 @@ under the License.
<packaging>pom</packaging>
<modules>
+ <module>paimon-flink1-common</module>
<module>paimon-flink-common</module>
<module>paimon-flink-action</module>
+ <module>paimon-flink-cdc</module>
</modules>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 68e84ca645..c1aa7e0a19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,14 +423,12 @@ under the License.
<test.flink.version>1.20.1</test.flink.version>
</properties>
<modules>
- <module>paimon-flink/paimon-flink1-common</module>
<module>paimon-flink/paimon-flink-1.15</module>
<module>paimon-flink/paimon-flink-1.16</module>
<module>paimon-flink/paimon-flink-1.17</module>
<module>paimon-flink/paimon-flink-1.18</module>
<module>paimon-flink/paimon-flink-1.19</module>
<module>paimon-flink/paimon-flink-1.20</module>
- <module>paimon-flink/paimon-flink-cdc</module>
</modules>
<activation>
<activeByDefault>true</activeByDefault>
