commit c6661ff15c15856ae030c95ffbbf808ff0850d5a
author Mandar Ambawane <mandar.ambawane@freestoneinfotech.com> Wed Nov 27 15:23:20 2019 +0530
committer Madhan Neethiraj <madhan@apache.org> Thu Nov 28 10:27:35 2019 -0800
tree e9915359c05904d4706ad5b538b8e7f3ab54937f
parent af203374232bc1ba6f7c42731619416b40b1db1c

ATLAS-3539: fixed Hive metastore hook to populate hive_db.ownerType, and not update hive_db.description when null

Signed-off-by: Madhan Neethiraj <madhan@apache.org>

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

diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
index 851582c..425be59 100644
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/BaseHiveEvent.java
@@ -314,7 +314,11 @@
 
             ret.setAttribute(ATTRIBUTE_QUALIFIED_NAME, dbQualifiedName);
             ret.setAttribute(ATTRIBUTE_NAME, dbName);
-            ret.setAttribute(ATTRIBUTE_DESCRIPTION, db.getDescription());
+
+            if (StringUtils.isNotEmpty(db.getDescription())) {
+                ret.setAttribute(ATTRIBUTE_DESCRIPTION, db.getDescription());
+            }
+
             ret.setAttribute(ATTRIBUTE_OWNER, db.getOwnerName());
 
             ret.setAttribute(ATTRIBUTE_CLUSTER_NAME, getMetadataNamespace());

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

diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
index 7bea779..c8a9ce3 100644
--- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
+++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/hook/events/CreateDatabase.java
@@ -61,6 +61,10 @@
         Database                 db      = dbEvent.getDatabase();
 
         if (db != null) {
+            db = context.getMetastoreHandler().get_database(db.getName());
+        }
+
+        if (db != null) {
             AtlasEntity dbEntity = toDbEntity(db);
 
             ret.addEntity(dbEntity);