diff --git a/distribution/proxy-native/pom.xml b/distribution/proxy-native/pom.xml index 1820bec16247cd..7ef9c7114758db 100644 --- a/distribution/proxy-native/pom.xml +++ b/distribution/proxy-native/pom.xml @@ -28,7 +28,6 @@ apache-shardingsphere-proxy-native - org.apache.shardingsphere.proxy.Bootstrap apache/shardingsphere-proxy-native @@ -103,8 +102,7 @@ ${native-maven-plugin.version} true - false - true + org.apache.shardingsphere.proxy.Bootstrap --report-unsupported-elements-at-runtime -J-Xmx7g diff --git a/docs/document/content/dev-manual/sharding.cn.md b/docs/document/content/dev-manual/sharding.cn.md index 4458ff94ee3d09..2b47cf528a208a 100644 --- a/docs/document/content/dev-manual/sharding.cn.md +++ b/docs/document/content/dev-manual/sharding.cn.md @@ -92,7 +92,8 @@ chapter = true ### 已知实现 -| *配置标识* | *详细说明* | *全限定类名* | -|---------|-------------------|------------------------------------------------------------------------------| -| GROOVY | 使用 Groovy 语法的行表达式 | `org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser` | -| LITERAL | 使用标准列表的行表达式 | `org.apache.shardingsphere.infra.expr.literal.LiteralInlineExpressionParser` | +| *配置标识* | *详细说明* | *全限定类名* | +|----------|----------------------------------------------------|--------------------------------------------------------------------------------| +| GROOVY | 使用 Groovy 语法的行表达式 | `org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser` | +| LITERAL | 使用标准列表的行表达式 | `org.apache.shardingsphere.infra.expr.literal.LiteralInlineExpressionParser` | +| ESPRESSO | 基于 GraalVM Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式 | `org.apache.shardingsphere.infra.expr.espresso.EspressoInlineExpressionParser` | diff --git a/docs/document/content/dev-manual/sharding.en.md b/docs/document/content/dev-manual/sharding.en.md index 6721258529ae6b..2ecb672dab2cc6 100644 --- a/docs/document/content/dev-manual/sharding.en.md +++ b/docs/document/content/dev-manual/sharding.en.md @@ -92,7 +92,8 @@ Row Value Expressions definition ### Implementation classes -| *Configuration Type* | *Description* | *Fully-qualified class name* | -|----------------------|---------------------------------------------------|------------------------------------------------------------------------------| -| GROOVY | Row Value Expressions that uses the Groovy syntax | `org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser` | -| LITERAL | Row Value Expressions that uses a standard list | `org.apache.shardingsphere.infra.expr.literal.LiteralInlineExpressionParser` | +| *Configuration Type* | *Description* | *Fully-qualified class name* | +|----------------------|------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------| +| GROOVY | Row Value Expressions that uses the Groovy syntax | `org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser` | +| LITERAL | Row Value Expressions that uses a standard list | `org.apache.shardingsphere.infra.expr.literal.LiteralInlineExpressionParser` | +| ESPRESSO | Row Value Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso implementation | `org.apache.shardingsphere.infra.expr.espresso.EspressoInlineExpressionParser` | 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 2f67d5c1e95db0..89c9730fb58190 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 @@ -1,23 +1,62 @@ +++ title = "行表达式" -weight = 7 +weight = 8 +++ ## 使用 Groovy 语法的行表达式 +在配置中使用 `${ expression }` 或 `$->{ expression }` 标识 Groovy 表达式即可。 Groovy 表达式使用的是 Groovy 的语法，Groovy 能够支持的所有操作，行表达式均能够支持。 +`${begin..end}` 表示范围区间； `${[unit1, unit2, unit_x]}` 表示枚举值。 +行表达式中如果出现连续多个 `${ expression }` 或 `$->{ expression }` 表达式，整个表达式最终的结果将会根据每个子表达式的结果进行笛卡尔组合。 + 类型：GROOVY -可配置属性： +用例： -无 +- `t_order_${1..3}` 将被转化为 `t_order_1, t_order_2, t_order_3` +- `${['online', 'offline']}_table${1..3}` 将被转化为 `online_table1, online_table2, online_table3, offline_table1, offline_table2, offline_table3` ## 使用标准列表的行表达式 +`LITERAL` 实现将不对表达式部分做任何符号的转化，从标准列表的输入直接获得标准列表的输出。此有助于解决 GraalVM Native Image 下不便于使用 Groovy 表达式的问题。 + 类型：LITERAL -可配置属性： +用例： + +- `t_order_1, t_order_2, t_order_3` 将被转化为 `t_order_1, t_order_2, t_order_3` +- `t_order_${1..3}` 将被转化为 `t_order_${1..3}` + +## 基于 GraalVM Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式 + +此为可选实现，你需要在自有项目的 `pom.xml` 主动声明如下依赖。并且请确保自有项目通过 GraalVM CE 23.0.1 For JDK17 编译。 + +```xml + + + org.apache.shardingsphere + shardingsphere-infra-expr-espresso + ${shardingsphere.version} + + +``` + +用户必须通过 GraalVM Updater 安装 Espresso 组件，即在 bash 执行如下命令 + +```bash +gu install espresso +``` + +`ESPRESSO` 仍为实验性模块，其允许在 GraalVM Native Image 下通过 GraalVM Truffle 的 Espresso 实现来使用带 Groovy 语法的行表达式。 + +语法部分与 `GROOVY` 实现规则相同。 + +类型：ESPRESSO + +用例： -无 +- `t_order_${1..3}` 将被转化为 `t_order_1, t_order_2, t_order_3` +- `${['online', 'offline']}_table${1..3}` 将被转化为 `online_table1, online_table2, online_table3, offline_table1, offline_table2, offline_table3` ## 操作步骤 @@ -52,7 +91,7 @@ rules: t_order_inline: type: INLINE props: - algorithm-expression: t_order_${order_id % 2} + algorithm-expression: t_order_${order_id % 2} keyGenerators: snowflake: type: SNOWFLAKE 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 5bd773d392e3fb..5f073800c6c0e8 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 @@ -1,23 +1,68 @@ +++ title = "Row Value Expressions" -weight = 7 +weight = 8 +++ ## Row Value Expressions that uses the Groovy syntax Type: GROOVY -Attributes: +Just use `${ expression }` or `$->{ expression }` in the configuration to identify the row expressions. +The content of row expressions uses Groovy syntax, and all operations supported by Groovy are supported by row expressions. +`${begin..end}` denotes the range interval, `${[unit1, unit2, unit_x]}` denotes the enumeration value. +If there are multiple `${ expression }` or `$->{ expression }` expressions in a row expression, the final result of the +whole expression will be a Cartesian combination based on the result of each sub-expression. -None +Example: + +- `t_order_${1..3}` will be converted to `t_order_1, t_order_2, t_order_3` +- `${['online', 'offline']}_table${1..3}` will be converted to `online_table1, online_table2, online_table3, offline_table1, offline_table2, offline_table3` ## Row Value Expressions that uses a standard list +The `LITERAL` implementation will not convert any symbols to the expression part, and will directly obtain the output of +the standard list from the input of the standard list. +This helps address the issue that Groovy expressions are inconvenient to use under GraalVM Native Image. + Type: LITERAL -Attributes: +Example: + +- `t_order_1, t_order_2, t_order_3` will be converted to `t_order_1, t_order_2, t_order_3` +- `t_order_${1..3}` will be converted to `t_order_${1..3}` + +## Row Value Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso implementation + +This is an optional implementation, and you need to actively declare the following dependencies in the `pom.xml` of your own project. +And make sure your own project is compiled with GraalVM CE 23.0.1 For JDK17. + +```xml + + + org.apache.shardingsphere + shardingsphere-infra-expr-espresso + ${shardingsphere.version} + + +``` + +The user must install the Espresso component via GraalVM Updater, i.e. execute the following command in bash + +```bash +gu install espresso +``` + +`ESPRESSO` is still an experimental module that allows the use of Row Value Expressions with Groovy syntax under GraalVM +Native Image through the Espresso implementation of GraalVM Truffle. + +The syntax part is the same as the `GROOVY` implementation rules. + +Type: ESPRESSO + +Example: -None +- `t_order_${1..3}` will be converted to `t_order_1, t_order_2, t_order_3` +- `${['online', 'offline']}_table${1..3}` will be converted to `online_table1, online_table2, online_table3, offline_table1, offline_table2, offline_table3` ## Procedure @@ -54,7 +99,7 @@ rules: t_order_inline: type: INLINE props: - algorithm-expression: t_order_${order_id % 2} + algorithm-expression: t_order_${order_id % 2} keyGenerators: snowflake: type: SNOWFLAKE diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md index 0dff524ac5a8ac..423d9b0e1d68aa 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.cn.md @@ -50,5 +50,7 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存 - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`，基于 Narayana 的 XA 分布式事务管理器 - SQL 翻译 - `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`，使用 JooQ 的 SQL 翻译器 +- 行表达式 + - `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，基于 GraalVM Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式 除了以上可选插件外，ShardingSphere 社区开发者还贡献了大量的插件实现，可以在 [ShardingSphere Plugin](https://github.com/apache/shardingsphere-plugin) 仓库中查看插件的使用说明，ShardingSphere Plugin 仓库中的插件会和 ShardingSphere 保持相同的发布节奏，可以在 https://central.sonatype.com/ 进行检索，并安装到 ShardingSphere 中。 diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md index d9835bf49e5faa..009973ee41b532 100644 --- a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/_index.en.md @@ -50,5 +50,7 @@ All optional plugins are listed below in the form of `groupId:artifactId`. - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana - SQL translator - `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`, JooQ SQL translator +- Row Value Expressions definition + - `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，Row Value Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso implementation In addition to the above optional plugins, ShardingSphere community developers have contributed a number of plugin implementations. These plugins can be found in [ShardingSphere Plugins] (https://github.com/apache/shardingsphere-plugin) repository. Plugins in ShardingSphere Plugin repository would remain the same release plan with ShardingSphere, they can be retrieved at https://central.sonatype.com/, and install into ShardingSphere. diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md index f3ce36b58a3f0a..0233fe8eee85cc 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.cn.md @@ -38,5 +38,7 @@ ShardingSphere 默认情况下仅包含核心 SPI 的实现，在 Git Source 存 - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`，基于 Narayana 的 XA 分布式事务管理器 - SQL 翻译 - `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`，使用 JooQ 的 SQL 翻译器 +- 行表达式 + - `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，基于 GraalVM Truffle 的 Espresso 实现的使用 Groovy 语法的行表达式 除了以上可选插件外，ShardingSphere 社区开发者还贡献了大量的插件实现，可以在 [ShardingSphere Plugin](https://github.com/apache/shardingsphere-plugin) 仓库中查看插件的使用说明，ShardingSphere Plugin 仓库中的插件会和 ShardingSphere 保持相同的发布节奏，可以在 https://central.sonatype.com/ 进行检索，并安装到 ShardingSphere 中。 diff --git a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md index 7d619be55fee7d..d056937ca045bf 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/optional-plugins/_index.en.md @@ -38,5 +38,7 @@ All optional plugins are listed below in the form of `groupId:artifactId`. - `org.apache.shardingsphere:shardingsphere-transaction-xa-narayana`, XA distributed transaction manager based on Narayana - SQL translator - `org.apache.shardingsphere:shardingsphere-sql-translator-jooq-provider`, JooQ SQL translator +- Row Value Expressions definition + - `org.apache.shardingsphere:shardingsphere-infra-expr-espresso`，Row Value Expressions that uses the Groovy syntax based on GraalVM Truffle's Espresso implementation In addition to the above optional plugins, ShardingSphere community developers have contributed a number of plugin implementations. These plugins can be found in [ShardingSphere Plugins](https://github.com/apache/shardingsphere-plugin) repository. Plugins in ShardingSphere Plugin repository would remain the same release plan with ShardingSphere, they can be retrieved at https://central.sonatype.com/, and install into ShardingSphere. diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md index d8e8486109d561..4afb9ffa1c376b 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.cn.md @@ -50,16 +50,14 @@ services: ## 前提条件 -1. 根据 https://www.graalvm.org/downloads/ 要求安装和配置 JDK 17 对应的 `GraalVM Community Edition` 或 `Oracle GraalVM` - 。或者使用 `SDKMAN!` - 。如果你希望使用携带了 [GraalVM Free Terms and Conditions license](https://www.oracle.com/downloads/licenses/graal-free-license.html) - 的 `Oracle GraalVM`，下面的命令应更改为 `sdk install java 17.0.8-graal`。 +1. 根据 https://www.graalvm.org/downloads/ 要求安装和配置 JDK 17 对应的 `GraalVM Community Edition` + 或 `GraalVM Community Edition` 的下游发行版。若使用 `SDKMAN!`， ```shell sdk install java 17.0.8-graalce ``` -2. 根据 https://www.graalvm.org/latest/reference-manual/native-image/#prerequisites 的要求安装本地工具链。 +2. 根据 https://www.graalvm.org/jdk17/reference-manual/native-image/#prerequisites 的要求安装本地工具链。 3. 如果需要构建 Docker Image， 确保 `docker-ce` 已安装。 @@ -145,7 +143,7 @@ services: - 如果你不对 Git Source 做任何更改， 上文提及的命令将使用 `oraclelinux:9-slim` 作为 Base Docker Image。 但如果你希望使用 `busybox:glic`，`gcr.io/distroless/base` 或 `scratch` 等更小体积的 Docker Image 作为 Base Docker - Image，你需要根据 https://www.graalvm.org/latest/reference-manual/native-image/guides/build-static-executables/ 的要求， + Image，你需要根据 https://www.graalvm.org/jdk17/reference-manual/native-image/guides/build-static-executables/ 的要求， 做为 `pom.xml`的 `native profile` 添加 `-H:+StaticExecutableWithDynamicLibC` 的 `jvmArgs` 等操作。 另请注意，某些第三方依赖将需要在 `Dockerfile` 安装更多系统库，例如 `libdl`。 因此请确保根据你的使用情况调整 `distribution/proxy-native` 下的 `pom.xml` 和 `Dockerfile` 的内容。 @@ -155,7 +153,7 @@ services: - 针对 GraalVM Native Image 形态的 ShardingSphere Proxy，其提供的可观察性的能力与 https://shardingsphere.apache.org/document/current/cn/user-manual/shardingsphere-proxy/observability/ 并不一致。 -- 你可以使用 https://www.graalvm.org/latest/tools/ 提供的一系列命令行工具或可视化工具观察 GraalVM Native Image 的内部行为， +- 你可以使用 https://www.graalvm.org/jdk17/tools/ 提供的一系列命令行工具或可视化工具观察 GraalVM Native Image 的内部行为， 并根据其要求使用 VSCode 完成调试工作。如果你正在使用 IntelliJ IDEA 并且希望调试生成的 GraalVM Native Image，你可以关注 https://blog.jetbrains.com/idea/2022/06/intellij-idea-2022-2-eap-5/#Experimental_GraalVM_Native_Debugger_for_Java 及其后继。如果你使用的不是 Linux，则无法对 GraalVM Native Image 进行 Debug，请关注尚未关闭的 diff --git a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md index 12ffccfa253bdb..638177fff99c94 100644 --- a/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md +++ b/docs/document/content/user-manual/shardingsphere-proxy/startup/graalvm-native-image.en.md @@ -58,16 +58,14 @@ services: ## Premise -1. Install and configure `GraalVM Community Edition` or `Oracle GraalVM` for JDK 17 according - to https://www.graalvm.org/downloads/. Or use `SDKMAN!`. If you wish to use `Oracle GraalVM` - with [GraalVM Free Terms and Conditions license](https://www.oracle.com/downloads/licenses/graal-free-license.html), - the following command should be changed to `sdk install java 17.0.8-graal`. +1. Install and configure `GraalVM Community Edition` or a downstream distribution of `GraalVM Community Edition` for +JDK 17 according to https://www.graalvm.org/downloads/. If `SDKMAN!` is used, ```shell sdk install java 17.0.8-graalce ``` -2. Install the local toolchain as required by https://www.graalvm.org/latest/reference-manual/native-image/#prerequisites. +2. Install the local toolchain as required by https://www.graalvm.org/jdk17/reference-manual/native-image/#prerequisites. 3. If you need to build a Docker Image, make sure `docker-ce` is installed. @@ -159,7 +157,7 @@ services: - If you don't make any changes to the Git Source, the commands mentioned above will use `oraclelinux:9-slim` as the Base Docker Image. But if you want to use a smaller Docker Image like `busybox:glic`, `gcr.io/distroless/base` or `scratch` as the Base Docker Image, you need according - to https://www.graalvm.org/latest/reference-manual/native-image/guides/build-static-executables/, + to https://www.graalvm.org/jdk17/reference-manual/native-image/guides/build-static-executables/, add operations such as `-H:+StaticExecutableWithDynamicLibC` to `jvmArgs` as the `native profile` of `pom.xml`. Also note that some 3rd-party dependencies will require more system libraries such as `libdl` to be installed in the `Dockerfile`. So make sure to tune `distribution/proxy-native` according to your usage `pom.xml` and `Dockerfile` @@ -172,7 +170,7 @@ services: not consistent. - You can observe GraalVM Native Image using a series of command line tools or visualization tools available - at https://www.graalvm.org/latest/tools/, and use VSCode to debug it according to its requirements. + at https://www.graalvm.org/jdk17/tools/, and use VSCode to debug it according to its requirements. If you are using IntelliJ IDEA and want to debug the generated GraalVM Native Image, You can follow https://blog.jetbrains.com/idea/2022/06/intellij-idea-2022-2-eap-5/#Experimental_GraalVM_Native_Debugger_for_Java and its successors. If you are not using Linux, you cannot debug GraalVM Native Image, please pay attention diff --git a/infra/expr/core/src/main/java/org/apache/shardingsphere/infra/expr/core/InlineExpressionParserFactory.java b/infra/expr/core/src/main/java/org/apache/shardingsphere/infra/expr/core/InlineExpressionParserFactory.java index 97dd60b3c76538..d0ce9bfdec5f84 100644 --- a/infra/expr/core/src/main/java/org/apache/shardingsphere/infra/expr/core/InlineExpressionParserFactory.java +++ b/infra/expr/core/src/main/java/org/apache/shardingsphere/infra/expr/core/InlineExpressionParserFactory.java @@ -52,7 +52,7 @@ public static InlineExpressionParser newInstance(final String inlineExpression) } Integer typeBeginIndex = inlineExpression.indexOf(TYPE_NAME_BEGIN_SYMBOL); Integer typeEndIndex = inlineExpression.indexOf(TYPE_NAME_END_SYMBOL); - props.setProperty(InlineExpressionParser.INLINE_EXPRESSION_KEY, removeTypeNameInExpr(inlineExpression, typeBeginIndex, typeEndIndex)); + props.setProperty(InlineExpressionParser.INLINE_EXPRESSION_KEY, getExprWithoutTypeName(inlineExpression, typeBeginIndex, typeEndIndex)); return TypedSPILoader.getService(InlineExpressionParser.class, getTypeName(inlineExpression, typeBeginIndex, typeEndIndex), props); } @@ -60,7 +60,7 @@ private static String getTypeName(final String inlineExpression, final Integer b return beginIndex.equals(-1) || endIndex.equals(-1) ? "GROOVY" : inlineExpression.substring(beginIndex + 1, endIndex); } - private static String removeTypeNameInExpr(final String inlineExpression, final Integer beginIndex, final Integer endIndex) { + private static String getExprWithoutTypeName(final String inlineExpression, final Integer beginIndex, final Integer endIndex) { return inlineExpression.substring(0, beginIndex) + inlineExpression.substring(endIndex + 1); } } diff --git a/infra/expr/type/espresso/pom.xml b/infra/expr/type/espresso/pom.xml index df2cf432cd1e89..9bd48e135ca001 100644 --- a/infra/expr/type/espresso/pom.xml +++ b/infra/expr/type/espresso/pom.xml @@ -27,7 +27,7 @@ ${project.artifactId} - 21.2.0 + 21.2.0 @@ -46,19 +46,18 @@ shardingsphere-infra-util ${project.version} - - - org.graalvm.truffle - truffle-api - ${truffle-api.version} - - org.apache.shardingsphere shardingsphere-test-util ${project.version} test + + + org.graalvm.truffle + truffle-api + ${graalvm.version} + @@ -69,12 +68,13 @@ ${maven-dependency-plugin.version} - copy + copy-dependencies + process-resources copy - process-test-classes + ${project.build.directory}/classes/espresso-need-libs org.apache.groovy @@ -85,7 +85,6 @@ true - target/classes/espresso-need-libs diff --git a/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java b/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java index 0e1839b4f3673a..3d015a5edb5571 100644 --- a/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java +++ b/infra/expr/type/espresso/src/main/java/org/apache/shardingsphere/infra/expr/espresso/EspressoInlineExpressionParser.java @@ -45,7 +45,18 @@ public final class EspressoInlineExpressionParser implements InlineExpressionPar private static final char SPLITTER = ','; private String inlineExpression; - + + /** + * TODO espressoHome not defined not yet closed. + * Maybe sometimes we need `.option("java.Properties.org.graalvm.home", System.getenv("JAVA_HOME"))` + * + * @see org.graalvm.polyglot.Context + */ + private final Context context = Context.newBuilder() + .allowAllAccess(true) + .option("java.Classpath", JAVA_CLASSPATH) + .build(); + static { URL resource = Thread.currentThread().getContextClassLoader().getResource("espresso-need-libs"); String dir = null == resource ? null : resource.getPath(); @@ -74,22 +85,7 @@ private String handlePlaceHolder(final String inlineExpression) { @Override public List splitAndEvaluate() { - try (Context context = createContext()) { - return Strings.isNullOrEmpty(inlineExpression) ? Collections.emptyList() : flatten(evaluate(split(handlePlaceHolder(inlineExpression)), context)); - } - } - - /** - * TODO espressoHome not defined not yet closed. - * - * @return the Truffle Context Instance. - */ - private Context createContext() { - return Context.newBuilder() - .allowAllAccess(true) - .option("java.Properties.org.graalvm.home", System.getenv("JAVA_HOME")) - .option("java.Classpath", JAVA_CLASSPATH) - .build(); + return Strings.isNullOrEmpty(inlineExpression) ? Collections.emptyList() : flatten(evaluate(split(handlePlaceHolder(inlineExpression)), context)); } private List split(final String inlineExpression) { 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 ca6deb1c66e1d3..3fe228899f0b1a 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 @@ -22,8 +22,6 @@ import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledIfSystemProperty; -import org.junit.jupiter.api.condition.EnabledInNativeImage; import java.util.Collections; import java.util.List; @@ -32,9 +30,9 @@ import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; -@EnabledInNativeImage -@DisabledIfSystemProperty(named = "org.graalvm.nativeimage.imagecode", matches = "agent", disabledReason = "Skip this unit test when using GraalVM Native Build Tools") +@Disabled("Unit tests for this class only run on GraalVM CE 23.0.1 For JDK17. Wait for https://github.com/oracle/graal/issues/7500 .") class EspressoInlineExpressionParserTest { @Test @@ -133,15 +131,19 @@ void assertHandlePlaceHolder() { assertThat(TypedSPILoader.getService(InlineExpressionParser.class, "ESPRESSO", PropertiesBuilder.build( new PropertiesBuilder.Property(InlineExpressionParser.INLINE_EXPRESSION_KEY, "t_${[\"new$->{1+2}\"]}"))).handlePlaceHolder(), is("t_${[\"new${1+2}\"]}")); } - - /* - * TODO This method needs to avoid returning a `groovy.lang.Closure` class instance, and instead return the result of `groovy.lang.Closure#call`. Because `org.graalvm.polyglot.Value#as` does not - * allow this type to be returned from the guest JVM. + + /** + * This method needs to avoid returning a `Closure` class instance, and instead return the result of `Closure#call`. + * Because `Value#as` does not allow this type to be returned from the guest JVM. + * + * @see groovy.lang.Closure + * @see org.graalvm.polyglot.Value */ @Test - @Disabled("See java doc") void assertEvaluateClosure() { - assertThat(TypedSPILoader.getService(InlineExpressionParser.class, "ESPRESSO", PropertiesBuilder.build( - new PropertiesBuilder.Property(InlineExpressionParser.INLINE_EXPRESSION_KEY, "${1+2}"))).evaluateClosure().call().toString(), is("3")); + assertThrows(UnsupportedOperationException.class, () -> TypedSPILoader.getService( + InlineExpressionParser.class, "ESPRESSO", + PropertiesBuilder.build(new PropertiesBuilder.Property(InlineExpressionParser.INLINE_EXPRESSION_KEY, "${1+2}")) + ).evaluateClosure().call().toString()); } } diff --git a/pom.xml b/pom.xml index 88ae4008f759ff..d4a7b086ec212f 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ 3.3.0 3.1.3 3.3.0 - 3.5.0 + 3.6.0 3.1.0