From 5c4d8a8f3f0cf082e449c6751aed46fafe6360ab Mon Sep 17 00:00:00 2001
From: zhiqiang-hhhh <seuhezhiqiang@163.com>
Date: Fri, 26 Jul 2024 12:23:50 +0800
Subject: [PATCH] NEED

---
 .../org/apache/doris/common/util/ProfileManager.java   | 10 ++++++----
 .../org/apache/doris/httpv2/rest/ProfileAction.java    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java b/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java
index 9f4fa151709af7..306b5f1b4e621a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/ProfileManager.java
@@ -420,10 +420,6 @@ public String getProfile(String id) {
         }
     }
 
-    public String getLastQueryId() {
-        return queryIdDeque.getLast();
-    }
-
     public String getProfileBrief(String queryID) {
         readLock.lock();
         try {
@@ -915,4 +911,10 @@ public void markExecutionProfileFinished(TUniqueId queryId) {
             readLock.unlock();
         }
     }
+
+    public String getLastProfileId() {
+        PriorityQueue<ProfileElement> queueIdDeque = getProfileOrderByQueryFinishTime();
+        ProfileElement profileElement = queueIdDeque.poll();
+        return profileElement.profile.getSummaryProfile().getProfileId();
+    }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
index 5c1bc8213a2050..85d97879602f33 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/httpv2/rest/ProfileAction.java
@@ -69,7 +69,7 @@ protected Object profileText(HttpServletRequest request, HttpServletResponse res
 
         String queryId = request.getParameter("query_id");
         if (Strings.isNullOrEmpty(queryId)) {
-            queryId = ProfileManager.getInstance().getLastQueryId();
+            queryId = ProfileManager.getInstance().getLastProfileId();
         }
 
         String queryProfileStr = ProfileManager.getInstance().getProfile(queryId);