Skip to content

Commit 305d288

Browse files
authored
Fix nativeTest under GraalVM Native Image with clickhouse-server 25.12 (#37440)
1 parent e11281f commit 305d288

10 files changed

Lines changed: 107 additions & 53 deletions

File tree

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
2929
<groupId>com.clickhouse</groupId>
3030
<artifactId>clickhouse-jdbc</artifactId>
3131
<classifier>all</classifier>
32-
<version>0.9.4</version>
32+
<version>0.9.5</version>
3333
</dependency>
3434
</dependencies>
3535
```
@@ -43,7 +43,7 @@ ShardingSphere 对 ClickHouse JDBC Driver 的支持位于可选模块中。
4343
```yaml
4444
services:
4545
clickhouse-server:
46-
image: clickhouse/clickhouse-server:25.10.3.100
46+
image: clickhouse/clickhouse-server:25.12.1.649
4747
environment:
4848
CLICKHOUSE_SKIP_USER_SETUP: "1"
4949
ports:

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ the possible Maven dependencies are as follows,
2929
<groupId>com.clickhouse</groupId>
3030
<artifactId>clickhouse-jdbc</artifactId>
3131
<classifier>all</classifier>
32-
<version>0.9.4</version>
32+
<version>0.9.5</version>
3333
</dependency>
3434
</dependencies>
3535
```
@@ -43,7 +43,7 @@ Write a Docker Compose file to start ClickHouse.
4343
```yaml
4444
services:
4545
clickhouse-server:
46-
image: clickhouse/clickhouse-server:25.10.3.100
46+
image: clickhouse/clickhouse-server:25.12.1.649
4747
environment:
4848
CLICKHOUSE_SKIP_USER_SETUP: "1"
4949
ports:

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ShardingSphere 对 Firebird JDBC Driver 的支持位于可选模块中。
2828
<dependency>
2929
<groupId>org.firebirdsql.jdbc</groupId>
3030
<artifactId>jaybird</artifactId>
31-
<version>5.0.6.java8</version>
31+
<version>5.0.10.java8</version>
3232
</dependency>
3333
</dependencies>
3434
```
@@ -58,7 +58,7 @@ services:
5858
通过第三方工具在 Firebird 内创建业务库。
5959
6060
包括 DBeaver Community 在内的第三方工具无法为 Firebird 创建 databases,
61-
下以 Maven 模块 `org.firebirdsql.jdbc:jaybird:5.0.6.java8` 的 Java API 为例,
61+
下以 Maven 模块 `org.firebirdsql.jdbc:jaybird:5.0.10.java8` 的 Java API 为例,
6262

6363
```java
6464
import org.firebirdsql.management.FBManager;

docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/firebird/_index.en.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ the possible Maven dependencies are as follows,
2828
<dependency>
2929
<groupId>org.firebirdsql.jdbc</groupId>
3030
<artifactId>jaybird</artifactId>
31-
<version>5.0.6.java8</version>
31+
<version>5.0.10.java8</version>
3232
</dependency>
3333
</dependencies>
3434
```
@@ -58,7 +58,7 @@ services:
5858
Create some business databases in Firebird through third-party tools.
5959
6060
Third-party tools including DBeaver Community cannot create databases for Firebird.
61-
Below is the Java API of the Maven module `org.firebirdsql.jdbc:jaybird:5.0.6.java8` as an example.
61+
Below is the Java API of the Maven module `org.firebirdsql.jdbc:jaybird:5.0.10.java8` as an example.
6262

6363
```java
6464
import org.firebirdsql.management.FBManager;

infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,12 +2493,6 @@
24932493
},
24942494
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
24952495
},
2496-
{
2497-
"condition": {
2498-
"typeReached": "org.apache.shardingsphere.proxy.backend.connector.jdbc.datasource.JDBCBackendDataSource"
2499-
},
2500-
"type": "org.apache.shardingsphere.driver.ShardingSphereDriver"
2501-
},
25022496
{
25032497
"condition": {
25042498
"typeReached": "org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLUpdateProxyBackendHandler"

mvnw

Lines changed: 43 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mvnw.cmd

Lines changed: 48 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<logback.version>1.2.13</logback.version>
115115
<commons-logging.version>1.2</commons-logging.version>
116116

117-
<lombok.version>1.18.38</lombok.version>
117+
<lombok.version>1.18.42</lombok.version>
118118
<jsr305.version>3.0.2</jsr305.version>
119119
<immutables.version>2.10.1</immutables.version>
120120

@@ -124,11 +124,11 @@
124124
<h2.version>2.2.224</h2.version>
125125
<opengauss.version>3.1.0-og</opengauss.version>
126126
<mariadb-java-client.version>2.4.2</mariadb-java-client.version>
127-
<clickhouse-jdbc.version>0.9.4</clickhouse-jdbc.version>
127+
<clickhouse-jdbc.version>0.9.5</clickhouse-jdbc.version>
128128
<hive-jdbc.version>4.0.1</hive-jdbc.version>
129129
<hive-server2-jdbc-driver-thin.version>1.8.2</hive-server2-jdbc-driver-thin.version>
130130
<presto.version>0.296</presto.version>
131-
<jaybird.version>5.0.6.java8</jaybird.version>
131+
<jaybird.version>5.0.10.java8</jaybird.version>
132132

133133
<hikari-cp.version>4.0.3</hikari-cp.version>
134134

test/native/src/test/resources/test-native/yaml/jdbc/databases/clickhouse.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ dataSources:
1919
ds_0:
2020
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
2121
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
22-
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_0?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
22+
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_0?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
2323
ds_1:
2424
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
2525
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
26-
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_1?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
26+
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_1?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
2727
ds_2:
2828
dataSourceClassName: com.zaxxer.hikari.HikariDataSource
2929
driverClassName: org.testcontainers.jdbc.ContainerDatabaseDriver
30-
jdbcUrl: jdbc:tc:clickhouse:25.10.3.100:///demo_ds_2?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
30+
jdbcUrl: jdbc:tc:clickhouse:25.12.1.649:///demo_ds_2?TC_INITSCRIPT=test-native/sql/clickhouse-init.sql
3131

3232
rules:
3333
- !SHARDING

0 commit comments

Comments
 (0)