PLT-191: minor updates

atlanhq · Nov 23, 2023 · aa86e1e · aa86e1e
1 parent 68b706c
commit aa86e1e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java b/common/src/main/java/org/apache/atlas/service/redis/AbstractRedisService.java
@@ -20,6 +20,7 @@
 public abstract class AbstractRedisService implements RedisService {
 
     private static final String REDIS_URL_PREFIX = "redis://";
+    private static final String ATLAS_REDIS = "atlas-redis";
     private static final String ATLAS_REDIS_URL = "atlas.redis.url";
     private static final String ATLAS_REDIS_SENTINEL_URLS = "atlas.redis.sentinel.urls";
     private static final String ATLAS_REDIS_USERNAME = "atlas.redis.username";
@@ -99,6 +100,7 @@ Config getLocalConfig() throws AtlasException {
     Config getProdConfig() throws AtlasException {
         Config config = initAtlasConfig();
         config.useSentinelServers()
+                .setClientName(ATLAS_REDIS)
                 .setReadMode(ReadMode.MASTER_SLAVE)
                 .setCheckSentinelsList(false)
                 .setMasterName(atlasConfig.getString(ATLAS_REDIS_MASTER_NAME))

diff --git a/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java b/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java
@@ -259,6 +259,23 @@ public AtlasObjectId toAtlasObjectId(AtlasVertex entityVertex) throws AtlasBaseE
             Map<String, Object> attributes = new HashMap<>();
             Set<String> relationAttributes = RequestContext.get().getRelationAttrsForSearch();
             if (CollectionUtils.isNotEmpty(relationAttributes)) {
+                relationAttributes.stream().parallel().forEach(attributeName->{
+                    try {
+                        AtlasAttribute attribute = entityType.getAttribute(attributeName);
+                        if (attribute != null
+                                && !uniqueAttributes.containsKey(attributeName)) {
+                            Object attrValue = null;
+
+                            attrValue = getVertexAttribute(entityVertex, attribute);
+
+                            if (attrValue != null) {
+                                attributes.put(attribute.getName(), attrValue);
+                            }
+                        }
+                    } catch (AtlasBaseException e) {
+                        e.printStackTrace();
+                    }
+                });
                 for (String attributeName : relationAttributes) {
                     AtlasAttribute attribute = entityType.getAttribute(attributeName);
                     if (attribute != null