You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/08/27 18:44:28 UTC
svn commit: r1517873 - in
/hive/trunk/service/src/java/org/apache/hive/service/cli/session:
HiveSessionHookContext.java HiveSessionHookContextImpl.java
SessionManager.java
Author: hashutosh
Date: Tue Aug 27 16:44:28 2013
New Revision: 1517873
URL: http://svn.apache.org/r1517873
Log:
HIVE-5147 : Newly added test TestSessionHooks is failing on trunk (Navis via Ashutosh Chauhan)
Modified:
hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContext.java
hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContextImpl.java
hive/trunk/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContext.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContext.java?rev=1517873&r1=1517872&r2=1517873&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContext.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContext.java Tue Aug 27 16:44:28 2013
@@ -26,10 +26,6 @@ import org.apache.hadoop.hive.conf.HiveC
*/
public interface HiveSessionHookContext {
- enum State {OPEN, CLOSE}
-
- public State getState();
-
/**
* Retrieve session conf
* @return
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContextImpl.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContextImpl.java?rev=1517873&r1=1517872&r2=1517873&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContextImpl.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/session/HiveSessionHookContextImpl.java Tue Aug 27 16:44:28 2013
@@ -29,16 +29,9 @@ import org.apache.hadoop.hive.conf.HiveC
public class HiveSessionHookContextImpl implements HiveSessionHookContext {
private final HiveSession hiveSession;
- private final State state;
- HiveSessionHookContextImpl(HiveSession hiveSession, State state) {
+ HiveSessionHookContextImpl(HiveSession hiveSession) {
this.hiveSession = hiveSession;
- this.state = state;
- }
-
- @Override
- public State getState() {
- return state;
}
@Override
Modified: hive/trunk/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
URL: http://svn.apache.org/viewvc/hive/trunk/service/src/java/org/apache/hive/service/cli/session/SessionManager.java?rev=1517873&r1=1517872&r2=1517873&view=diff
==============================================================================
--- hive/trunk/service/src/java/org/apache/hive/service/cli/session/SessionManager.java (original)
+++ hive/trunk/service/src/java/org/apache/hive/service/cli/session/SessionManager.java Tue Aug 27 16:44:28 2013
@@ -92,7 +92,7 @@ public class SessionManager extends Comp
handleToSession.put(session.getSessionHandle(), session);
}
try {
- executeSessionHooks(session, HiveSessionHookContext.State.OPEN);
+ executeSessionHooks(session);
} catch (Exception e) {
throw new HiveSQLException("Failed to execute session hooks", e);
}
@@ -107,11 +107,6 @@ public class SessionManager extends Comp
if (session == null) {
throw new HiveSQLException("Session does not exist!");
}
- try {
- executeSessionHooks(session, HiveSessionHookContext.State.CLOSE);
- } catch (Exception e) {
- throw new HiveSQLException("Failed to execute session hooks", e);
- }
session.close();
}
@@ -162,12 +157,11 @@ public class SessionManager extends Comp
}
// execute session hooks
- private void executeSessionHooks(HiveSession session, HiveSessionHookContext.State state)
- throws Exception {
+ private void executeSessionHooks(HiveSession session) throws Exception {
List<HiveSessionHook> sessionHooks = HookUtils.getHooks(hiveConf,
HiveConf.ConfVars.HIVE_SERVER2_SESSION_HOOK, HiveSessionHook.class);
for (HiveSessionHook sessionHook : sessionHooks) {
- sessionHook.run(new HiveSessionHookContextImpl(session, state));
+ sessionHook.run(new HiveSessionHookContextImpl(session));
}
}
}