Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add connection id to CurrentQueryStatisticsProcDir #355

Merged
merged 1 commit into from
Nov 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions fe/src/main/java/org/apache/doris/qe/QeProcessorImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public Map<String, QueryStatisticsItem> getQueryStatistics() {
.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);
Expand Down
16 changes: 16 additions & 0 deletions fe/src/main/java/org/apache/doris/qe/QueryStatisticsItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public final class QueryStatisticsItem {
private final String user;
private final String sql;
private final String db;
private final String connId;
private final long queryStartTime;
private List<FragmentInstanceInfo> fragmentInstanceInfos;

Expand All @@ -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() {
Expand All @@ -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);
Expand All @@ -71,6 +77,7 @@ public static final class Builder {
private String db;
private String user;
private String sql;
private String connId;
private long queryStartTime;
private List<FragmentInstanceInfo> fragmentInstanceInfos;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -129,6 +141,10 @@ private void initDefaultValue(Builder builder) {
if (user == null) {
builder.user = "";
}

if (connId == null) {
builder.connId = "";
}
}
}

Expand Down