From d0c87b4c81e1f115658473a8795122add5436c08 Mon Sep 17 00:00:00 2001 From: mzitnik Date: Fri, 3 Oct 2025 08:13:54 +0300 Subject: [PATCH 1/2] Adding tests coverage for 2.1.0 --- .github/workflows/integration-tests.yaml | 2 +- README.md | 1 + flink-connector-clickhouse-2.0.0/build.gradle.kts | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index b1d9270..86e0832 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: clickhouse: [ "23.7", "24.3", "latest", "cloud" ] - flink: [ "1.17.2", "1.18.1", "1.19.3", "1.20.2", "2.0.0", "latest"] + flink: [ "1.17.2", "1.18.1", "1.19.3", "1.20.2", "2.0.0", "2.1.0" , "latest"] steps: - name: Check for Cloud Credentials id: check-cloud-credentials diff --git a/README.md b/README.md index 0413f12..b1e3fab 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ The connector supports two main Apache Flink APIs: | Version | Dependency | ClickHouse Client Version | Required Java | |---------|----------------------------------|---------------------------|---------------| | latest | flink-connector-clickhouse-2.0.0 | 0.9.1 | Java 17+ | +| 2.0.1 | flink-connector-clickhouse-2.0.0 | 0.9.1 | Java 17+ | | 2.0.0 | flink-connector-clickhouse-2.0.0 | 0.9.1 | Java 17+ | | 1.20.2 | flink-connector-clickhouse-1.17 | 0.9.1 | Java 11+ | | 1.19.3 | flink-connector-clickhouse-1.17 | 0.9.1 | Java 11+ | diff --git a/flink-connector-clickhouse-2.0.0/build.gradle.kts b/flink-connector-clickhouse-2.0.0/build.gradle.kts index 35085d1..4ac9c41 100644 --- a/flink-connector-clickhouse-2.0.0/build.gradle.kts +++ b/flink-connector-clickhouse-2.0.0/build.gradle.kts @@ -1,9 +1,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar /* - * Build configuration for Flink 2.0.0 ClickHouse Connector + * Build configuration for Flink 2.0.0+ ClickHouse Connector * - * This module provides Apache Flink 2.0.0 compatibility for the ClickHouse connector. + * This module provides Apache Flink 2.0.0+ compatibility for the ClickHouse connector. * It depends on the flink-connector-clickhouse-base module for shared functionality. */ @@ -25,7 +25,7 @@ repositories { } extra.apply { - set("flinkVersion", "2.0.0") + set("flinkVersion", "2.0.0") // the default still will be 2.0.0 since it is more popular currently set("log4jVersion","2.17.2") set("testContainersVersion", "1.21.0") set("byteBuddyVersion", "1.17.5") From 683d65df798b79156288a3aee816e6483509db34 Mon Sep 17 00:00:00 2001 From: mzitnik Date: Fri, 3 Oct 2025 08:18:32 +0300 Subject: [PATCH 2/2] Fix tests version pickup --- .../test/java/com/clickhouse/flink/integration/FlinkTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-connector-clickhouse-integration/src/test/java/com/clickhouse/flink/integration/FlinkTests.java b/flink-connector-clickhouse-integration/src/test/java/com/clickhouse/flink/integration/FlinkTests.java index 62e464e..fcb42f9 100644 --- a/flink-connector-clickhouse-integration/src/test/java/com/clickhouse/flink/integration/FlinkTests.java +++ b/flink-connector-clickhouse-integration/src/test/java/com/clickhouse/flink/integration/FlinkTests.java @@ -41,7 +41,7 @@ private String getRoot() throws Exception { } private String exampleSubFolder(String flinkVersion) { - if (flinkVersion.equalsIgnoreCase("latest") || flinkVersion.startsWith("2.0")) + if (flinkVersion.equalsIgnoreCase("latest") || flinkVersion.startsWith("2.")) return "flink-v2"; return "flink-v1.7"; }