From a484fef4f02cfa962710a0e0242e4d5e0e103e5c Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Fri, 19 Jul 2024 12:04:26 -0700 Subject: [PATCH 1/2] pre 0.6.3 release --- .github/workflows/analysis.yml | 2 +- .github/workflows/build-template.yml | 2 +- .github/workflows/build.yml | 8 ++++---- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- CHANGELOG.md | 25 ++++++++++++++++++++++++- examples/client-v2/pom.xml | 4 ++-- examples/client/pom.xml | 8 ++++---- examples/jdbc/pom.xml | 6 +++--- pom.xml | 4 ++-- 10 files changed, 43 insertions(+), 20 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index a33b1aa2e..b8277ec61 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -28,7 +28,7 @@ on: required: false env: - PREFERRED_LTS_VERSION: "23.3" + PREFERRED_LTS_VERSION: "24.3" jobs: static: diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml index db98f702f..49eac2f21 100644 --- a/.github/workflows/build-template.yml +++ b/.github/workflows/build-template.yml @@ -7,7 +7,7 @@ concurrency: cancel-in-progress: true env: - PREFERRED_LTS_VERSION: "23.3" + PREFERRED_LTS_VERSION: "24.3" CLICKHOUSE_TEST_VERSIONS: "[]" jobs: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23d8d5f6f..9bbd5411b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ concurrency: cancel-in-progress: true env: - PREFERRED_LTS_VERSION: "23.7" + PREFERRED_LTS_VERSION: "24.3" jobs: compile: @@ -179,7 +179,7 @@ jobs: matrix: # most recent LTS releases as well as latest stable builds # https://github.com/ClickHouse/ClickHouse/pulls?q=is%3Aopen+is%3Apr+label%3Arelease - clickhouse: ["22.8", "23.3", "23.7", "latest"] + clickhouse: ["23.8", "24.3", "24.6", "latest"] fail-fast: false timeout-minutes: 15 name: Java client + CH ${{ matrix.clickhouse }} @@ -234,7 +234,7 @@ jobs: needs: compile strategy: matrix: - clickhouse: ["22.8", "23.3", "23.7", "latest"] + clickhouse: ["23.8", "24.3", "24.6", "latest"] # here http, http_client and apache_http_client represent different value of http_connection_provider protocol: ["http", "http_client", "apache_http_client", "grpc"] fail-fast: false @@ -293,7 +293,7 @@ jobs: needs: compile strategy: matrix: - clickhouse: ["22.8", "23.3", "23.7", "latest"] + clickhouse: ["23.8", "24.3", "24.6", "latest"] # grpc is not fully supported, and http_client and apache_http_client do not work in CI environment(due to limited threads?) protocol: ["http"] r2dbc: ["1.0.0.RELEASE", "0.9.1.RELEASE"] diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2603bc274..4188b6c44 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -12,7 +12,7 @@ on: env: CHC_BRANCH: "main" - CHC_VERSION: "0.6.2" + CHC_VERSION: "0.6.3" jobs: nightly: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe896d524..a8e5923bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: version: description: "Release version" required: true - default: "0.6.2-SNAPSHOT" + default: "0.6.3-SNAPSHOT" jobs: release: diff --git a/CHANGELOG.md b/CHANGELOG.md index 639c7685b..20e639a95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,27 @@ -## Latest +## Latest + +## 0.6.3 + +### Important Changes +- [Client-V1] Changed how `User-Agent` string is generated. Now `ClickHouse-JavaClient` portion is appended in all cases. +It is still possible to set custom product name that will be the first part in `User-Agent` value. +(https://github.com/ClickHouse/clickhouse-java/issues/1698) + +### New Features +- [Client-V1/Apache HTTP] Retry on NoHttpResponseException in Apache HTTP client. +Should be used with causes because it is not always possible to resend request body. +Behaviour is controlled by `com.clickhouse.client.http.config.ClickHouseHttpOption#AHC_RETRY_ON_FAILURE`. +Works only for Apache HTTP client because based on its specific behavior(https://github.com/ClickHouse/clickhouse-java/pull/1721) +- [Client-V1/Apache HTTP] Connection validation before sending request. +Behaviour is controlled by `com.clickhouse.client.http.config.ClickHouseHttpOption#AHC_VALIDATE_AFTER_INACTIVITY`. +By default, connection is validated after being in the pool for 5 seconds. (https://github.com/ClickHouse/clickhouse-java/pull/1722) + +### Bug Fixes +- [Client-V2] Fix parsing endpoint URL to detect HTTPs (https://github.com/ClickHouse/clickhouse-java/issues/1718) +- [Client-V2] Fix handling asynchronous operations. Less extra threads created now. (https://github.com/ClickHouse/clickhouse-java/issues/1691) +- [Client-V2] Fix way of how settings are validated to let unsupported options to be added (https://github.com/ClickHouse/clickhouse-java/issues/1691) +- [Client-V1] Fix getting `localhost` effective IP address (https://github.com/ClickHouse/clickhouse-java/issues/1729) +- [Client-V2] Make client instance closeable to free underlying resource (https://github.com/ClickHouse/clickhouse-java/pull/1733) ## 0.6.2 diff --git a/examples/client-v2/pom.xml b/examples/client-v2/pom.xml index 69c5b85d4..2678f3925 100644 --- a/examples/client-v2/pom.xml +++ b/examples/client-v2/pom.xml @@ -60,11 +60,11 @@ - 2023 + 2024 UTF-8 UTF-8 - 0.6.0-SNAPSHOT + 0.6.3-SNAPSHOT 5.2.1 3.8.1 diff --git a/examples/client/pom.xml b/examples/client/pom.xml index b35257930..2f5628434 100644 --- a/examples/client/pom.xml +++ b/examples/client/pom.xml @@ -12,7 +12,7 @@ java-client-examples Java Client Examples https://github.com/ClickHouse/clickhouse-java - 2022 + 2024 ClickHouse, Inc. @@ -62,13 +62,13 @@ - 2023 + 2024 UTF-8 UTF-8 - 0.6.0 + 0.6.3-SNAPSHOT - + 5.2.1 diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml index deb8297e3..115bef4bd 100644 --- a/examples/jdbc/pom.xml +++ b/examples/jdbc/pom.xml @@ -12,7 +12,7 @@ JDBC Examples JDBC Examples https://github.com/ClickHouse/clickhouse-java - 2022 + 2024 ClickHouse, Inc. @@ -62,11 +62,11 @@ - 2023 + 2024 UTF-8 UTF-8 - 0.6.0 + 0.6.3-SNAPSHOT 4.0.3 5.2.1 diff --git a/pom.xml b/pom.xml index 4608022e0..265ea1582 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ clickhouse-java Java libraries for ClickHouse https://github.com/ClickHouse/clickhouse-java - 2015 + 2024 ClickHouse, Inc. @@ -85,7 +85,7 @@ - 0.6.2-SNAPSHOT + 0.6.3-SNAPSHOT 2024 UTF-8 UTF-8 From f32a506f46e38ed2bded1f6b29ef2e028e627b3b Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Fri, 19 Jul 2024 12:21:39 -0700 Subject: [PATCH 2/2] fix inceptionYear --- examples/client-v2/pom.xml | 2 +- examples/client/pom.xml | 2 +- examples/jdbc/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/client-v2/pom.xml b/examples/client-v2/pom.xml index 2678f3925..7fb83672d 100644 --- a/examples/client-v2/pom.xml +++ b/examples/client-v2/pom.xml @@ -12,7 +12,7 @@ java-client-examples Java Client Examples https://github.com/ClickHouse/clickhouse-java - 2022 + 2024 ClickHouse, Inc. diff --git a/examples/client/pom.xml b/examples/client/pom.xml index 2f5628434..87a4b4f89 100644 --- a/examples/client/pom.xml +++ b/examples/client/pom.xml @@ -12,7 +12,7 @@ java-client-examples Java Client Examples https://github.com/ClickHouse/clickhouse-java - 2024 + 2022 ClickHouse, Inc. diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml index 115bef4bd..78ed45067 100644 --- a/examples/jdbc/pom.xml +++ b/examples/jdbc/pom.xml @@ -12,7 +12,7 @@ JDBC Examples JDBC Examples https://github.com/ClickHouse/clickhouse-java - 2024 + 2022 ClickHouse, Inc. diff --git a/pom.xml b/pom.xml index 265ea1582..7d4a69b83 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ clickhouse-java Java libraries for ClickHouse https://github.com/ClickHouse/clickhouse-java - 2024 + 2015 ClickHouse, Inc.