Skip to content

Commit ba72853

Browse files
committed
throw real exception instead of wrapping with ClientException
1 parent 64964bd commit ba72853

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

client-v2/src/main/java/com/clickhouse/client/api/Client.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,8 @@ public CompletableFuture<InsertResponse> insert(String tableName,
14641464
}
14651465
}
14661466
}
1467-
throw new ClientException("Insert request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime), lastException);
1467+
LOG.warn("Insert request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime));
1468+
throw lastException;
14681469
};
14691470

14701471
return runAsyncOperation(responseSupplier, settings.getAllSettings());
@@ -1586,8 +1587,8 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
15861587
}
15871588
}
15881589
}
1589-
1590-
throw new ClientException("Query request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime), lastException);
1590+
LOG.warn("Query request failed after attempts: " + (retries + 1) + " - Duration: " + (System.nanoTime() - startTime));
1591+
throw lastException;
15911592
};
15921593

15931594
return runAsyncOperation(responseSupplier, settings.getAllSettings());

client-v2/src/test/java/com/clickhouse/client/ClientTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public void testWithOldDefaults() {
285285
.enableConnectionPool(true)
286286
.setConnectionTTL(-1, MILLIS)
287287
.retryOnFailures(ClientFaultCause.NoHttpResponse, ClientFaultCause.ConnectTimeout,
288-
ClientFaultCause.ConnectionRequestTimeout)
288+
ClientFaultCause.ConnectionRequestTimeout, ClientFaultCause.ServerRetryable)
289289
.setClientNetworkBufferSize(300_000)
290290
.setMaxRetries(3)
291291
.allowBinaryReaderToReuseBuffers(false)

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.clickhouse.client;
22

3+
import com.clickhouse.client.api.ClickHouseException;
34
import com.clickhouse.client.api.Client;
45
import com.clickhouse.client.api.ClientConfigProperties;
56
import com.clickhouse.client.api.ClientException;

0 commit comments

Comments
 (0)