Fix integration issues with clickhouse-server 25.10#37421
Merged
strongduanmu merged 1 commit intoapache:masterfrom Dec 18, 2025
Merged
Fix integration issues with clickhouse-server 25.10#37421strongduanmu merged 1 commit intoapache:masterfrom
25.10#37421strongduanmu merged 1 commit intoapache:masterfrom
Conversation
52d5a8b to
116bc94
Compare
There was a problem hiding this comment.
Pull request overview
This PR addresses integration issues with ClickHouse server 25.10 by upgrading key dependencies and refactoring the codebase to accommodate breaking changes in ClickHouse JDBC Driver V2.
Key changes:
- Bumped Antlr4 from
4.10.1to4.13.2to align with ClickHouse JDBC Driver requirements - Upgraded ClickHouse JDBC Driver from
0.6.3:httpto0.9.4:all(classifier changed due to upstream artifact restructuring) - Updated testcontainers-java from
1.21.3to2.0.1with artifact naming changes to address JUnit warnings
Reviewed changes
Copilot reviewed 27 out of 27 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
pom.xml |
Updated Antlr4 and ClickHouse JDBC versions in root POM |
test/pom.xml |
Bumped testcontainers version to 2.0.1 |
test/native/pom.xml |
Updated testcontainers artifact names and changed ClickHouse JDBC classifier |
test/e2e/operation/pipeline/pom.xml |
Updated testcontainers artifact naming convention |
distribution/proxy/pom.xml |
Changed ClickHouse JDBC classifier from http to all |
distribution/proxy-native/pom.xml |
Changed ClickHouse JDBC classifier from http to all |
test/native/src/test/resources/test-native/yaml/jdbc/databases/clickhouse.yaml |
Updated ClickHouse server version to 25.10.3.100 |
test/native/src/test/resources/test-native/sql/clickhouse-init.sql |
Changed address_id type from BIGINT to Int64 for ClickHouse compatibility |
test/native/src/test/resources/META-INF/native-image/shardingsphere-test-native/reachability-metadata.json |
Updated typeReached condition for SQL resource glob pattern |
test/native/src/test/java/org/apache/shardingsphere/test/natived/jdbc/databases/SQLServerTest.java |
Removed SQL Server logging workaround no longer needed with testcontainers 2.0.1 |
test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/OrderRepository.java |
Refactored insert methods to separate generated keys handling |
test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/repository/OrderItemRepository.java |
Added insertWithoutGeneratedKeys and selectAllLoose methods for ClickHouse |
test/native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java |
Refactored test methods to handle ClickHouse's lack of RETURN_GENERATED_KEYS support |
test/native/native-image-filter/extra-filter.json |
Reorganized filter rules for better clarity |
infra/reachability-metadata/src/main/resources/META-INF/native-image/org.testcontainers/testcontainers-junit-jupiter/2.0.1/reachability-metadata.json |
Added GraalVM reachability metadata for testcontainers 2.0.1 |
infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reachability-metadata.json |
Updated reachability metadata with new GraalVM internal classes |
infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json |
Added field and service metadata for updated dependencies |
infra/reachability-metadata/src/main/resources/META-INF/native-image/com.github.docker-java/docker-java-api/3.6.0/reachability-metadata.json |
Added comprehensive GraalVM reachability metadata for docker-java-api |
infra/reachability-metadata/src/main/resources/META-INF/native-image/com.clickhouse/clickhouse-jdbc/0.9.4-all/reachability-metadata.json |
Added reachability metadata for ClickHouse JDBC Driver 0.9.4 |
infra/reachability-metadata/src/main/resources/META-INF/native-image/com.clickhouse/clickhouse-jdbc/0.6.3/reachability-metadata.json |
Removed obsolete metadata for version 0.6.3 |
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md |
Documented INNER JOIN syntax parsing limitations |
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md |
Documented INNER JOIN syntax parsing limitations (Chinese) |
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md |
Updated ClickHouse integration docs with new version requirements and limitations |
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md |
Updated ClickHouse integration docs (Chinese) |
docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.en.md |
Removed obsolete ClickHouse http classifier documentation |
docs/document/content/user-manual/shardingsphere-jdbc/graalvm-native-image/_index.cn.md |
Removed obsolete ClickHouse http classifier documentation (Chinese) |
distribution/proxy/src/main/release-docs/LICENSE |
Updated Antlr4 version reference in license file |
Comments suppressed due to low confidence (1)
test/native/pom.xml:150
- The dependency
org.firebirdsql:firebird-testcontainers-javais duplicated. Lines 139-144 and 145-150 both declare the exact same dependency with the same groupId, artifactId, version, and scope. Remove one of these duplicate declarations.
<dependency>
<groupId>org.firebirdsql</groupId>
<artifactId>firebird-testcontainers-java</artifactId>
<version>${firebird-testcontainers-java.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.firebirdsql</groupId>
<artifactId>firebird-testcontainers-java</artifactId>
<version>${firebird-testcontainers-java.version}</version>
<scope>test</scope>
</dependency>
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.en.md
Outdated
Show resolved
Hide resolved
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/hiveserver2/_index.cn.md
Outdated
Show resolved
Hide resolved
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.en.md
Outdated
Show resolved
Hide resolved
docs/document/content/user-manual/shardingsphere-jdbc/optional-plugins/clickhouse/_index.cn.md
Outdated
Show resolved
Hide resolved
...native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
Outdated
Show resolved
Hide resolved
...native/src/test/java/org/apache/shardingsphere/test/natived/commons/TestShardingService.java
Outdated
Show resolved
Hide resolved
116bc94 to
a9505b7
Compare
strongduanmu
approved these changes
Dec 18, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For #37406 .
Changes proposed in this pull request:
4.13.2to fix integration issues with clickhouse-server25.10. This is consistent with ClickHouse JDBC Driver V2com.clickhouse:clickhouse-jdbc:0.9.4-all.0.9.4-all.testcontainers-javato2.0.1. This is mainly to prevent JUnit from continuing to throw warnings, see ImplementAutoCloseableforTestcontainersExtension$StoreAdaptertestcontainers/testcontainers-java#10529. Support for testcontainers-java2.0.2+has been blocked by [Bug]: Can't overwrite Docker socket path with 2.0.2 / Podman stopped working testcontainers/testcontainers-java#11254. testcontainers-java2.0.2+at least breaks Rancher Desktop in the GitHub Actions Runner for Windows Server 2025.Response Column Renamingfeature, ShardingSphere's distributed sequence feature is now unavailable for ClickHouse integration. This is related to INSERT ... RETURNING clause ClickHouse/ClickHouse#21697 and https://clickhouse.com/docs/integrations/language-clients/java/jdbc#changes-from-07x .INNER JOINsyntax in HiveServer2 and ClickHouse.httpclassifier in the ClickHouse JDBC Driver has been removed. See https://github.com/ClickHouse/clickhouse-java/tree/v0.9.4?tab=readme-ov-file#artifact-changes-in-090-june .com.clickhouse:clickhouse-jdbc:0.9.4-all,com.github.docker-java:docker-java-api:3.6.0,org.testcontainers:testcontainers-junit-jupiter:2.0.1.Before committing this PR, I'm sure that I have checked the following options:
./mvnw clean install -B -T1C -Dmaven.javadoc.skip -Dmaven.jacoco.skip -e.