PR #3073 (0.9.9 patch) never forward-ported the 159 retryable again and setQueryTimeout does not set max_execution_time on main/0.10.0

[nicolasblaye]

Description

PR #3073 ("Makes 159 Execution Timeout not retriable & make setQueryTimeout set proper setting"),
which closed #3074 the 0.9.9 patch tracking issue for #2637, was merged with base v0.9.9,
not main. It was never forward-ported, so both of its fixes are absent from v0.10.0 and from
main today (@ a7fd189c):

1. 159 TIMEOUT_EXCEEDED is retryable again. ServerException.discoverIsRetryable():

ref	case 159: present
v0.9.8	yes
v0.9.9	no (fixed by 9378ba0)
v0.10.0	yes
main @ a7fd189c	yes (line 62)

2. Statement.setQueryTimeout() still does not set max_execution_time. On main,
queryTimeout is used only as a client-side future.get(timeout, SECONDS) — the client stops
waiting but the server keeps executing the query. v0.9.9 additionally sets the server setting.
This is the original symptom reported in #2637, which is still open.

Steps to reproduce

1. Set max_execution_time low on the user's settings profile (e.g. 30s), or call
   setQueryTimeout() on 0.9.9 where it maps to that setting.
2. Execute a query that reliably exceeds it.
3. Observe the client re-executing the identical query up to retry times — one
   WARN ... Retrying. per attempt. In system.query_log the same query text appears N+1 times,
   each ending in ExceptionWhileProcessing with exception_code = 159.

Environment

• Cloud
• Client version: 0.9.8 (also reproduces on v0.10.0 and main @ a7fd189c; fixed only on v0.9.9)
• Language version: Java 21 (Temurin 21.0.6)
• OS: Linux (container)

[nicolasblaye]

Follow-up: a third behaviour difference in 0.9.9, which matters for how #3073 gets forward-ported.

0.9.9 also changed the exception shape for a timeout, and in doing so drops the ClickHouse
error code. StatementImpl.throwOnExecutionTimeout:

protected void throwOnExecutionTimeout(Exception e, String queryId) throws SQLTimeoutException {
    boolean shouldThrow = e instanceof TimeoutException || e.getCause() instanceof TimeoutException;
    ServerException se = e instanceof ServerException ? (ServerException) e
            : e.getCause() instanceof ServerException ? (ServerException) e.getCause() : null;
    if (se != null && se.getCode() == ServerException.EXECUTION_TIMEOUT) {
        shouldThrow = true;
    }

    if (shouldThrow) {
        throw new SQLTimeoutException("Query execution time exceeded limit (queryId=" + queryId + ")", e);
    }
}

This is also not ported to 0.10.x

[chernser]

Good day, @nicolasblaye !

Thank you for the reminder! Would you like to port the fix to 0.10.0 ?

Thanks!