This is an automated email from the ASF dual-hosted git repository. shuwenwei pushed a commit to branch fix/remove_timeout_reassignment_after_planning_in_QueryExecution in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9735c3749eae8f87a884cbcd13cad0f288afa963 Author: shuwenwei <[email protected]> AuthorDate: Mon Jul 13 17:36:04 2026 +0800 Remove incorrect timeout reassignment after query planning The context.setTimeOut() call in QueryExecution.start() mutated timeOut from the total timeout duration to the remaining time after planning. However, all consumers (checkTimeOutForQuery, cleanUpStaleQueries, timeout exception messages) assume timeOut holds the total duration. This caused stale query cleanup to trigger earlier than expected and incorrect deadline values in timeout error messages. --- .../apache/iotdb/db/queryengine/plan/execution/QueryExecution.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java index 5af143bfca8..918538b06d2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java @@ -176,10 +176,6 @@ public class QueryExecution implements IQueryExecution { doLogicalPlan(); doDistributedPlan(); - // update timeout after finishing plan stage - context.setTimeOut( - context.getTimeOut() - (System.currentTimeMillis() - context.getStartTime())); - stateMachine.transitionToPlanned(); if (context.getQueryType() == QueryType.READ) { initResultHandle();
