Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes HotSpot JDK 22 CI failure due to GR-54293 #32267

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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 。

Expand All @@ -90,14 +90,19 @@ Truffle 与 JDK 的向后兼容性矩阵位于 https://medium.com/graalvm/40027a
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>polyglot</artifactId>
<version>24.0.0</version>
<version>24.0.2</version>
</dependency>
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>java-community</artifactId>
<version>24.0.0</version>
<version>24.0.2</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.graalvm.espresso</groupId>
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
<version>24.0.2</version>
</dependency>
</dependencies>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand All @@ -100,14 +100,19 @@ Truffle's backward compatibility matrix with the JDK is located at https://mediu
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>polyglot</artifactId>
<version>24.0.0</version>
<version>24.0.2</version>
</dependency>
<dependency>
<groupId>org.graalvm.polyglot</groupId>
<artifactId>java-community</artifactId>
<version>24.0.0</version>
<version>24.0.2</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.graalvm.espresso</groupId>
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
<version>24.0.2</version>
</dependency>
</dependencies>
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:apache/shardingsphere.git
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:apache/shardingsphere.git
Expand Down
6 changes: 6 additions & 0 deletions infra/expr/type/espresso/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.graalvm.espresso</groupId>
<artifactId>espresso-runtime-resources-linux-amd64</artifactId>
<version>${graal-sdk.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down