[atlas] branch branch-2.0 updated: ATLAS-3866 : Relationship search API for hive storage desc throws error code 500

[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


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 5ff3339  ATLAS-3866 : Relationship search API for hive storage desc 
throws error code 500
5ff3339 is described below

commit 5ff3339fc03149e62bbdea9991e954539f262968
Author: Pinal Shah <pinal.s...@freestoneinfotech.com>
AuthorDate: Mon Jun 29 10:04:26 2020 +0530

    ATLAS-3866 : Relationship search API for hive storage desc throws error 
code 500
    
    Signed-off-by: Sarath Subramanian <sar...@apache.org>
    (cherry picked from commit 0221e3dd297057dab344b8d9b6672a37adafabbc)
---
 .../atlas/discovery/EntityDiscoveryService.java    | 50 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git 
a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
 
b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
index dd4d1b4..eeafa91 100644
--- 
a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
+++ 
b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
@@ -63,14 +63,13 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 import java.util.*;
 
-import static org.apache.atlas.AtlasErrorCode.CLASSIFICATION_NOT_FOUND;
-import static org.apache.atlas.AtlasErrorCode.DISCOVERY_QUERY_FAILED;
-import static org.apache.atlas.AtlasErrorCode.UNKNOWN_TYPENAME;
+import static org.apache.atlas.AtlasErrorCode.*;
 import static org.apache.atlas.SortOrder.ASCENDING;
 import static org.apache.atlas.SortOrder.DESCENDING;
 import static org.apache.atlas.model.instance.AtlasEntity.Status.ACTIVE;
 import static org.apache.atlas.model.instance.AtlasEntity.Status.DELETED;
-import static org.apache.atlas.repository.Constants.*;
+import static org.apache.atlas.repository.Constants.ASSET_ENTITY_TYPE;
+import static org.apache.atlas.repository.Constants.OWNER_ATTRIBUTE;
 import static 
org.apache.atlas.util.AtlasGremlinQueryProvider.AtlasGremlinQuery.*;
 
 @Component
@@ -562,7 +561,7 @@ public class EntityDiscoveryService implements 
AtlasDiscoveryService {
 
     @Override
     @GraphTransaction
-    public AtlasSearchResult searchRelatedEntities(String guid, String 
relation, String sortByAttributeName, SortOrder sortOrder,
+    public AtlasSearchResult searchRelatedEntities(String guid, String 
relation, String sortBy, SortOrder sortOrder,
                                                    boolean 
excludeDeletedEntities, int limit, int offset) throws AtlasBaseException {
         AtlasSearchResult ret = new 
AtlasSearchResult(AtlasQueryType.RELATIONSHIP);
 
@@ -592,15 +591,50 @@ public class EntityDiscoveryService implements 
AtlasDiscoveryService {
             }
         }
 
-        if (StringUtils.isEmpty(sortByAttributeName)) {
-            sortByAttributeName = DEFAULT_SORT_ATTRIBUTE_NAME;
+        String sortByAttributeName = DEFAULT_SORT_ATTRIBUTE_NAME;
+
+        if (StringUtils.isNotEmpty(sortBy)) {
+            sortByAttributeName = sortBy;
+        }
+
+        //get entity type of relationship (End vertex entity type) from 
relationship label
+        Iterator<AtlasEdge> edges         = 
GraphHelper.getAdjacentEdgesByLabel(entityVertex, AtlasEdgeDirection.BOTH, 
relation);
+        AtlasEntityType     endEntityType = null;
+
+        if (edges != null && edges.hasNext()) {
+            AtlasEdge   relationEdge = edges.next();
+            AtlasVertex outVertex    = relationEdge.getOutVertex();
+            AtlasVertex inVertex     = relationEdge.getInVertex();
+            String      outVertexId  = outVertex != null ? 
outVertex.getIdForDisplay() : null;
+            AtlasVertex endVertex    = StringUtils.equals(outVertexId, 
entityVertex.getIdForDisplay()) ? inVertex : outVertex;
+            String      endTypeName  = GraphHelper.getTypeName(endVertex);
+
+            endEntityType = typeRegistry.getEntityTypeByName(endTypeName);
+        }
+
+        if (endEntityType == null) {
+            ret.setEntities(new ArrayList<>());
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Invalid relation : {} ", relation);
+            }
+
+            return ret;
         }
 
-        AtlasAttribute sortByAttribute = 
entityType.getAttribute(sortByAttributeName);
+        AtlasAttribute sortByAttribute = 
endEntityType.getAttribute(sortByAttributeName);
 
         if (sortByAttribute == null) {
             sortByAttributeName = null;
             sortOrder           = null;
+
+            if (LOG.isDebugEnabled()) {
+                if (StringUtils.isNotEmpty(sortBy)) {
+                    LOG.debug("Invalid sortBy Attribute {} for entityType {}, 
Ignoring Sorting", sortBy, endEntityType.getTypeName());
+                } else {
+                    LOG.debug("Invalid Default sortBy Attribute {} for 
entityType {}, Ignoring Sorting", DEFAULT_SORT_ATTRIBUTE_NAME, 
endEntityType.getTypeName());
+                }
+            }
         } else {
             sortByAttributeName = sortByAttribute.getVertexPropertyName();