You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2016/11/11 01:23:33 UTC
hive git commit: HIVE-15162: NPE in ATSHook (Jason Dere reviewed by
Sergey Shelukhin)
Repository: hive
Updated Branches:
refs/heads/master 09339d71c -> 35be3f160
HIVE-15162: NPE in ATSHook (Jason Dere reviewed by Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/35be3f16
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/35be3f16
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/35be3f16
Branch: refs/heads/master
Commit: 35be3f160135d009900ced22586989a5c122c2ef
Parents: 09339d7
Author: Jason Dere <jd...@hortonworks.com>
Authored: Thu Nov 10 17:22:46 2016 -0800
Committer: Jason Dere <jd...@hortonworks.com>
Committed: Thu Nov 10 17:22:46 2016 -0800
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/Driver.java | 2 +-
ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java | 2 +-
ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/35be3f16/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
index 9e5fd37..923ef08 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
@@ -1729,7 +1729,7 @@ public class Driver implements CommandProcessor {
SessionState ss = SessionState.get();
hookContext = new HookContext(plan, queryState, ctx.getPathToCS(), ss.getUserName(),
- ss.getUserIpAddress(), operationId);
+ ss.getUserIpAddress(), operationId, ss.getSessionId());
hookContext.setHookType(HookContext.HookType.PRE_EXEC_HOOK);
for (Hook peh : getHooks(HiveConf.ConfVars.PREEXECHOOKS)) {
http://git-wip-us.apache.org/repos/asf/hive/blob/35be3f16/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java
index 7438570..8ee5c04 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java
@@ -138,7 +138,7 @@ public class ATSHook implements ExecuteWithHookContext {
explain.initialize(queryState, plan, null, null);
String query = plan.getQueryStr();
JSONObject explainPlan = explain.getJSONPlan(null, work);
- String logID = conf.getLogIdVar(SessionState.get().getSessionId());
+ String logID = conf.getLogIdVar(hookContext.getSessionId());
fireAndForget(conf, createPreHookEvent(queryId, query, explainPlan, queryStartTime,
user, requestuser, numMrJobs, numTezJobs, opId, logID));
break;
http://git-wip-us.apache.org/repos/asf/hive/blob/35be3f16/ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java b/ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java
index 8db0124..3b4cc2c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/HookContext.java
@@ -61,10 +61,11 @@ public class HookContext {
// unique id set for operation when run from HS2, base64 encoded value of
// TExecuteStatementResp.TOperationHandle.THandleIdentifier.guid
private final String operationId;
+ private final String sessionId;
public HookContext(QueryPlan queryPlan, QueryState queryState,
Map<String, ContentSummary> inputPathToContentSummary, String userName, String ipAddress,
- String operationId) throws Exception {
+ String operationId, String sessionId) throws Exception {
this.queryPlan = queryPlan;
this.queryState = queryState;
this.conf = queryState.getConf();
@@ -82,6 +83,7 @@ public class HookContext {
this.userName = userName;
this.ipAddress = ipAddress;
this.operationId = operationId;
+ this.sessionId = sessionId;
}
public QueryPlan getQueryPlan() {
@@ -199,4 +201,8 @@ public class HookContext {
public QueryState getQueryState() {
return queryState;
}
+
+ public String getSessionId() {
+ return sessionId;
+ }
}