Skip to content

Fix integration issues with clickhouse-server 25.10#37421

Merged
strongduanmu merged 1 commit intoapache:masterfrom
linghengqian:antlr4-bump
Dec 18, 2025
Merged

Fix integration issues with clickhouse-server 25.10#37421
strongduanmu merged 1 commit intoapache:masterfrom
linghengqian:antlr4-bump

Conversation

@linghengqian
Copy link
Member

@linghengqian linghengqian commented Dec 18, 2025

For #37406 .

Changes proposed in this pull request:


Before committing this PR, I'm sure that I have checked the following options:

  • My code follows the code of conduct of this project.
  • I have self-reviewed the commit code.
  • I have (or in comment I request) added corresponding labels for the pull request.
  • I have passed maven check locally : ./mvnw clean install -B -T1C -Dmaven.javadoc.skip -Dmaven.jacoco.skip -e.
  • I have made corresponding changes to the documentation.
  • I have added corresponding unit tests for my changes.
  • I have updated the Release Notes of the current development version. For more details, see Update Release Note

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.1 to 4.13.2 to align with ClickHouse JDBC Driver requirements
  • Upgraded ClickHouse JDBC Driver from 0.6.3:http to 0.9.4:all (classifier changed due to upstream artifact restructuring)
  • Updated testcontainers-java from 1.21.3 to 2.0.1 with 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-java is 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.

@linghengqian linghengqian marked this pull request as ready for review December 18, 2025 07:45
@linghengqian linghengqian added this to the 5.5.3 milestone Dec 18, 2025
@strongduanmu strongduanmu merged commit 73e016f into apache:master Dec 18, 2025
148 checks passed
@linghengqian linghengqian deleted the antlr4-bump branch December 18, 2025 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

db: ClickHouse in: proxy native type: dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants