This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 559c22e7801 [fix](compile) Fix frontend compile fail (#38404)
559c22e7801 is described below
commit 559c22e78014d199ea48a76410f408e6f24164fe
Author: zhiqiang <seuhezhiqi...@163.com>
AuthorDate: Fri Jul 26 14:27:23 2024 +0800
[fix](compile) Fix frontend compile fail (#38404)
https://github.com/apache/doris/pull/38268 and
https://github.com/apache/doris/pull/33690 has conflict
---
.../main/java/org/apache/doris/common/util/ProfileManager.java | 10 ++++++----
.../main/java/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 9f4fa151709..306b5f1b4e6 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 class ProfileManager extends MasterDaemon {
}
}
- public String getLastQueryId() {
- return queryIdDeque.getLast();
- }
-
public String getProfileBrief(String queryID) {
readLock.lock();
try {
@@ -915,4 +911,10 @@ public class ProfileManager extends MasterDaemon {
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 5c1bc8213a2..85d97879602 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 @@ public class ProfileAction extends RestBaseController {
String queryId = request.getParameter("query_id");
if (Strings.isNullOrEmpty(queryId)) {
- queryId = ProfileManager.getInstance().getLastQueryId();
+ queryId = ProfileManager.getInstance().getLastProfileId();
}
String queryProfileStr =
ProfileManager.getInstance().getProfile(queryId);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
