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 13773c150906c..cc9ad82d01aa5 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 @@ -189,7 +189,10 @@ public QueryType getQueryType() { 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 5af143bfca83f..918538b06d2dc 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 void start() { doLogicalPlan(); doDistributedPlan(); - // update timeout after finishing plan stage - context.setTimeOut( - context.getTimeOut() - (System.currentTimeMillis() - context.getStartTime())); - stateMachine.transitionToPlanned(); if (context.getQueryType() == QueryType.READ) { initResultHandle();