Skip to content

Commit

Permalink
Merge pull request #1740 from ClickHouse/pre_0_6_3_release
Browse files Browse the repository at this point in the history
pre 0.6.3 release
  • Loading branch information
chernser authored Jul 19, 2024
2 parents e2cae1c + f32a506 commit a6a8a22
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
required: false

env:
PREFERRED_LTS_VERSION: "23.3"
PREFERRED_LTS_VERSION: "24.3"

jobs:
static:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
cancel-in-progress: true

env:
PREFERRED_LTS_VERSION: "23.3"
PREFERRED_LTS_VERSION: "24.3"
CLICKHOUSE_TEST_VERSIONS: "[]"

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ concurrency:
cancel-in-progress: true

env:
PREFERRED_LTS_VERSION: "23.7"
PREFERRED_LTS_VERSION: "24.3"

jobs:
compile:
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

env:
CHC_BRANCH: "main"
CHC_VERSION: "0.6.2"
CHC_VERSION: "0.6.3"

jobs:
nightly:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
version:
description: "Release version"
required: true
default: "0.6.2-SNAPSHOT"
default: "0.6.3-SNAPSHOT"

jobs:
release:
Expand Down
25 changes: 24 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions examples/client-v2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<name>java-client-examples</name>
<description>Java Client Examples</description>
<url>https://github.com/ClickHouse/clickhouse-java</url>
<inceptionYear>2022</inceptionYear>
<inceptionYear>2024</inceptionYear>

<organization>
<name>ClickHouse, Inc.</name>
Expand Down Expand Up @@ -60,11 +60,11 @@
</repositories>

<properties>
<project.current.year>2023</project.current.year>
<project.current.year>2024</project.current.year>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<clickhouse-java.version>0.6.0-SNAPSHOT</clickhouse-java.version>
<clickhouse-java.version>0.6.3-SNAPSHOT</clickhouse-java.version>
<apache-httpclient.version>5.2.1</apache-httpclient.version>

<compiler-plugin.version>3.8.1</compiler-plugin.version>
Expand Down
6 changes: 3 additions & 3 deletions examples/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@
</repositories>

<properties>
<project.current.year>2023</project.current.year>
<project.current.year>2024</project.current.year>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<clickhouse-java.version>0.6.0</clickhouse-java.version>
<clickhouse-java.version>0.6.3-SNAPSHOT</clickhouse-java.version>
<!-- Nightly snapshot version from https://s01.oss.sonatype.org/content/repositories/snapshots/ or latest from local -->
<!-- <clickhouse-java.version>0.6.0-SNAPSHOT</clickhouse-java.version>-->
<!-- <clickhouse-java.version>0.6.3-SNAPSHOT</clickhouse-java.version>-->

<apache-httpclient.version>5.2.1</apache-httpclient.version>

Expand Down
4 changes: 2 additions & 2 deletions examples/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
</repositories>

<properties>
<project.current.year>2023</project.current.year>
<project.current.year>2024</project.current.year>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<clickhouse-java.version>0.6.0</clickhouse-java.version>
<clickhouse-java.version>0.6.3-SNAPSHOT</clickhouse-java.version>
<hikaricp.version>4.0.3</hikaricp.version>
<apache-httpclient.version>5.2.1</apache-httpclient.version>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</distributionManagement>

<properties>
<revision>0.6.2-SNAPSHOT</revision>
<revision>0.6.3-SNAPSHOT</revision>
<project.current.year>2024</project.current.year>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down

0 comments on commit a6a8a22

Please sign in to comment.