commit 96d4d31d0216061846d1fc894763fc50a1aaf8c7
author Madhan Neethiraj <madhan@apache.org> Mon Oct 16 08:34:08 2017 -0700
committer Madhan Neethiraj <madhan@apache.org> Mon Oct 16 09:55:36 2017 -0700
tree e0c6a495d9410c5264e1a64b4f638e61a1e04792
parent 32fa4be52b0459209525ab4e7ecc8469f44fb07f

ATLAS-2213: Remove unused attributes from Hive hook

addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java

diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
index f815773..0e8284d 100755
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/HiveHook.java
@@ -37,6 +37,7 @@
 import org.apache.hadoop.hive.metastore.TableType;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
+import org.apache.hadoop.hive.ql.QueryPlan;
 import org.apache.hadoop.hive.ql.hooks.Entity;
 import org.apache.hadoop.hive.ql.hooks.Entity.Type;
 import org.apache.hadoop.hive.ql.hooks.ExecuteWithHookContext;
@@ -171,18 +172,20 @@
         // clone to avoid concurrent access
         try {
             final HiveEventContext event = new HiveEventContext();
+
             event.setInputs(hookContext.getInputs());
             event.setOutputs(hookContext.getOutputs());
             event.setHookType(hookContext.getHookType());
 
-            final UserGroupInformation ugi = hookContext.getUgi() == null ? Utils.getUGI() : hookContext.getUgi();
+            final UserGroupInformation ugi       = hookContext.getUgi() == null ? Utils.getUGI() : hookContext.getUgi();
+            final QueryPlan            queryPlan = hookContext.getQueryPlan();
+
             event.setUgi(ugi);
             event.setUser(getUser(hookContext.getUserName(), hookContext.getUgi()));
             event.setOperation(OPERATION_MAP.get(hookContext.getOperationName()));
-            event.setQueryId(hookContext.getQueryPlan().getQueryId());
-            event.setQueryStr(hookContext.getQueryPlan().getQueryStr());
-            event.setQueryStartTime(hookContext.getQueryPlan().getQueryStartTime());
-            event.setQueryType(hookContext.getQueryPlan().getQueryPlan().getQueryType());
+            event.setQueryId(queryPlan.getQueryId());
+            event.setQueryStr(queryPlan.getQueryStr());
+            event.setQueryStartTime(queryPlan.getQueryStartTime());
             event.setLineageInfo(hookContext.getLinfo());
 
             if (executor == null) {
@@ -1088,8 +1091,6 @@
 
         private List<HookNotification.HookNotificationMessage> messages = new ArrayList<>();
 
-        private String queryType;
-
         public void setInputs(Set<ReadEntity> inputs) {
             this.inputs = inputs;
         }
@@ -1126,10 +1127,6 @@
             this.queryStartTime = queryStartTime;
         }
 
-        public void setQueryType(String queryType) {
-            this.queryType = queryType;
-        }
-
         public void setLineageInfo(LineageInfo lineageInfo){
             try {
                 this.lineageInfo = ColumnLineageUtils.buildLineageMap(lineageInfo);
@@ -1175,10 +1172,6 @@
             return queryStartTime;
         }
 
-        public String getQueryType() {
-            return queryType;
-        }
-
         public void addMessage(HookNotification.HookNotificationMessage message) {
             messages.add(message);
         }