Skip to content

[jdbc-v2,client-v2] Fix queryTimeout() #2842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chernser wants to merge 4 commits into
base: main
Choose a base branch
from
+19 −3
Draft

[jdbc-v2,client-v2] Fix queryTimeout() #2842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ec63e6
added test verifying that setQueryTimeout() is working with ASYNC ope…
chernser Apr 22, 2026
0e78363
made async operation when timeout is set to non zero
chernser Apr 22, 2026
c56a35e
Fix query timeout for executeUpdate operations
Claude Apr 23, 2026
298f6dd
Increase timeout in testUpdateQueryWithResultSet for async operations
Claude Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ protected ResultSetImpl executeQueryImpl(String sql, QuerySettings settings) thr
if (queryTimeout == 0) {
response = connection.getClient().query(lastStatementSql, mergedSettings).get();
} else {
response = connection.getClient().query(lastStatementSql, mergedSettings).get(queryTimeout, TimeUnit.SECONDS);
// we need to perform async operation to support timeout.
response = connection.getClient().query(lastStatementSql, mergedSettings
.setOption(ClientConfigProperties.ASYNC_OPERATIONS.getKey(), true))
.get(queryTimeout, TimeUnit.SECONDS);
}

if (response.getFormat().isText()) {
Expand Down Expand Up @@ -246,7 +249,9 @@ protected long executeUpdateImpl(String sql, QuerySettings settings) throws SQLE
LOG.trace("SQL Query: {}", lastStatementSql);
int updateCount = 0;
try (QueryResponse response = queryTimeout == 0 ? connection.getClient().query(lastStatementSql, mergedSettings).get()
: connection.getClient().query(lastStatementSql, mergedSettings).get(queryTimeout, TimeUnit.SECONDS)) {
: connection.getClient().query(lastStatementSql, mergedSettings
.setOption(ClientConfigProperties.ASYNC_OPERATIONS.getKey(), true))
.get(queryTimeout, TimeUnit.SECONDS)) {
updateCount = Math.max(0, (int) response.getWrittenRows()); // when statement alters schema no result rows returned.
lastQueryId = response.getQueryId();
} catch (Exception e) {
Expand Down
11 changes: 11 additions & 0 deletions jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.clickhouse.jdbc;

import com.clickhouse.client.api.ClientConfigProperties;
import com.clickhouse.client.api.DataTypeUtils;
import com.clickhouse.data.ClickHouseColumn;
import com.clickhouse.data.ClickHouseDataType;
Expand Down Expand Up @@ -566,6 +567,16 @@ void testSelectFromArray() throws Exception {
}
}

@Test(groups = {"integration"})
void testExecuteQueryTimeout() throws Exception {
final String sql = "SELECT sum(reinterpretAsUInt64(MD5(toString(number)))) FROM system.numbers LIMIT 1000000";
try (Connection conn = getJdbcConnection();
PreparedStatement stmt = conn.prepareStatement(sql)) {
stmt.setQueryTimeout(1);
assertThrows(SQLException.class, stmt::executeQuery);
}
}

@Test(groups = { "integration" })
void testInsert() throws Exception {
int ROWS = 1000;
Expand Down
2 changes: 1 addition & 1 deletion jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ public void testUpdateQueryWithResultSet() throws Exception {
props.setProperty(ClientConfigProperties.HTTP_MAX_OPEN_CONNECTIONS.getKey(), "1");
props.setProperty(ClientConfigProperties.CONNECTION_REQUEST_TIMEOUT.getKey(), "500");
try (Connection conn = getJdbcConnection(props); Statement stmt = conn.createStatement()) {
stmt.setQueryTimeout(1);
stmt.setQueryTimeout(10);
Copy link
Copy Markdown
Contributor Author

@chernser chernser Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this only masks the issue :-)

ResultSet rs = stmt.executeQuery("SELECT 1");
boolean failedOnTimeout = false;
try {
Expand Down
Loading