This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch doris-for-zhongjin
in repository https://gitbox.apache.org/repos/asf/doris.git
commit fba43bc6eff4db102a74016a3bce41d0c8ed36a3
Author: xueweizhang <zxw520bl...@163.com>
AuthorDate: Tue Apr 4 22:49:22 2023 +0800
[fix](multi-catalog) add catalog info for show proc (#18276)
Signed-off-by: nextdreamblue <zxw520bl...@163.com>
---
.../doris/common/proc/CurrentQueryStatementsProcNode.java | 5 +++--
.../doris/common/proc/CurrentQueryStatisticsProcDir.java | 5 +++--
.../src/main/java/org/apache/doris/qe/QeProcessorImpl.java | 1 +
.../main/java/org/apache/doris/qe/QueryStatisticsItem.java | 12 ++++++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java
index 1a710e2e91..16d09a5afe 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatementsProcNode.java
@@ -33,10 +33,10 @@ import java.util.Map;
*/
public class CurrentQueryStatementsProcNode implements ProcNodeInterface {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
- .add("QueryId").add("ConnectionId").add("Database").add("User")
+
.add("QueryId").add("ConnectionId").add("Catalog").add("Database").add("User")
.add("ExecTime").add("SqlHash").add("Statement").build();
- private static final int EXEC_TIME_INDEX = 4;
+ private static final int EXEC_TIME_INDEX = 5;
@Override
public ProcResult fetchResult() throws AnalysisException {
@@ -50,6 +50,7 @@ public class CurrentQueryStatementsProcNode implements
ProcNodeInterface {
final List<String> values = Lists.newArrayList();
values.add(item.getQueryId());
values.add(item.getConnId());
+ values.add(item.getCatalog());
values.add(item.getDb());
values.add(item.getUser());
values.add(item.getQueryExecTime());
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
index acb1cbf5ed..4c59d93bb1 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
@@ -35,10 +35,10 @@ import java.util.Map;
*/
public class CurrentQueryStatisticsProcDir implements ProcDirInterface {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
- .add("QueryId").add("ConnectionId").add("Database").add("User")
+
.add("QueryId").add("ConnectionId").add("Catalog").add("Database").add("User")
.add("ScanBytes").add("ProcessRows").add("ExecTime").build();
- private static final int EXEC_TIME_INDEX = 6;
+ private static final int EXEC_TIME_INDEX = 7;
@Override
public boolean register(String name, ProcNodeInterface node) {
@@ -73,6 +73,7 @@ public class CurrentQueryStatisticsProcDir implements
ProcDirInterface {
final List<String> values = Lists.newArrayList();
values.add(item.getQueryId());
values.add(item.getConnId());
+ values.add(item.getCatalog());
values.add(item.getDb());
values.add(item.getUser());
if (item.getIsReportSucc()) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
index c434b723cb..a5611ea4ca 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
@@ -169,6 +169,7 @@ public final class QeProcessorImpl implements QeProcessor {
.user(context.getQualifiedUser())
.connId(String.valueOf(context.getConnectionId()))
.db(context.getDatabase())
+ .catalog(context.getDefaultCatalog())
.fragmentInstanceInfos(info.getCoord().getFragmentInstanceInfos())
.profile(info.getCoord().getQueryProfile())
.isReportSucc(context.getSessionVariable().enableProfile()).build();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
index 34ceed6ad5..79c3e08311 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
@@ -30,6 +30,7 @@ public final class QueryStatisticsItem {
private final String queryId;
private final String user;
private final String sql;
+ private final String catalog;
private final String db;
private final String connId;
private final long queryStartTime;
@@ -42,6 +43,7 @@ public final class QueryStatisticsItem {
this.queryId = builder.queryId;
this.user = builder.user;
this.sql = builder.sql;
+ this.catalog = builder.catalog;
this.db = builder.db;
this.connId = builder.connId;
this.queryStartTime = builder.queryStartTime;
@@ -54,6 +56,10 @@ public final class QueryStatisticsItem {
return db;
}
+ public String getCatalog() {
+ return catalog;
+ }
+
public String getUser() {
return user;
}
@@ -89,6 +95,7 @@ public final class QueryStatisticsItem {
public static final class Builder {
private String queryId;
+ private String catalog;
private String db;
private String user;
private String sql;
@@ -112,6 +119,11 @@ public final class QueryStatisticsItem {
return this;
}
+ public Builder catalog(String catalog) {
+ this.catalog = catalog;
+ return this;
+ }
+
public Builder user(String user) {
this.user = user;
return this;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
