[client-v2, jdbc-v2] Makes 159 Execution TImeout not retriable & make setQueryTimeout set proper setting.

[chernser]

Summary

• Makes server error 159 Execution Timeout not retriable
• Backports some test fixes from 0.10.0
• Adds test for JDBC that verifies setQueryTimeout() works when client uses async operations
• Makes Statement#setQueryTimeout modify request settings and setting max_execution_time. This happens only if non async mode used for client

Closes: #3074

Checklist

Delete items not relevant to your PR:

• Closes #
• Unit and integration tests covering the common scenarios were added
• A human-readable description of the changes was provided to include in CHANGELOG
• For significant changes, documentation in https://github.com/ClickHouse/clickhouse-docs was updated with further explanations or tutorials

[Copilot]

Pull request overview

This PR adjusts timeout/error handling in the client-v2 and JDBC-v2 layers so that ClickHouse server error 159 (Execution Timeout) is no longer treated as retryable, and adds/updates integration tests to validate query timeout behavior (including when JDBC uses async operations).

Changes:

• client-v2: Mark ServerException code 159 as non-retryable and add a named constant for it.
• jdbc-v2: Translate execution-timeout conditions into SQLTimeoutException and add new integration tests validating Statement.setQueryTimeout() behavior for async and server-side timeouts.
• Tests/fixtures: Update SQL/YAML expectations and float boundary assertions; improve metrics pool test concurrency behavior.

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
jdbc-v2/src/test/resources/StatementSQLTests.yaml	Updates EXPLAIN query variant and expected row count.
jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java	Adds query-timeout tests (async + server max_execution_time).
jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcDataTypeTests.java	Stabilizes Float32 boundary assertions.
jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java	Maps execution timeout to SQLTimeoutException.
jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataImpl.java	Extends engine-to-table-type mapping (new engines).
jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java	Adds newer keyword aliases.
client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java	Adjusts float expectations based on server version behavior.
client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java	Makes metrics pool concurrency assertions more deterministic.
client-v2/src/test/java/com/clickhouse/client/ClientTests.java	Adds execution-timeout test for server setting.
client-v2/src/main/java/com/clickhouse/client/api/ServerException.java	Adds EXECUTION_TIMEOUT constant and removes 159 from retryable codes.
clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java	Disables one test pending follow-up.
CHANGELOG.md	Adds changelog entry for non-retryable 159 behavior.

Suppressed comments (5)

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java:400

• The assertion compares runtime against queryTimeoutMs, but the configured timeout is in whole seconds (setQueryTimeout(int seconds)). This mismatch can cause flaky assertions (e.g. 3s timeout vs 3.7s queryTimeoutMs).

                long wTimeoutTime = System.currentTimeMillis() - wTimeoutStart;
                assertTrue(Math.abs(wTimeoutTime - queryTimeoutMs) < 1000);

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java:425

• max_execution_time is configured in seconds, but the test computes queryTimeoutMs and truncates it to seconds. If it truncates to 0, the server timeout is effectively disabled and the test can pass/fail depending on environment speed. Consider clamping to at least 1 second and asserting against the effective seconds-based timeout instead of millisecond target.

        int queryTimeoutMs = (int) (woTimeoutTime * 0.75);
        Properties config = new Properties();
        config.setProperty(ClientConfigProperties.serverSetting("max_execution_time"), String.valueOf(TimeUnit.MILLISECONDS.toSeconds(queryTimeoutMs)));
        try (Connection conn = getJdbcConnection(config)) {

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java:438

• This assertion compares elapsed time to queryTimeoutMs (a millisecond value), but max_execution_time is set in whole seconds (truncated). As a result, the effective timeout can be significantly lower than queryTimeoutMs, making the assertion flaky.

                long wTimeoutTime = System.currentTimeMillis() - wTimeoutStart;
                assertTrue(Math.abs(wTimeoutTime - queryTimeoutMs) < 1000);

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java:446

• The async max_execution_time configuration repeats the same milliseconds-to-seconds truncation; if it truncates to 0, the server-side timeout is disabled for this part of the test.

        config = new Properties();
        config.setProperty(ClientConfigProperties.serverSetting("max_execution_time"), String.valueOf(TimeUnit.MILLISECONDS.toSeconds(queryTimeoutMs)));
        config.setProperty(ClientConfigProperties.ASYNC_OPERATIONS.getKey(), "true");
        try (Connection conn = getJdbcConnection(config)) {

jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java:459

• Same as the non-async branch: the assertion uses queryTimeoutMs while the configured max_execution_time is in whole seconds (possibly truncated). This can make the runtime check brittle.

                long wTimeoutTime = System.currentTimeMillis() - wTimeoutStart;
                assertTrue(Math.abs(wTimeoutTime - queryTimeoutMs) < 1000);

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[chernser]

@cursor review

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 60bb7e1. Configure here.}