From 0bc4fa5de241ced31a9c947192a6070623c1a7a2 Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Fri, 31 Oct 2025 11:05:59 -0700 Subject: [PATCH 1/5] java17 scala test apache 34 revert apache 34 java8 compatiblity compatible jdk11 java version 11 opens 1.10.0 revert iceberg 1.10.0 debug Revert "debug" This reverts commit 03e4cb093681193551211f3f551e9d894d72a907. test test ignore --- .github/workflows/core-hadoop3-ci.yml | 9 ++++- .../flow/TestKeyedContinuousOptimizing.java | 2 + .../amoro-mixed-flink-common/pom.xml | 1 - pom.xml | 37 ++++++++++++++++++- 4 files changed, 46 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core-hadoop3-ci.yml b/.github/workflows/core-hadoop3-ci.yml index 5440afcbcf..e905670d79 100644 --- a/.github/workflows/core-hadoop3-ci.yml +++ b/.github/workflows/core-hadoop3-ci.yml @@ -37,8 +37,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - jdk: [ '8', '11' ] + jdk: [ 8, 11, 17 ] spark: [ '3.3', '3.5' ] + exclude: + - jdk: 8 + spark: '3.5' + - jdk: 11 + spark: '3.5' + - jdk: 17 + spark: '3.3' name: Build Amoro with JDK ${{ matrix.jdk }} Spark-${{ matrix.spark }} steps: - uses: actions/checkout@v3 diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java index a1f3c2c20e..6c98ce33a2 100644 --- a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java +++ b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java @@ -39,12 +39,14 @@ import org.apache.amoro.server.optimizing.flow.view.KeyedTableDataView; import org.apache.amoro.table.MixedTable; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.List; +@Ignore @RunWith(Parameterized.class) public class TestKeyedContinuousOptimizing extends TableTestBase { diff --git a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml index c71541c3ff..17c26486fb 100644 --- a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml @@ -426,7 +426,6 @@ org.apache.amoro.listener.AmoroRunListener - -verbose:class diff --git a/pom.xml b/pom.xml index 8189ece914..9995b2814c 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ 3.3.0 3.0.1 3.0.0-M1 - 3.2.4 + 3.5.2 4.8.1 4.3 3.0.0-M7 @@ -159,6 +159,27 @@ compile compile provided + + + -XX:+IgnoreUnrecognizedVMOptions + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.lang.invoke=ALL-UNNAMED + --add-opens=java.base/java.lang.reflect=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.net=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-opens=java.base/java.util.concurrent=ALL-UNNAMED + --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED + --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED + --add-opens=java.base/sun.nio.ch=ALL-UNNAMED + --add-opens=java.base/sun.nio.cs=ALL-UNNAMED + --add-opens=java.base/sun.security.action=ALL-UNNAMED + --add-opens=java.base/sun.security.tools.keytool=ALL-UNNAMED + --add-opens=java.base/sun.security.x509=ALL-UNNAMED + --add-opens=java.base/sun.util.calendar=ALL-UNNAMED + -Djdk.reflect.useDirectMethodHandle=false + -Dio.netty.tryReflectionSetAccessible=true @@ -1076,6 +1097,9 @@ org.apache.maven.plugins maven-surefire-plugin ${maven-surefire-plugin.version} + + ${argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=128m ${extraJavaTestArgs} -verbose:class + org.apache.maven.plugins @@ -1449,9 +1473,20 @@ [11,) + 11 11 + + java17 + + 17 + + + 17 + 17 + + spark-3.3 From e616795a89992b260227e4898cb1de20200d6172 Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Sun, 2 Nov 2025 16:33:55 -0800 Subject: [PATCH 2/5] jdk17 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9995b2814c..228062b874 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,7 @@ --add-opens=java.base/sun.security.tools.keytool=ALL-UNNAMED --add-opens=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED + --add-opens=jdk.proxy2/jdk.proxy2=ALL-UNNAMED -Djdk.reflect.useDirectMethodHandle=false -Dio.netty.tryReflectionSetAccessible=true From a276f1d8f65e109878124b3fe331d1680084ff3b Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Sun, 2 Nov 2025 18:01:53 -0800 Subject: [PATCH 3/5] try --- .../amoro-mixed-flink/amoro-mixed-flink-common/pom.xml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml index 17c26486fb..b1489b83ac 100644 --- a/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml +++ b/amoro-format-mixed/amoro-mixed-flink/amoro-mixed-flink-common/pom.xml @@ -426,6 +426,7 @@ org.apache.amoro.listener.AmoroRunListener + ${extraJavaTestArgs} -verbose:class diff --git a/pom.xml b/pom.xml index 228062b874..a208516f78 100644 --- a/pom.xml +++ b/pom.xml @@ -1099,7 +1099,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - ${argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=128m ${extraJavaTestArgs} -verbose:class + ${argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=128m ${extraJavaTestArgs} From be915d17ba01f391804d4b21c96fd08aff892daf Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Sun, 2 Nov 2025 18:44:54 -0800 Subject: [PATCH 4/5] save --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a208516f78..63a42d1560 100644 --- a/pom.xml +++ b/pom.xml @@ -1099,7 +1099,7 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - ${argLine} -ea -Xmx4g -Xss4m -XX:MaxMetaspaceSize=2g -XX:ReservedCodeCacheSize=128m ${extraJavaTestArgs} + ${extraJavaTestArgs} From ecc3297910ed389223088542529b47966af9f82a Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Mon, 3 Nov 2025 00:38:31 -0800 Subject: [PATCH 5/5] revert ignore --- .../server/optimizing/flow/TestKeyedContinuousOptimizing.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java index 6c98ce33a2..a1f3c2c20e 100644 --- a/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java +++ b/amoro-ams/src/test/java/org/apache/amoro/server/optimizing/flow/TestKeyedContinuousOptimizing.java @@ -39,14 +39,12 @@ import org.apache.amoro.server.optimizing.flow.view.KeyedTableDataView; import org.apache.amoro.table.MixedTable; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.util.List; -@Ignore @RunWith(Parameterized.class) public class TestKeyedContinuousOptimizing extends TableTestBase {