hive git commit: HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)

2017-08-28 Thread spena
Repository: hive
Updated Branches:
  refs/heads/branch-2.1 5a62503ff -> 714d7cf75


HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through 
HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/714d7cf7
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/714d7cf7
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/714d7cf7

Branch: refs/heads/branch-2.1
Commit: 714d7cf75c46f2c38ea4732be8653d1915e9a7cf
Parents: 5a62503
Author: Aihua Xu 
Authored: Wed Jul 5 17:38:36 2017 -0700
Committer: Sergio Pena 
Committed: Mon Aug 28 12:39:23 2017 -0500

--
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   | 28 +++-
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  | 27 ---
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  1 +
 .../parse/HiveSemanticAnalyzerHookContext.java  |  5 
 .../HiveSemanticAnalyzerHookContextImpl.java| 12 +
 5 files changed, 50 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/714d7cf7/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
--
diff --git 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
index 4fabe47..1cd0ee8 100644
--- 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
+++ 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -114,16 +114,16 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(PostExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PostExecHook.userName, "userName is null");
-Assert.assertNotNull(PostExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PostExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PostExecHook.userName);
+Assert.assertNotNull("operation is null", PostExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PostExecHook.userName);
 Assert.assertTrue(PostExecHook.ipAddress, 
PostExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PostExecHook.operation);
 
-Assert.assertNotNull(PreExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PreExecHook.userName, "userName is null");
-Assert.assertNotNull(PreExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PreExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PreExecHook.userName);
+Assert.assertNotNull("operation is null", PreExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PreExecHook.userName);
 Assert.assertTrue(PreExecHook.ipAddress, 
PreExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PreExecHook.operation);
@@ -137,12 +137,14 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(SemanticAnalysisHook.ipAddress,
-"semantic hook context ipaddress is null");
-Assert.assertNotNull(SemanticAnalysisHook.userName,
-"semantic hook context userName is null");
-Assert.assertNotNull(SemanticAnalysisHook.command ,
-"semantic hook context command is null");
+Assert.assertNotNull("semantic hook context ipaddress is null",
+SemanticAnalysisHook.ipAddress);
+Assert.assertNotNull("semantic hook context userName is null",
+SemanticAnalysisHook.userName);
+Assert.assertNotNull("semantic hook context command is null",
+SemanticAnalysisHook.command);
+Assert.assertNotNull("semantic hook context commandType is null",
+SemanticAnalysisHook.commandType);
 Assert.assertTrue(SemanticAnalysisHook.ipAddress,
 SemanticAnalysisHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("show tables", SemanticAnalysisHook.command);

http://git-wip-us.apache.org/repos/asf/hive/blob/714d7cf7/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java 

hive git commit: HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)

2017-08-28 Thread spena
Repository: hive
Updated Branches:
  refs/heads/branch-2.2 120476dcd -> b2e7d5ef6


HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through 
HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b2e7d5ef
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b2e7d5ef
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b2e7d5ef

Branch: refs/heads/branch-2.2
Commit: b2e7d5ef60015f12a319239d03341b8a1ae1ea23
Parents: 120476d
Author: Aihua Xu 
Authored: Wed Jul 5 17:38:36 2017 -0700
Committer: Sergio Pena 
Committed: Mon Aug 28 12:35:49 2017 -0500

--
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   | 28 +++-
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  | 27 ---
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  1 +
 .../parse/HiveSemanticAnalyzerHookContext.java  |  5 
 .../HiveSemanticAnalyzerHookContextImpl.java| 12 +
 5 files changed, 50 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/b2e7d5ef/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
--
diff --git 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
index 4fabe47..1cd0ee8 100644
--- 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
+++ 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -114,16 +114,16 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(PostExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PostExecHook.userName, "userName is null");
-Assert.assertNotNull(PostExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PostExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PostExecHook.userName);
+Assert.assertNotNull("operation is null", PostExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PostExecHook.userName);
 Assert.assertTrue(PostExecHook.ipAddress, 
PostExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PostExecHook.operation);
 
-Assert.assertNotNull(PreExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PreExecHook.userName, "userName is null");
-Assert.assertNotNull(PreExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PreExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PreExecHook.userName);
+Assert.assertNotNull("operation is null", PreExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PreExecHook.userName);
 Assert.assertTrue(PreExecHook.ipAddress, 
PreExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PreExecHook.operation);
@@ -137,12 +137,14 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(SemanticAnalysisHook.ipAddress,
-"semantic hook context ipaddress is null");
-Assert.assertNotNull(SemanticAnalysisHook.userName,
-"semantic hook context userName is null");
-Assert.assertNotNull(SemanticAnalysisHook.command ,
-"semantic hook context command is null");
+Assert.assertNotNull("semantic hook context ipaddress is null",
+SemanticAnalysisHook.ipAddress);
+Assert.assertNotNull("semantic hook context userName is null",
+SemanticAnalysisHook.userName);
+Assert.assertNotNull("semantic hook context command is null",
+SemanticAnalysisHook.command);
+Assert.assertNotNull("semantic hook context commandType is null",
+SemanticAnalysisHook.commandType);
 Assert.assertTrue(SemanticAnalysisHook.ipAddress,
 SemanticAnalysisHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("show tables", SemanticAnalysisHook.command);

http://git-wip-us.apache.org/repos/asf/hive/blob/b2e7d5ef/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java 

hive git commit: HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)

2017-08-28 Thread spena
Repository: hive
Updated Branches:
  refs/heads/branch-2.3 6f4c35c9e -> 910842f84


HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through 
HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/910842f8
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/910842f8
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/910842f8

Branch: refs/heads/branch-2.3
Commit: 910842f848c6e764869391e619fa098de16d40d8
Parents: 6f4c35c
Author: Aihua Xu 
Authored: Wed Jul 5 17:38:36 2017 -0700
Committer: Sergio Pena 
Committed: Mon Aug 28 12:31:33 2017 -0500

--
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   | 28 +++-
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  | 27 ---
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  1 +
 .../parse/HiveSemanticAnalyzerHookContext.java  |  5 
 .../HiveSemanticAnalyzerHookContextImpl.java| 12 +
 5 files changed, 50 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/910842f8/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
--
diff --git 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
index 4fabe47..1cd0ee8 100644
--- 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
+++ 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -114,16 +114,16 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(PostExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PostExecHook.userName, "userName is null");
-Assert.assertNotNull(PostExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PostExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PostExecHook.userName);
+Assert.assertNotNull("operation is null", PostExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PostExecHook.userName);
 Assert.assertTrue(PostExecHook.ipAddress, 
PostExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PostExecHook.operation);
 
-Assert.assertNotNull(PreExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PreExecHook.userName, "userName is null");
-Assert.assertNotNull(PreExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PreExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PreExecHook.userName);
+Assert.assertNotNull("operation is null", PreExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PreExecHook.userName);
 Assert.assertTrue(PreExecHook.ipAddress, 
PreExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PreExecHook.operation);
@@ -137,12 +137,14 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(SemanticAnalysisHook.ipAddress,
-"semantic hook context ipaddress is null");
-Assert.assertNotNull(SemanticAnalysisHook.userName,
-"semantic hook context userName is null");
-Assert.assertNotNull(SemanticAnalysisHook.command ,
-"semantic hook context command is null");
+Assert.assertNotNull("semantic hook context ipaddress is null",
+SemanticAnalysisHook.ipAddress);
+Assert.assertNotNull("semantic hook context userName is null",
+SemanticAnalysisHook.userName);
+Assert.assertNotNull("semantic hook context command is null",
+SemanticAnalysisHook.command);
+Assert.assertNotNull("semantic hook context commandType is null",
+SemanticAnalysisHook.commandType);
 Assert.assertTrue(SemanticAnalysisHook.ipAddress,
 SemanticAnalysisHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("show tables", SemanticAnalysisHook.command);

http://git-wip-us.apache.org/repos/asf/hive/blob/910842f8/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java 

hive git commit: HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)

2017-08-28 Thread spena
Repository: hive
Updated Branches:
  refs/heads/branch-2 588148da1 -> 291a259c6


HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through 
HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/291a259c
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/291a259c
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/291a259c

Branch: refs/heads/branch-2
Commit: 291a259c6c245b0d50fbab34f377cea8547f0e8e
Parents: 588148d
Author: Aihua Xu 
Authored: Wed Jul 5 17:38:36 2017 -0700
Committer: Sergio Pena 
Committed: Mon Aug 28 12:26:06 2017 -0500

--
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   | 28 +++-
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  | 27 ---
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  1 +
 .../parse/HiveSemanticAnalyzerHookContext.java  |  5 
 .../HiveSemanticAnalyzerHookContextImpl.java| 12 +
 5 files changed, 50 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/291a259c/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
--
diff --git 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
index 4fabe47..1cd0ee8 100644
--- 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
+++ 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -114,16 +114,16 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(PostExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PostExecHook.userName, "userName is null");
-Assert.assertNotNull(PostExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PostExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PostExecHook.userName);
+Assert.assertNotNull("operation is null", PostExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PostExecHook.userName);
 Assert.assertTrue(PostExecHook.ipAddress, 
PostExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PostExecHook.operation);
 
-Assert.assertNotNull(PreExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PreExecHook.userName, "userName is null");
-Assert.assertNotNull(PreExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PreExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PreExecHook.userName);
+Assert.assertNotNull("operation is null", PreExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PreExecHook.userName);
 Assert.assertTrue(PreExecHook.ipAddress, 
PreExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PreExecHook.operation);
@@ -137,12 +137,14 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(SemanticAnalysisHook.ipAddress,
-"semantic hook context ipaddress is null");
-Assert.assertNotNull(SemanticAnalysisHook.userName,
-"semantic hook context userName is null");
-Assert.assertNotNull(SemanticAnalysisHook.command ,
-"semantic hook context command is null");
+Assert.assertNotNull("semantic hook context ipaddress is null",
+SemanticAnalysisHook.ipAddress);
+Assert.assertNotNull("semantic hook context userName is null",
+SemanticAnalysisHook.userName);
+Assert.assertNotNull("semantic hook context command is null",
+SemanticAnalysisHook.command);
+Assert.assertNotNull("semantic hook context commandType is null",
+SemanticAnalysisHook.commandType);
 Assert.assertTrue(SemanticAnalysisHook.ipAddress,
 SemanticAnalysisHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("show tables", SemanticAnalysisHook.command);

http://git-wip-us.apache.org/repos/asf/hive/blob/291a259c/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java 

hive git commit: HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)

2017-07-07 Thread aihuaxu
Repository: hive
Updated Branches:
  refs/heads/master 453f44cdb -> 6b87af747


HIVE-17048: Pass HiveOperation info to HiveSemanticAnalyzerHook through 
HiveSemanticAnalyzerHookContext (Aihua Xu, reviewed by Mohit Sabharwal)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6b87af74
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6b87af74
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6b87af74

Branch: refs/heads/master
Commit: 6b87af7477219a3b62acb4b8ff4e614d45816d68
Parents: 453f44c
Author: Aihua Xu 
Authored: Wed Jul 5 17:38:36 2017 -0700
Committer: Aihua Xu 
Committed: Fri Jul 7 10:46:43 2017 -0700

--
 .../hive/minikdc/TestHs2HooksWithMiniKdc.java   | 28 +++-
 .../apache/hadoop/hive/hooks/TestHs2Hooks.java  | 27 ---
 .../java/org/apache/hadoop/hive/ql/Driver.java  |  1 +
 .../parse/HiveSemanticAnalyzerHookContext.java  |  5 
 .../HiveSemanticAnalyzerHookContextImpl.java| 12 +
 5 files changed, 50 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/6b87af74/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
--
diff --git 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
index 4fabe47..1cd0ee8 100644
--- 
a/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
+++ 
b/itests/hive-minikdc/src/test/java/org/apache/hive/minikdc/TestHs2HooksWithMiniKdc.java
@@ -24,7 +24,7 @@ import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
@@ -114,16 +114,16 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(PostExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PostExecHook.userName, "userName is null");
-Assert.assertNotNull(PostExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PostExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PostExecHook.userName);
+Assert.assertNotNull("operation is null", PostExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PostExecHook.userName);
 Assert.assertTrue(PostExecHook.ipAddress, 
PostExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PostExecHook.operation);
 
-Assert.assertNotNull(PreExecHook.ipAddress, "ipaddress is null");
-Assert.assertNotNull(PreExecHook.userName, "userName is null");
-Assert.assertNotNull(PreExecHook.operation , "operation is null");
+Assert.assertNotNull("ipaddress is null", PreExecHook.ipAddress);
+Assert.assertNotNull("userName is null", PreExecHook.userName);
+Assert.assertNotNull("operation is null", PreExecHook.operation);
 Assert.assertEquals(MiniHiveKdc.HIVE_TEST_USER_1, PreExecHook.userName);
 Assert.assertTrue(PreExecHook.ipAddress, 
PreExecHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("SHOWTABLES", PreExecHook.operation);
@@ -137,12 +137,14 @@ public class TestHs2HooksWithMiniKdc {
   throw error;
 }
 
-Assert.assertNotNull(SemanticAnalysisHook.ipAddress,
-"semantic hook context ipaddress is null");
-Assert.assertNotNull(SemanticAnalysisHook.userName,
-"semantic hook context userName is null");
-Assert.assertNotNull(SemanticAnalysisHook.command ,
-"semantic hook context command is null");
+Assert.assertNotNull("semantic hook context ipaddress is null",
+SemanticAnalysisHook.ipAddress);
+Assert.assertNotNull("semantic hook context userName is null",
+SemanticAnalysisHook.userName);
+Assert.assertNotNull("semantic hook context command is null",
+SemanticAnalysisHook.command);
+Assert.assertNotNull("semantic hook context commandType is null",
+SemanticAnalysisHook.commandType);
 Assert.assertTrue(SemanticAnalysisHook.ipAddress,
 SemanticAnalysisHook.ipAddress.contains("127.0.0.1"));
 Assert.assertEquals("show tables", SemanticAnalysisHook.command);

http://git-wip-us.apache.org/repos/asf/hive/blob/6b87af74/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
--
diff --git 
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java 
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/hooks/TestHs2Hooks.java
index