[KYUUBI #4516] Return kyuubi instance in SessionData and OperationData
### _Why are the changes needed?_ It is helpful, because now kyuubi gateway does not support multiple nodes ha. ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.readthedocs.io/en/master/develop_tools/testing.html#running-tests) locally before make a pull request Closes #4516 from turboFei/kyuubi_instance. Closes #4516 a679dc524 [fwang12] return kyuubi instance Authored-by: fwang12 <fwang12@ebay.com> Signed-off-by: fwang12 <fwang12@ebay.com>
This commit is contained in:
parent
b23c87c318
commit
e53da12419
@ -32,6 +32,7 @@ public class OperationData {
|
||||
private String sessionId;
|
||||
private String sessionUser;
|
||||
private String sessionType;
|
||||
private String kyuubiInstance;
|
||||
|
||||
public OperationData() {}
|
||||
|
||||
@ -45,7 +46,8 @@ public class OperationData {
|
||||
String exception,
|
||||
String sessionId,
|
||||
String sessionUser,
|
||||
String sessionType) {
|
||||
String sessionType,
|
||||
String kyuubiInstance) {
|
||||
this.identifier = identifier;
|
||||
this.statement = statement;
|
||||
this.state = state;
|
||||
@ -56,6 +58,7 @@ public class OperationData {
|
||||
this.sessionId = sessionId;
|
||||
this.sessionUser = sessionUser;
|
||||
this.sessionType = sessionType;
|
||||
this.kyuubiInstance = kyuubiInstance;
|
||||
}
|
||||
|
||||
public String getIdentifier() {
|
||||
@ -138,6 +141,14 @@ public class OperationData {
|
||||
this.sessionType = sessionType;
|
||||
}
|
||||
|
||||
public String getKyuubiInstance() {
|
||||
return kyuubiInstance;
|
||||
}
|
||||
|
||||
public void setKyuubiInstance(String kyuubiInstance) {
|
||||
this.kyuubiInstance = kyuubiInstance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
|
||||
@ -33,6 +33,7 @@ public class SessionData {
|
||||
private Long idleTime;
|
||||
private String exception;
|
||||
private String sessionType;
|
||||
private String kyuubiInstance;
|
||||
|
||||
public SessionData() {}
|
||||
|
||||
@ -45,7 +46,8 @@ public class SessionData {
|
||||
Long duration,
|
||||
Long idleTime,
|
||||
String exception,
|
||||
String sessionType) {
|
||||
String sessionType,
|
||||
String kyuubiInstance) {
|
||||
this.identifier = identifier;
|
||||
this.user = user;
|
||||
this.ipAddr = ipAddr;
|
||||
@ -55,6 +57,7 @@ public class SessionData {
|
||||
this.idleTime = idleTime;
|
||||
this.exception = exception;
|
||||
this.sessionType = sessionType;
|
||||
this.kyuubiInstance = kyuubiInstance;
|
||||
}
|
||||
|
||||
public String getIdentifier() {
|
||||
@ -132,6 +135,14 @@ public class SessionData {
|
||||
this.sessionType = sessionType;
|
||||
}
|
||||
|
||||
public String getKyuubiInstance() {
|
||||
return kyuubiInstance;
|
||||
}
|
||||
|
||||
public void setKyuubiInstance(String kyuubiInstance) {
|
||||
this.kyuubiInstance = kyuubiInstance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
|
||||
@ -37,7 +37,8 @@ object ApiUtils {
|
||||
session.lastAccessTime - session.createTime,
|
||||
session.getNoOperationTime,
|
||||
session.getSessionEvent.flatMap(_.exception).map(Utils.prettyPrint).getOrElse(""),
|
||||
session.sessionType.toString)
|
||||
session.sessionType.toString,
|
||||
session.connectionUrl)
|
||||
}
|
||||
|
||||
def operationData(operation: KyuubiOperation): OperationData = {
|
||||
@ -52,6 +53,7 @@ object ApiUtils {
|
||||
opEvent.exception.map(Utils.prettyPrint).getOrElse(""),
|
||||
opEvent.sessionId,
|
||||
opEvent.sessionUser,
|
||||
opEvent.sessionType)
|
||||
opEvent.sessionType,
|
||||
operation.getSession.asInstanceOf[KyuubiSession].connectionUrl)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user