From c2813e3d0078cb16dbf15377539d0d33357097d8 Mon Sep 17 00:00:00 2001 From: linghengqian Date: Thu, 25 Jul 2024 19:00:05 +0800 Subject: [PATCH] Fixes HotSpot JDK 22 CI failure due to GR-54293 --- .../common-config/builtin-algorithm/expr.cn.md | 11 ++++++++--- .../common-config/builtin-algorithm/expr.en.md | 13 +++++++++---- .../graalvm-native-image/_index.cn.md | 4 ++-- .../graalvm-native-image/_index.en.md | 4 ++-- infra/expr/type/espresso/pom.xml | 6 ++++++ .../EspressoInlineExpressionParserTest.java | 2 +- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md b/docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md index 7d48da54ca4b4..d8de227d58d26 100644 --- a/docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md +++ b/docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md @@ -76,7 +76,7 @@ weight = 10 此为可选实现，你需要在自有项目的 `pom.xml` 主动声明如下依赖。并且请确保自有项目通过 OpenJDK 21+ 或其下游发行版编译。 由于 https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too 的限制， -当此模块在非 GraalVM Native Image 的环境中被使用时，仅在 Linux 上就绪。 +当此模块在非 GraalVM Native Image 的环境中被使用时，仅在 System Property `os.arch` 为 `amd64` 的 Linux 上就绪。 Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a59c401 。 @@ -90,14 +90,19 @@ Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a org.graalvm.polyglot polyglot - 24.0.0 + 24.0.2 org.graalvm.polyglot java-community - 24.0.0 + 24.0.2 pom + + org.graalvm.espresso + espresso-runtime-resources-linux-amd64 + 24.0.2 + ``` diff --git a/docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md b/docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md index 9d2c949c8b8c4..34056915b4200 100644 --- a/docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md +++ b/docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md @@ -85,8 +85,8 @@ Example: This is an optional implementation. You need to actively declare the following dependencies in the `pom.xml` of your own project. And please make sure your own projects are compiled with OpenJDK 21+ or its downstream distribution. -Due to the limitations of https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too , -this module is only ready on Linux when used in environments other than GraalVM Native Image. +Due to the limitation of https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too, +when this module is used in a non-GraalVM Native Image environment, it is only ready on Linux with System Property `os.arch` set to `amd64`. Truffle's backward compatibility matrix with the JDK is located at https://medium.com/graalvm/40027a59c401 . @@ -100,14 +100,19 @@ Truffle's backward compatibility matrix with the JDK is located at https://mediu org.graalvm.polyglot polyglot - 24.0.0 + 24.0.2 org.graalvm.polyglot java-community - 24.0.0 + 24.0.2 pom + + org.graalvm.espresso + espresso-runtime-resources-linux-amd64 + 24.0.2 + ``` diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md index e0278ba940aae..b8bd1fd674270 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md @@ -355,8 +355,8 @@ ShardingSphere 定义了 `nativeTestInShardingSphere` 的 Maven Profile 用于 sudo apt install unzip zip curl sed -y curl -s "https://get.sdkman.io" | bash source "$HOME/.sdkman/bin/sdkman-init.sh" -sdk install java 22.0.1-graalce -sdk use java 22.0.1-graalce +sdk install java 22.0.2-graalce +sdk use java 22.0.2-graalce sudo apt-get install build-essential zlib1g-dev -y git clone git@github.com:apache/shardingsphere.git diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md index adcf236f3dd13..ab76d2834ae59 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md @@ -371,8 +371,8 @@ You must install Docker Engine to execute `testcontainers-java` related unit tes sudo apt install unzip zip curl sed -y curl -s "https://get.sdkman.io" | bash source "$HOME/.sdkman/bin/sdkman-init.sh" -sdk install java 21.0.2-graalce -sdk use java 21.0.2-graalce +sdk install java 22.0.2-graalce +sdk use java 22.0.2-graalce sudo apt-get install build-essential zlib1g-dev -y git clone git@github.com:apache/shardingsphere.git diff --git a/infra/expr/type/espresso/pom.xml b/infra/expr/type/espresso/pom.xml index 8011c1dcf3352..bf168404e3a8f 100644 --- a/infra/expr/type/espresso/pom.xml +++ b/infra/expr/type/espresso/pom.xml @@ -56,6 +56,12 @@ pom test + + org.graalvm.espresso + espresso-runtime-resources-linux-amd64 + ${graal-sdk.version} + test + diff --git a/infra/expr/type/espresso/src/test/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java b/infra/expr/type/espresso/src/test/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java index 235ef1ba6e437..2af84254d2341 100644 --- a/infra/expr/type/espresso/src/test/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java +++ b/infra/expr/type/espresso/src/test/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java @@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @EnabledForJreRange(min = JRE.JAVA_22) -@EnabledOnOs(value = OS.LINUX, disabledReason = "Refer to https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too .") +@EnabledOnOs(value = OS.LINUX, architectures = "amd64", disabledReason = "See https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too") class EspressoInlineExpressionParserTest { @Test