Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
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
12 changes: 10 additions & 2 deletions ql/src/java/org/apache/hadoop/hive/ql/session/ProcessListInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ public class ProcessListInfo {
private final String runtime; // tracks only running portion of the query.
private final long elapsedTime;
private final String state;
private final long txnId;

private ProcessListInfo(String userName, String ipAddr, String sessionId, long sessionActiveTime,
long sessionIdleTime, String queryId, String executionEngine, String beginTime,
String runtime, long elapsedTime, String state) {
String runtime, long elapsedTime, String state, long txnId) {
this.userName = userName;
this.ipAddr = ipAddr;
this.sessionId = sessionId;
Expand All @@ -47,6 +48,7 @@ private ProcessListInfo(String userName, String ipAddr, String sessionId, long s
this.runtime = runtime;
this.elapsedTime = elapsedTime;
this.state = state;
this.txnId = txnId;
}

public String getSessionId() {
Expand Down Expand Up @@ -105,6 +107,7 @@ public static class Builder {
private String runtime;
private long elapsedTime;
private String state;
private long txnId;

public Builder setSessionId(String sessionId) {
this.sessionId = sessionId;
Expand Down Expand Up @@ -161,10 +164,15 @@ public Builder setState(String state) {
return this;
}

public Builder setTxnId(long txnId) {
this.txnId = txnId;
return this;
}

public ProcessListInfo build() {
ProcessListInfo processListInfo = new ProcessListInfo(userName, ipAddr, sessionId, sessionActiveTime,
sessionIdleTime, queryId, executionEngine, beginTime, runtime,
elapsedTime, state);
elapsedTime, state, txnId);
return processListInfo;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ private List<ProcessListInfo> getLiveQueryInfos(HiveSession parentSession) {
LocalDateTime beginTime = LocalDateTime.ofInstant(
Instant.ofEpochMilli(query.getBeginTime()), ZoneId.systemDefault()
);

long txnId = 0;
if(op.queryState != null && op.queryState.getTxnManager() != null ){
txnId = op.queryState.getTxnManager().getCurrentTxnId();
}
return new ProcessListInfo.Builder()
.setUserName(session.getUserName())
.setIpAddr(session.getIpAddress())
Expand All @@ -84,6 +87,7 @@ private List<ProcessListInfo> getLiveQueryInfos(HiveSession parentSession) {
.setRuntime(query.getRuntime() == null ? "Not finished" : String.valueOf(query.getRuntime() / 1000))
.setElapsedTime(query.getElapsedTime() / 1000)
.setState(query.getState())
.setTxnId(txnId)
.build();
})
.collect(Collectors.toList());
Expand Down