This is an automated email from the ASF dual-hosted git repository.
yx9o pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 38061048399 Fix nativeTest failures under GraalVM Native Image caused
by refactoring (#39775)
38061048399 is described below
commit 38061048399e662211b65bd8424d79e6c76fc0fb
Author: Hengqian Ling <[email protected]>
AuthorDate: Sun Sep 13 21:25:53 2026 +0800
Fix nativeTest failures under GraalVM Native Image caused by refactoring
(#39775)
---
.github/workflows/graalvm.yml | 13 +-
.github/workflows/nightly-ci.yml | 8 +-
.../actions/setup-build-environment/action.yml | 60 +--------
.../optional-plugins/hiveserver2/_index.cn.md | 6 -
.../optional-plugins/hiveserver2/_index.en.md | 6 -
.../{1.40.0 => 1.42.0}/reachability-metadata.json | 18 +++
.../reachability-metadata.json | 138 +++++++++++++++------
.../2.4.2/reachability-metadata.json | 11 --
.../2.7.14/reachability-metadata.json | 11 ++
.../jdbc/sql/JDBCRepositorySQLLoader.java | 4 +-
test/native/pom.xml | 6 -
11 files changed, 148 insertions(+), 133 deletions(-)
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
index b2c6e7ae20d..06869fc1565 100644
--- a/.github/workflows/graalvm.yml
+++ b/.github/workflows/graalvm.yml
@@ -42,15 +42,15 @@ jobs:
nativetest:
if: github.repository == 'apache/shardingsphere'
needs: global-environment
- name: GraalVM - GraalVM CE for JDK ${{ matrix.java-version }} on ${{
matrix.os }}
+ name: GraalVM - GraalVM CE ${{ matrix.java-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
timeout-minutes: 90
strategy:
max-parallel: 15
fail-fast: false
matrix:
- os: [ 'ubuntu-latest', 'windows-latest' ]
- java-version: [ '25.0.2' ]
+ # TODO After the issue at
https://github.com/apache/shardingsphere/issues/38857 is resolved, add
`windows-latest`
+ os: [ 'ubuntu-latest' ]
steps:
- uses: actions/[email protected]
- name: Free Disk Space on Ubuntu
@@ -61,15 +61,12 @@ jobs:
run: ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- uses: ./.github/workflows/resources/actions/setup-build-environment
with:
- java-version: ${{ matrix.java-version }}
- distribution: 'graalvm'
+ distribution: 'graalvm-community'
github-token: ${{ secrets.GITHUB_TOKEN }}
- cache-prefix: ${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}
- cache-suffix: 'native-test'
# TODO Remove this workaround after. The graalvm native image built with
windows server is missing some GRMs for testcontainers
- name: Run test with GraalVM CE
if: matrix.os == 'windows-latest'
run: ./mvnw -PgenerateMetadata -e -T 1C clean verify
- - name: Run nativeTest with GraalVM CE for ${{ matrix.java-version }}
+ - name: Run nativeTest with GraalVM CE ${{ matrix.java-version }}
if: matrix.os == 'ubuntu-latest'
run: ./mvnw -PnativeTestInShardingSphere -e clean verify
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
index 971b8bc101b..8345b610b01 100644
--- a/.github/workflows/nightly-ci.yml
+++ b/.github/workflows/nightly-ci.yml
@@ -73,7 +73,8 @@ jobs:
max-parallel: 15
fail-fast: false
matrix:
- os: [ ubuntu-latest, windows-latest ]
+ # TODO After the issue at
https://github.com/apache/shardingsphere/issues/38857 is resolved, add
`windows-latest`
+ os: [ ubuntu-latest ]
steps:
- uses: actions/[email protected]
- name: Free Disk Space on Ubuntu
@@ -84,11 +85,8 @@ jobs:
run: ./test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
- uses: ./.github/workflows/resources/actions/setup-build-environment
with:
- java-version: '25.0.2'
- distribution: 'graalvm'
+ distribution: 'graalvm-community'
github-token: ${{ secrets.GITHUB_TOKEN }}
- cache-prefix: ${{
needs.global-environment.outputs.GLOBAL_CACHE_PREFIX }}
- cache-suffix: 'native-test'
# TODO Remove this workaround after. The graalvm native image built with
windows server is missing some GRMs for testcontainers
- name: Run test with GraalVM CE
if: matrix.os == 'windows-latest'
diff --git
a/.github/workflows/resources/actions/setup-build-environment/action.yml
b/.github/workflows/resources/actions/setup-build-environment/action.yml
index 40f7c7c4c57..65763279ccd 100644
--- a/.github/workflows/resources/actions/setup-build-environment/action.yml
+++ b/.github/workflows/resources/actions/setup-build-environment/action.yml
@@ -82,65 +82,17 @@ runs:
using: composite
steps:
- name: Setup Java (Temurin)
- if: inputs.distribution != 'graalvm'
+ if: inputs.distribution != 'graalvm-community'
uses: actions/[email protected]
with:
distribution: ${{ inputs.distribution }}
java-version: ${{ inputs.java-version }}
- - name: Prepare GraalVM Package
- id: prepare-graalvm-package
- if: inputs.distribution == 'graalvm'
- shell: bash
- env:
- GITHUB_TOKEN_INPUT: ${{ inputs.github-token }}
- run: |
- set -euo pipefail
- case "${{ runner.os }}" in
- Linux)
- graalvm_os='linux'
- archive_extension='tar.gz'
- ;;
- Windows)
- graalvm_os='windows'
- archive_extension='zip'
- ;;
- *)
- echo "Unsupported runner OS for GraalVM Community: ${{ runner.os
}}" >&2
- exit 1
- ;;
- esac
- case "${{ runner.arch }}" in
- X64)
- graalvm_arch='x64'
- setup_java_arch='x64'
- ;;
- ARM64)
- graalvm_arch='aarch64'
- setup_java_arch='aarch64'
- ;;
- *)
- echo "Unsupported runner architecture for GraalVM Community: ${{
runner.arch }}" >&2
- exit 1
- ;;
- esac
- archive_name="graalvm-community-jdk-${{ inputs.java-version
}}_${graalvm_os}-${graalvm_arch}_bin.${archive_extension}"
- archive_path="${RUNNER_TEMP}/${archive_name}"
-
download_url="https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${{
inputs.java-version }}/${archive_name}"
- curl_args=(--fail --silent --show-error --location --retry 3 --output
"${archive_path}")
- if [ -n "${GITHUB_TOKEN_INPUT}" ]; then
- curl_args=(-H "Authorization: Bearer ${GITHUB_TOKEN_INPUT}"
"${curl_args[@]}")
- fi
- curl "${curl_args[@]}" "${download_url}"
- echo "archive-path=${archive_path}" >> "${GITHUB_OUTPUT}"
- echo "setup-java-architecture=${setup_java_arch}" >> "${GITHUB_OUTPUT}"
- - name: Setup GraalVM
- if: inputs.distribution == 'graalvm'
- uses: actions/[email protected]
+ - name: Setup GraalVM CE
+ if: inputs.distribution == 'graalvm-community'
+ uses: graalvm/setup-graalvm@0426e2e191540e8514dff98dc52a5f5146a2a276 #
v1.6.6
with:
- distribution: 'jdkfile'
- jdkFile: ${{ steps.prepare-graalvm-package.outputs.archive-path }}
- java-version: ${{ inputs.java-version }}
- architecture: ${{
steps.prepare-graalvm-package.outputs.setup-java-architecture }}
+ distribution: 'graalvm-community'
+ java-version: '25.0.2'
- name: Verify Preinstalled Docker
if: inputs.enable-docker-setup == 'true'
shell: bash
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
index 0ff80f87786..93fc0289d03 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
@@ -50,12 +50,6 @@ ShardingSphere 对 HiveServer2 JDBC Driver 的支持位于可选模块中。
<groupId>io.github.linghengqian</groupId>
<artifactId>hive-server2-jdbc-driver-thin</artifactId>
<version>1.8.2</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
```
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
index fa8710f90a6..4134808b231 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
@@ -52,12 +52,6 @@ The following is an example of a possible configuration,
<groupId>io.github.linghengqian</groupId>
<artifactId>hive-server2-jdbc-driver-thin</artifactId>
<version>1.8.2</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
```
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.40.0/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.42.0/reachability-metadata.json
similarity index 97%
rename from
infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.40.0/reachability-metadata.json
rename to
infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.42.0/reachability-metadata.json
index f233479a11a..e2971a9f145 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.40.0/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.calcite/calcite-core/1.42.0/reachability-metadata.json
@@ -326,6 +326,12 @@
},
"type": "org.apache.calcite.linq4j.tree.Primitive"
},
+ {
+ "condition": {
+ "typeReached": "org.apache.calcite.linq4j.tree.Types"
+ },
+ "type": "org.apache.calcite.linq4j.tree.UnsignedType"
+ },
{
"condition": {
"typeReached": "org.apache.calcite.linq4j.tree.Types"
@@ -380,6 +386,18 @@
},
"type":
"org.apache.calcite.rel.metadata.BuiltInMetadata$ExpressionLineage"
},
+ {
+ "condition": {
+ "typeReached": "org.apache.calcite.linq4j.tree.Types"
+ },
+ "type":
"org.apache.calcite.rel.metadata.BuiltInMetadata$FunctionalDependency"
+ },
+ {
+ "condition": {
+ "typeReached": "org.apache.calcite.linq4j.tree.Types"
+ },
+ "type": "org.apache.calcite.rel.metadata.BuiltInMetadata$InputFieldsUsed"
+ },
{
"condition": {
"typeReached": "org.apache.calcite.linq4j.tree.Types"
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index 391dc244613..1a3c4783f49 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -121,12 +121,6 @@
},
"type": "java.io.Serializable"
},
- {
- "condition": {
- "typeReached":
"org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingSphereTransactionManager"
- },
- "type": "java.io.Serializable"
- },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser"
@@ -614,7 +608,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.infra.util.yaml.YamlEngine"
+ "typeReached":
"org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory"
},
"type": "java.sql.Date"
},
@@ -626,7 +620,13 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.mysql.metadata.identifier.MySQLIdentifierCaseRuleProvider"
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierNormalizeEngine"
+ },
+ "type": "java.sql.Statement[]"
+ },
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.infra.database.DatabaseTypeEngine"
},
"type": "java.sql.Statement[]"
},
@@ -662,7 +662,7 @@
},
{
"condition": {
- "typeReached": "org.apache.shardingsphere.infra.util.yaml.YamlEngine"
+ "typeReached":
"org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory"
},
"type": "java.sql.Timestamp"
},
@@ -1396,10 +1396,16 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.clickhouse.database.ClickHouseDatabaseMetaData"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.database.system.SystemDatabase"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.clickhouse.database.system.ClickHouseSystemDatabase"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
@@ -1414,7 +1420,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.firebird.metadata.database.FirebirdDatabaseMetaData"
},
@@ -1444,7 +1450,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.h2.metadata.database.H2DatabaseMetaData"
},
@@ -1460,6 +1466,12 @@
},
"type":
"org.apache.shardingsphere.database.connector.h2.type.H2DatabaseType"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.hive.jdbcurl.HiveJdbcUrlFetcher"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.data.loader.MetaDataLoader"
@@ -1468,10 +1480,16 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.hive.metadata.database.HiveDatabaseMetaData"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.database.system.SystemDatabase"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.hive.metadata.database.system.HiveSystemDatabase"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
@@ -1480,7 +1498,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.mariadb.metadata.database.MariaDBDatabaseMetaData"
},
@@ -1504,7 +1522,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.mysql.metadata.database.MySQLDatabaseMetaData"
},
@@ -1534,7 +1552,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.opengauss.metadata.database.OpenGaussDatabaseMetaData"
},
@@ -1558,10 +1576,16 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.oracle.metadata.database.OracleDatabaseMetaData"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.database.system.SystemDatabase"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.oracle.metadata.database.system.OracleSystemDatabase"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
@@ -1582,7 +1606,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.postgresql.metadata.database.PostgreSQLDatabaseMetaData"
},
@@ -1606,10 +1630,16 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.presto.metadata.database.PrestoDatabaseMetaData"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.database.system.SystemDatabase"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.presto.metadata.database.system.PrestoSystemDatabase"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
@@ -1618,7 +1648,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.sql92.metadata.database.SQL92DatabaseMetaData"
},
@@ -1630,10 +1660,16 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"type":
"org.apache.shardingsphere.database.connector.sql92.sqlserver.metadata.database.SQLServerDatabaseMetaData"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.database.system.SystemDatabase"
+ },
+ "type":
"org.apache.shardingsphere.database.connector.sql92.sqlserver.metadata.database.system.SQLServerSystemDatabase"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
@@ -1724,7 +1760,13 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.mysql.metadata.identifier.MySQLIdentifierCaseRuleProvider"
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.identifier.IdentifierNormalizeEngine"
+ },
+ "type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
+ },
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.infra.database.DatabaseTypeEngine"
},
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
},
@@ -3454,6 +3496,12 @@
},
"type":
"org.apache.shardingsphere.proxy.backend.mysql.state.MySQLProxyStateSupportedSQLProvider"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
+ },
+ "type":
"org.apache.shardingsphere.proxy.backend.opengauss.connector.jdbc.OpenGaussJDBCResultMetadataChecker"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.JDBCBackendStatement"
@@ -3472,6 +3520,12 @@
},
"type":
"org.apache.shardingsphere.proxy.backend.opengauss.response.header.query.OpenGaussQueryHeaderBuilder"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
+ },
+ "type":
"org.apache.shardingsphere.proxy.backend.postgresql.connector.jdbc.PostgreSQLJDBCResultMetadataChecker"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.JDBCBackendStatement"
@@ -5032,7 +5086,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.parser.MySQLLexer",
"methods": [
@@ -5060,7 +5114,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.parser.MySQLParser",
"methods": [
@@ -5074,7 +5128,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.visitor.statement.type.MySQLDALStatementVisitor",
"methods": [
@@ -5102,7 +5156,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.visitor.statement.type.MySQLDDLStatementVisitor",
"methods": [
@@ -5130,7 +5184,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.visitor.statement.type.MySQLDMLStatementVisitor",
"methods": [
@@ -5144,7 +5198,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryPacketExecutor"
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.mysql.command.query.text.query.MySQLComQueryBackendHandlerFactory"
},
"type":
"org.apache.shardingsphere.sql.parser.engine.mysql.visitor.statement.type.MySQLTCLStatementVisitor",
"methods": [
@@ -6082,6 +6136,12 @@
},
"glob": "META-INF/services/java.nio.charset.spi.CharsetProvider"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.mode.repository.standalone.jdbc.sql.JDBCRepositorySQLLoader"
+ },
+ "glob": "META-INF/services/javax.xml.stream.XMLInputFactory"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingSphereTransactionManager"
@@ -6166,6 +6226,12 @@
},
"glob":
"META-INF/services/org.apache.shardingsphere.database.connector.core.checker.DialectDatabasePrivilegeChecker"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeFactory"
+ },
+ "glob":
"META-INF/services/org.apache.shardingsphere.database.connector.core.jdbcurl.DialectJdbcUrlFetcher"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.database.connector.core.metadata.data.loader.MetaDataLoader"
@@ -6174,7 +6240,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.database.connector.core.type.DatabaseTypeRegistry"
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.identifier.DatabaseIdentifierContextFactory"
},
"glob":
"META-INF/services/org.apache.shardingsphere.database.connector.core.metadata.database.metadata.DialectDatabaseMetaData"
},
@@ -6262,12 +6328,6 @@
},
"glob":
"META-INF/services/org.apache.shardingsphere.infra.executor.checker.SQLExecutionChecker"
},
- {
- "condition": {
- "typeReached":
"org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine"
- },
- "glob":
"META-INF/services/org.apache.shardingsphere.infra.executor.sql.hook.SQLExecutionHook"
- },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine"
@@ -6352,6 +6412,12 @@
},
"glob":
"META-INF/services/org.apache.shardingsphere.proxy.backend.connector.AdvancedProxySQLExecutor"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.proxy.frontend.postgresql.command.query.extended.Portal"
+ },
+ "glob":
"META-INF/services/org.apache.shardingsphere.proxy.backend.connector.jdbc.executor.DialectJDBCResultMetadataChecker"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.JDBCBackendStatement"
@@ -7931,4 +7997,4 @@
"glob": "transactions.properties"
}
]
-}
+}
\ No newline at end of file
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.4.2/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.4.2/reachability-metadata.json
deleted file mode 100644
index 0d5ce308bd9..00000000000
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.4.2/reachability-metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "reflection": [
- {
- "condition": {
- "typeReached": "org.mariadb.jdbc.internal.util.DefaultOptions"
- },
- "type": "org.mariadb.jdbc.internal.util.Options",
- "allPublicFields": true
- }
- ]
-}
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.7.14/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.7.14/reachability-metadata.json
new file mode 100644
index 00000000000..22295d8f9d2
--- /dev/null
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.mariadb.jdbc/mariadb-java-client/2.7.14/reachability-metadata.json
@@ -0,0 +1,11 @@
+{
+ "reflection": [
+ {
+ "condition": {
+ "typeReached": "org.mariadb.jdbc.util.DefaultOptions"
+ },
+ "type": "org.mariadb.jdbc.util.Options",
+ "allPublicFields": true
+ }
+ ]
+}
diff --git
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
index b237a406a5c..ee30523d49a 100644
---
a/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
+++
b/mode/type/standalone/repository/provider/jdbc/src/main/java/org/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
@@ -78,7 +78,9 @@ public final class JDBCRepositorySQLLoader {
XMLInputFactory result = XMLInputFactory.newFactory();
result.setProperty(XMLInputFactory.SUPPORT_DTD, false);
result.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES,
false);
- result.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ if (result.isPropertySupported(XMLConstants.ACCESS_EXTERNAL_DTD)) {
+ result.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ }
result.setXMLResolver((publicId, systemId, baseUri, namespace) -> {
throw new XMLStreamException("External XML resources are not
allowed.");
});
diff --git a/test/native/pom.xml b/test/native/pom.xml
index b486dfe45a9..2a318bf79ca 100644
--- a/test/native/pom.xml
+++ b/test/native/pom.xml
@@ -114,12 +114,6 @@
<artifactId>hive-server2-jdbc-driver-thin</artifactId>
<version>${hive-server2-jdbc-driver-thin.version}</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
