Skip to content

Commit bdcd306

Browse files
authoredJul 25, 2024··
Fixes HotSpot JDK 22 CI failure due to GR-54293 (#32267)
1 parent 300637d commit bdcd306

File tree

6 files changed

+28
-12
lines changed

6 files changed

+28
-12
lines changed
 

‎docs/document/content/user-manual/common-config/builtin-algorithm/expr.cn.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ weight = 10
7676
此为可选实现,你需要在自有项目的 `pom.xml` 主动声明如下依赖。并且请确保自有项目通过 OpenJDK 21+ 或其下游发行版编译。
7777

7878
由于 https://www.graalvm.org/jdk21/reference-manual/java-on-truffle/faq/#does-java-running-on-truffle-run-on-hotspot-too 的限制,
79-
当此模块在非 GraalVM Native Image 的环境中被使用时,仅在 Linux 上就绪。
79+
当此模块在非 GraalVM Native Image 的环境中被使用时,仅在 System Property `os.arch``amd64`Linux 上就绪。
8080

8181
Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a59c401
8282

@@ -90,14 +90,19 @@ Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a
9090
<dependency>
9191
<groupId>org.graalvm.polyglot</groupId>
9292
<artifactId>polyglot</artifactId>
93-
<version>24.0.0</version>
93+
<version>24.0.2</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>org.graalvm.polyglot</groupId>
9797
<artifactId>java-community</artifactId>
98-
<version>24.0.0</version>
98+
<version>24.0.2</version>
9999
<type>pom</type>
100100
</dependency>
101+
<dependency>
102+
<groupId>org.graalvm.espresso</groupId>
103+
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
104+
<version>24.0.2</version>
105+
</dependency>
101106
</dependencies>
102107
```
103108

‎docs/document/content/user-manual/common-config/builtin-algorithm/expr.en.md

+9-4
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ Example:
8585
This is an optional implementation. You need to actively declare the following dependencies in the `pom.xml` of your own project.
8686
And please make sure your own projects are compiled with OpenJDK 21+ or its downstream distribution.
8787

88-
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 ,
89-
this module is only ready on Linux when used in environments other than GraalVM Native Image.
88+
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,
89+
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`.
9090

9191
Truffle's backward compatibility matrix with the JDK is located at https://medium.com/graalvm/40027a59c401 .
9292

@@ -100,14 +100,19 @@ Truffle's backward compatibility matrix with the JDK is located at https://mediu
100100
<dependency>
101101
<groupId>org.graalvm.polyglot</groupId>
102102
<artifactId>polyglot</artifactId>
103-
<version>24.0.0</version>
103+
<version>24.0.2</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.graalvm.polyglot</groupId>
107107
<artifactId>java-community</artifactId>
108-
<version>24.0.0</version>
108+
<version>24.0.2</version>
109109
<type>pom</type>
110110
</dependency>
111+
<dependency>
112+
<groupId>org.graalvm.espresso</groupId>
113+
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
114+
<version>24.0.2</version>
115+
</dependency>
111116
</dependencies>
112117
```
113118

‎docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ ShardingSphere 定义了 `nativeTestInShardingSphere` 的 Maven Profile 用于
355355
sudo apt install unzip zip curl sed -y
356356
curl -s "https://get.sdkman.io" | bash
357357
source "$HOME/.sdkman/bin/sdkman-init.sh"
358-
sdk install java 22.0.1-graalce
359-
sdk use java 22.0.1-graalce
358+
sdk install java 22.0.2-graalce
359+
sdk use java 22.0.2-graalce
360360
sudo apt-get install build-essential zlib1g-dev -y
361361
362362
git clone git@github.com:apache/shardingsphere.git

‎docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ You must install Docker Engine to execute `testcontainers-java` related unit tes
371371
sudo apt install unzip zip curl sed -y
372372
curl -s "https://get.sdkman.io" | bash
373373
source "$HOME/.sdkman/bin/sdkman-init.sh"
374-
sdk install java 21.0.2-graalce
375-
sdk use java 21.0.2-graalce
374+
sdk install java 22.0.2-graalce
375+
sdk use java 22.0.2-graalce
376376
sudo apt-get install build-essential zlib1g-dev -y
377377
378378
git clone git@github.com:apache/shardingsphere.git

‎infra/expr/type/espresso/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
<type>pom</type>
5757
<scope>test</scope>
5858
</dependency>
59+
<dependency>
60+
<groupId>org.graalvm.espresso</groupId>
61+
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
62+
<version>${graal-sdk.version}</version>
63+
<scope>test</scope>
64+
</dependency>
5965
</dependencies>
6066

6167
<build>

‎infra/expr/type/espresso/src/test/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParserTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.junit.jupiter.api.Assertions.assertThrows;
3636

3737
@EnabledForJreRange(min = JRE.JAVA_22)
38-
@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 .")
38+
@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")
3939
class EspressoInlineExpressionParserTest {
4040

4141
@Test

0 commit comments

Comments
 (0)
Please sign in to comment.