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 5e61d1d9bb1 Remove specializations for Docker Engine v28 on Windows
Server 2025 (#37966)
5e61d1d9bb1 is described below
commit 5e61d1d9bb1a65adc5218116fa3e9fedd0a1a001
Author: Ling Hengqian <[email protected]>
AuthorDate: Fri Feb 6 09:09:49 2026 +0800
Remove specializations for Docker Engine v28 on Windows Server 2025 (#37966)
---
.../graalvm-native-image/development/_index.cn.md | 4 +-
.../graalvm-native-image/development/_index.en.md | 4 +-
.../startup/graalvm-native-image.cn.md | 2 +-
.../startup/graalvm-native-image.en.md | 2 +-
.../HikariCP/4.0.3/reachability-metadata.json | 191 +--------------------
.../reachability-metadata.json | 24 +--
.../resources/test-native/ps1/config-rdctl.ps1 | 2 +-
.../test-native/yaml/jdbc/databases/presto.yaml | 3 +
8 files changed, 17 insertions(+), 215 deletions(-)
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
index b0169df0527..ce2160888c3 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.cn.md
@@ -120,13 +120,13 @@ wsl --install
并设置使用 `dockerd(moby)` 的 `Container Engine`。
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# 打开新的 PowerShell 7 终端
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
@@ -148,7 +148,6 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
可在 PowerShell 7 执行如下命令，
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# 打开新的 PowerShell 7 终端
@@ -156,6 +155,7 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
diff --git
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
index adcc85c2cd9..ea0b179f027 100644
---
a/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/development/_index.en.md
@@ -125,13 +125,13 @@ After enabling WSL2, download and install
`rancher-sandbox/rancher-desktop` usin
and configure it to use the `dockerd(moby)` `Container Engine`.
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# Open a new PowerShell 7 terminal
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
@@ -153,7 +153,6 @@ they will need to uninstall Docker Engine using the script
provided by Microsoft
You can execute the following command in PowerShell 7:
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# Open a new PowerShell 7 terminal
@@ -161,6 +160,7 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
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 33bf3db5c99..1078c1e29a6 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
@@ -199,13 +199,13 @@ wsl --install
并设置使用 `dockerd(moby)` 的 `Container Engine`。
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# 打开新的 PowerShell 7 终端
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
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 6371ef85660..a6404b54970 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
@@ -203,13 +203,13 @@ After enabling WSL2, download and install
`rancher-sandbox/rancher-desktop` usin
and configure `dockerd(moby)` to use the `Container Engine`.
```shell
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
# Open a new PowerShell 7 terminal
rdctl start --application.start-in-background --container-engine.name=moby
--kubernetes.enabled=false
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/com.zaxxer/HikariCP/4.0.3/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/com.zaxxer/HikariCP/4.0.3/reachability-metadata.json
index 9226cb019e4..10dc42c5cb3 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/com.zaxxer/HikariCP/4.0.3/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/com.zaxxer/HikariCP/4.0.3/reachability-metadata.json
@@ -5,196 +5,7 @@
"typeReached": "com.zaxxer.hikari.HikariDataSource"
},
"type": "com.zaxxer.hikari.HikariConfig",
- "methods": [
- {
- "name": "getCatalog",
- "parameterTypes": []
- },
- {
- "name": "getConnectionInitSql",
- "parameterTypes": []
- },
- {
- "name": "getConnectionTestQuery",
- "parameterTypes": []
- },
- {
- "name": "getConnectionTimeout",
- "parameterTypes": []
- },
- {
- "name": "getDataSourceClassName",
- "parameterTypes": []
- },
- {
- "name": "getDataSourceJNDI",
- "parameterTypes": []
- },
- {
- "name": "getDataSourceProperties",
- "parameterTypes": []
- },
- {
- "name": "getDriverClassName",
- "parameterTypes": []
- },
- {
- "name": "getExceptionOverrideClassName",
- "parameterTypes": []
- },
- {
- "name": "getHealthCheckProperties",
- "parameterTypes": []
- },
- {
- "name": "getIdleTimeout",
- "parameterTypes": []
- },
- {
- "name": "getInitializationFailTimeout",
- "parameterTypes": []
- },
- {
- "name": "getJdbcUrl",
- "parameterTypes": []
- },
- {
- "name": "getKeepaliveTime",
- "parameterTypes": []
- },
- {
- "name": "getLeakDetectionThreshold",
- "parameterTypes": []
- },
- {
- "name": "getMaxLifetime",
- "parameterTypes": []
- },
- {
- "name": "getMaximumPoolSize",
- "parameterTypes": []
- },
- {
- "name": "getMinimumIdle",
- "parameterTypes": []
- },
- {
- "name": "getPassword",
- "parameterTypes": []
- },
- {
- "name": "getPoolName",
- "parameterTypes": []
- },
- {
- "name": "getSchema",
- "parameterTypes": []
- },
- {
- "name": "getTransactionIsolation",
- "parameterTypes": []
- },
- {
- "name": "getUsername",
- "parameterTypes": []
- },
- {
- "name": "getValidationTimeout",
- "parameterTypes": []
- },
- {
- "name": "isAllowPoolSuspension",
- "parameterTypes": []
- },
- {
- "name": "isAutoCommit",
- "parameterTypes": []
- },
- {
- "name": "isIsolateInternalQueries",
- "parameterTypes": []
- },
- {
- "name": "isReadOnly",
- "parameterTypes": []
- },
- {
- "name": "isRegisterMbeans",
- "parameterTypes": []
- },
- {
- "name": "setConnectionTimeout",
- "parameterTypes": [
- "long"
- ]
- },
- {
- "name": "setDataSourceProperties",
- "parameterTypes": [
- "java.util.Properties"
- ]
- },
- {
- "name": "setDriverClassName",
- "parameterTypes": [
- "java.lang.String"
- ]
- },
- {
- "name": "setIdleTimeout",
- "parameterTypes": [
- "long"
- ]
- },
- {
- "name": "setJdbcUrl",
- "parameterTypes": [
- "java.lang.String"
- ]
- },
- {
- "name": "setKeepaliveTime",
- "parameterTypes": [
- "long"
- ]
- },
- {
- "name": "setMaxLifetime",
- "parameterTypes": [
- "long"
- ]
- },
- {
- "name": "setMaximumPoolSize",
- "parameterTypes": [
- "int"
- ]
- },
- {
- "name": "setMinimumIdle",
- "parameterTypes": [
- "int"
- ]
- },
- {
- "name": "setPassword",
- "parameterTypes": [
- "java.lang.String"
- ]
- },
- {
- "name": "setReadOnly",
- "parameterTypes": [
- "boolean"
- ]
- },
- {
- "name": "setUsername",
- "parameterTypes": [
- "java.lang.String"
- ]
- }
- ]
+ "allPublicMethods": true
},
{
"condition": {
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 0ee3e37d22c..f15b778bef3 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
@@ -436,6 +436,12 @@
},
"type": "java.lang.Readable"
},
+ {
+ "condition": {
+ "typeReached":
"org.apache.shardingsphere.infra.metadata.database.schema.manager.SystemSchemaManager"
+ },
+ "type": "java.lang.Record"
+ },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.proxy.frontend.ShardingSphereProxy"
@@ -496,18 +502,6 @@
},
"type": "java.lang.Throwable"
},
- {
- "condition": {
- "typeReached":
"org.apache.shardingsphere.transaction.base.seata.at.SeataATShardingSphereTransactionManager"
- },
- "type": "java.lang.Throwable",
- "methods": [
- {
- "name": "getSuppressed",
- "parameterTypes": []
- }
- ]
- },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.infra.expr.groovy.GroovyInlineExpressionParser"
@@ -9684,12 +9678,6 @@
},
"glob": "META-INF/services/java.nio.charset.spi.CharsetProvider"
},
- {
- "condition": {
- "typeReached":
"org.apache.shardingsphere.mode.repository.standalone.jdbc.JDBCRepository"
- },
- "glob": "META-INF/services/java.time.zone.ZoneRulesProvider"
- },
{
"condition": {
"typeReached":
"org.apache.shardingsphere.mode.repository.standalone.jdbc.sql.JDBCRepositorySQLLoader"
diff --git a/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
b/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
index 68b13110f05..e0a99ed3189 100644
--- a/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
+++ b/test/native/src/test/resources/test-native/ps1/config-rdctl.ps1
@@ -19,7 +19,6 @@
# This file is only used in the PowerShell 7 of ShardingSphere in GitHub
Actions environment and should not be executed manually in a development
environment.
# Background information can be found at
https://github.com/apache/shardingsphere/pull/35905 .
-[Environment]::SetEnvironmentVariable('DOCKER_API_VERSION','1.44','Machine')
iex "& { $(irm
https://raw.githubusercontent.com/microsoft/Windows-Containers/refs/heads/Main/helpful_tools/Install-DockerCE/uninstall-docker-ce.ps1)
} -Force"
irm
https://raw.githubusercontent.com/jazzdelightsme/WingetPathUpdater/v1.2/WingetPathUpdaterInstall.ps1
| iex
winget install --id SUSE.RancherDesktop --source winget --skip-dependencies
@@ -28,6 +27,7 @@ rdctl start --application.start-in-background
--container-engine.name=moby --kub
@'
{
+ "min-api-version": "1.41",
"features": {
"containerd-snapshotter": true
},
diff --git
a/test/native/src/test/resources/test-native/yaml/jdbc/databases/presto.yaml
b/test/native/src/test/resources/test-native/yaml/jdbc/databases/presto.yaml
index 7e9ef8b8e7a..cb50c5b35d9 100644
--- a/test/native/src/test/resources/test-native/yaml/jdbc/databases/presto.yaml
+++ b/test/native/src/test/resources/test-native/yaml/jdbc/databases/presto.yaml
@@ -58,6 +58,9 @@ rules:
keyGenerators:
snowflake:
type: SNOWFLAKE
+ props:
+ # TODO This is to avoid `Algorithm 'SnowflakeKeyGenerateAlgorithm'
execute failed, reason is: Clock is moving backwards, last time is
1770301289456 milliseconds, current time is 1770301287565 milliseconds..`, this
requires investigating what is happening inside Presto
+ max-tolerate-time-difference-milliseconds: 1891
auditors:
sharding_key_required_auditor:
type: DML_SHARDING_CONDITIONS
