(iotdb) branch dev/1.3 updated: [to dev/1.3] Remove incorrect timeout reassignment after query planning (#18196)

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

JackieTien97 pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/dev/1.3 by this push:
     new 534f1e2d83d [to dev/1.3] Remove incorrect timeout reassignment after 
query planning (#18196)
534f1e2d83d is described below

commit 534f1e2d83de44fc883d94091940eae0d001a6c9
Author: shuwenwei <55970239+shuwen...@users.noreply.github.com>
AuthorDate: Fri Aug 14 10:16:11 2026 +0800

    [to dev/1.3] Remove incorrect timeout reassignment after query planning 
(#18196)
---
 .../java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java | 5 ++++-
 .../apache/iotdb/db/queryengine/plan/execution/QueryExecution.java   | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java
index 0705680a3dd..e2103817b24 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/MPPQueryContext.java
@@ -258,7 +258,10 @@ public class MPPQueryContext {
     return queryType;
   }
 
-  /** the max executing time of query in ms. Unit: millisecond */
+  /**
+   * Returns the total query timeout in milliseconds, measured from {@link 
#getStartTime()}. This
+   * value never represents the remaining timeout.
+   */
   public long getTimeOut() {
     return timeOut;
   }
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 7e8ac469868..c99af2a8ffe 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
@@ -192,10 +192,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();