From af7b69da48bf72ea294eb9e810cb0f5391e517d5 Mon Sep 17 00:00:00 2001
From: meiyi <myimeiyi@gmail.com>
Date: Mon, 8 Jul 2024 10:28:03 +0800
Subject: [PATCH] [fix](nereids) Pick the stop watch is not reset (#37168)
 (#37397)

Pick https://github.com/apache/doris/pull/37168 and
https://github.com/apache/doris/pull/37095
---
 .../org/apache/doris/nereids/NereidsPlanner.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java
index 667784ad11..02170e63d4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/NereidsPlanner.java
@@ -113,10 +113,14 @@ public class NereidsPlanner extends Planner {
         NereidsTracer.logImportantTime("EndParsePlan");
         setParsedPlan(parsedPlan);
         PhysicalProperties requireProperties = buildInitRequireProperties();
-        statementContext.getStopwatch().start();
-        boolean showPlanProcess = showPlanProcess(queryStmt.getExplainOptions());
-        Plan resultPlan = plan(parsedPlan, requireProperties, explainLevel, showPlanProcess);
-        statementContext.getStopwatch().stop();
+        statementContext.getStopwatch().reset().start();
+        Plan resultPlan = null;
+        try {
+            boolean showPlanProcess = showPlanProcess(queryStmt.getExplainOptions());
+            resultPlan = plan(parsedPlan, requireProperties, explainLevel, showPlanProcess);
+        } finally {
+            statementContext.getStopwatch().stop();
+        }
         setOptimizedPlan(resultPlan);
         if (explainLevel.isPlanLevel) {
             return;