[atlas] 03/07: ATLAS-3844 - Ignore relationship attributes while fetching entities in Import Hive bridge.

[sarath]

This is an automated email from the ASF dual-hosted git repository.

sarath pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 260f06645d95474209d433c78086c07e25c20dc2
Author: nixonrodrigues <ni...@apache.org>
AuthorDate: Wed Jun 17 15:11:28 2020 +0530

    ATLAS-3844 - Ignore relationship attributes while fetching entities in 
Import Hive bridge.
    
    Change-Id: I1d0eeb478286e896af733b51fe4f7fc62c594899
    (cherry picked from commit cea851c5513cede054bc7704ac24c04cc498cd32)
---
 .../org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
index 534cdaf..24e06dc 100755
--- 
a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
+++ 
b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java
@@ -758,7 +758,7 @@ public class HiveMetaStoreBridge {
 
         String typeName = HiveDataTypes.HIVE_DB.getName();
 
-        return findEntity(typeName, getDBQualifiedName(metadataNamespace, 
databaseName));
+        return findEntity(typeName, getDBQualifiedName(metadataNamespace, 
databaseName), true, true);
     }
 
     /**
@@ -776,7 +776,7 @@ public class HiveMetaStoreBridge {
         String typeName         = HiveDataTypes.HIVE_TABLE.getName();
         String tblQualifiedName = 
getTableQualifiedName(getMetadataNamespace(), hiveTable.getDbName(), 
hiveTable.getTableName());
 
-        return findEntity(typeName, tblQualifiedName);
+        return findEntity(typeName, tblQualifiedName, true, true);
     }
 
     private AtlasEntityWithExtInfo findProcessEntity(String qualifiedName) 
throws Exception{
@@ -786,14 +786,14 @@ public class HiveMetaStoreBridge {
 
         String typeName = HiveDataTypes.HIVE_PROCESS.getName();
 
-        return findEntity(typeName, qualifiedName);
+        return findEntity(typeName, qualifiedName , true , true);
     }
 
-    private AtlasEntityWithExtInfo findEntity(final String typeName, final 
String qualifiedName) throws AtlasServiceException {
+    private AtlasEntityWithExtInfo findEntity(final String typeName, final 
String qualifiedName ,  boolean minExtInfo, boolean ignoreRelationship) throws 
AtlasServiceException {
         AtlasEntityWithExtInfo ret = null;
 
         try {
-            ret = atlasClientV2.getEntityByAttribute(typeName, 
Collections.singletonMap(ATTRIBUTE_QUALIFIED_NAME, qualifiedName));
+            ret = atlasClientV2.getEntityByAttribute(typeName, 
Collections.singletonMap(ATTRIBUTE_QUALIFIED_NAME, qualifiedName), minExtInfo, 
ignoreRelationship);
         } catch (AtlasServiceException e) {
             if(e.getStatus() == ClientResponse.Status.NOT_FOUND) {
                 return null;
@@ -802,8 +802,6 @@ public class HiveMetaStoreBridge {
             throw e;
         }
 
-        clearRelationshipAttributes(ret);
-
         return ret;
     }
 
@@ -961,4 +959,4 @@ public class HiveMetaStoreBridge {
         }
         return ret;
     }
-}
\ No newline at end of file
+}