Skip to content

Commit abcdfcc

Browse files
committed
Merge branch 'main' into clientv2_pojo_deserializers
2 parents 9e03ba4 + f3a4ab8 commit abcdfcc

File tree

8 files changed

+236
-94
lines changed

8 files changed

+236
-94
lines changed

.github/workflows/analysis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ jobs:
5454
uses: actions/setup-java@v4
5555
with:
5656
distribution: "temurin"
57-
java-version: |
58-
8
59-
17
57+
java-version: 17
6058
cache: "maven"
6159
- name: Setup Toolchain
6260
shell: bash
@@ -90,13 +88,13 @@ jobs:
9088
- name: Build and install
9189
run: |
9290
find . -type f -name "simplelogger.*" -exec rm -fv '{}' \;
93-
mvn -q --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=$PREFERRED_LTS_VERSION \
91+
mvn -q --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
9492
-DskipTests install
9593
- name: Analyze
9694
env:
9795
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
9896
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
9997
run: |
100-
mvn --batch-mode --projects '!clickhouse-benchmark' -DclickhouseVersion=$PREFERRED_LTS_VERSION \
98+
mvn --batch-mode -DclickhouseVersion=$PREFERRED_LTS_VERSION \
10199
-Panalysis verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
102100
continue-on-error: true

README.md

Lines changed: 228 additions & 73 deletions
Large diffs are not rendered by default.

clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,6 +1984,7 @@ public void testInsertWithCustomFormat() throws ClickHouseException {
19841984

19851985
@Test(groups = { "integration" })
19861986
public void testInsertRawDataSimple() throws Exception {
1987+
if (isCloud()) return; // TODO: This test is really just for performance purposes
19871988
testInsertRawDataSimple(1000);
19881989
}
19891990
public void testInsertRawDataSimple(int numberOfRecords) throws Exception {

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ApacheHttpConnectionImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private CloseableHttpClient newConnection(ClickHouseConfig c) throws IOException
9595
}
9696

9797
long connectionTTL = config.getLongOption(ClickHouseClientOption.CONNECTION_TTL);
98-
log.info("Connection TTL: %d ms", connectionTTL);
98+
log.debug("Connection TTL: %d ms", connectionTTL);
9999
String poolReuseStrategy = c.getStrOption(ClickHouseHttpOption.CONNECTION_REUSE_STRATEGY);
100100
PoolReusePolicy poolReusePolicy = PoolReusePolicy.LIFO;
101101
if (poolReuseStrategy != null && !poolReuseStrategy.isEmpty()) {
@@ -105,7 +105,7 @@ private CloseableHttpClient newConnection(ClickHouseConfig c) throws IOException
105105
throw new IllegalArgumentException("Invalid connection reuse strategy: " + poolReuseStrategy);
106106
}
107107
}
108-
log.info("Connection reuse strategy: %s", poolReusePolicy.name());
108+
log.debug("Connection reuse strategy: %s", poolReusePolicy.name());
109109
HttpConnectionManager connManager = new HttpConnectionManager(r.build(), c, PoolConcurrencyPolicy.LAX,
110110
poolReusePolicy, TimeValue.ofMilliseconds(connectionTTL));
111111
int maxConnection = config.getIntOption(ClickHouseHttpOption.MAX_OPEN_CONNECTIONS);

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public void testAuthentication() throws ClickHouseException {
140140

141141
@Test(groups = "integration")
142142
public void testUserAgent() throws Exception {
143+
if (isCloud()) return; //TODO: testUserAgent - Revisit after the issue is resolved, see: https://github.com/ClickHouse/ClickHouse/issues/68748
143144
testUserAgent(ClickHouseClientOption.PRODUCT_NAME, "MyCustomProduct");
144145
testUserAgent(ClickHouseClientOption.CLIENT_NAME, "MyCustomClient");
145146
}

clickhouse-r2dbc/src/main/java/com/clickhouse/r2dbc/connection/ClickHouseConnectionFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class ClickHouseConnectionFactory implements ConnectionFactory {
1818

1919
@Override
2020
public Mono<? extends Connection> create() {
21-
return Mono.just(new ClickHouseConnection(nodes));
21+
return Mono.defer(() -> Mono.just(new ClickHouseConnection(nodes)));
2222
}
2323

2424
@Override

examples/demo-service/src/test/java/com/clickhouse/.keep

Whitespace-only changes.

examples/demo-service/src/test/java/com/clickhouse/demo_service/DemoServiceApplicationTests.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)