imay closed pull request #355: Add connection id to
CurrentQueryStatisticsProcDir
URL: https://github.com/apache/incubator-doris/pull/355
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/fe/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
b/fe/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
index c100e09b..566a4831 100644
---
a/fe/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
+++
b/fe/src/main/java/org/apache/doris/common/proc/CurrentQueryStatisticsProcDir.java
@@ -34,7 +34,7 @@
*/
public class CurrentQueryStatisticsProcDir implements ProcDirInterface {
public static final ImmutableList<String> TITLE_NAMES = new
ImmutableList.Builder<String>()
-
.add("QueryId").add("Database").add("User").add("ExecTime").build();
+
.add("ConnectionId").add("QueryId").add("Database").add("User").add("ExecTime").build();
private static final int EXEC_TIME_INDEX = 3;
@@ -64,6 +64,7 @@ public ProcResult fetchResult() throws AnalysisException {
final List<List<String>> sortedRowData = Lists.newArrayList();
for (QueryStatisticsItem item : statistic.values()) {
final List<String> values = Lists.newArrayList();
+ values.add(item.getConnId());
values.add(item.getQueryId());
values.add(item.getDb());
values.add(item.getUser());
diff --git a/fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
b/fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
index 42610946..1af14eb0 100644
--- a/fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
+++ b/fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
@@ -77,6 +77,7 @@ public void unregisterQuery(TUniqueId queryId) {
.queryStartTime(info.getStartExecTime())
.sql(info.getSql())
.user(context.getQualifiedUser())
+ .connId(String.valueOf(context.getConnectionId()))
.db(context.getDatabase()).fragmentInstanceInfos(info.getCoord()
.getFragmentInstanceInfos()).build();
querySet.put(queryIdStr, item);
diff --git a/fe/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
b/fe/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
index 37a6a1bc..f2c72d78 100644
--- a/fe/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
+++ b/fe/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
@@ -29,6 +29,7 @@
private final String user;
private final String sql;
private final String db;
+ private final String connId;
private final long queryStartTime;
private List<FragmentInstanceInfo> fragmentInstanceInfos;
@@ -39,6 +40,7 @@ private QueryStatisticsItem(Builder builder) {
this.db = builder.db;
this.queryStartTime = builder.queryStartTime;
this.fragmentInstanceInfos = builder.fragmentInstanceInfos;
+ this.connId = builder.connId;
}
public String getDb() {
@@ -53,6 +55,10 @@ public String getSql() {
return sql;
}
+ public String getConnId() {
+ return connId;
+ }
+
public String getQueryExecTime() {
final long currentTime = System.currentTimeMillis();
return String.valueOf(currentTime - queryStartTime);
@@ -71,6 +77,7 @@ public String getQueryId() {
private String db;
private String user;
private String sql;
+ private String connId;
private long queryStartTime;
private List<FragmentInstanceInfo> fragmentInstanceInfos;
@@ -98,6 +105,11 @@ public Builder sql(String sql) {
return this;
}
+ public Builder connId(String connId) {
+ this.connId = connId;
+ return this;
+ }
+
public Builder queryStartTime(long queryStartTime) {
this.queryStartTime = queryStartTime;
return this;
@@ -129,6 +141,10 @@ private void initDefaultValue(Builder builder) {
if (user == null) {
builder.user = "";
}
+
+ if (connId == null) {
+ builder.connId = "";
+ }
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
