some optimizations

atlanhq · Dec 2, 2024 · 817fc5b · 817fc5b
1 parent d3ae7c4
commit 817fc5b
Showing 1 changed file with 12 additions and 3 deletions.
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
@@ -1132,6 +1132,7 @@ private AtlasEntityHeader mapVertexToAtlasEntityHeaderWithoutPrefetch(AtlasVerte
                             }
                         }
 
+
                         Object attrValue = getVertexAttribute(entityVertex, attribute);
 
                         if (attrValue != null) {
@@ -1865,13 +1866,21 @@ public Object getVertexAttributePreFetchCache(AtlasVertex vertex, AtlasAttribute
             return null;
         }
 
-        if (properties.get(attribute.getName()) != null) {
+        LOG.info("capturing property its category and value - {}: {} : {}", attribute.getName(), attribute.getAttributeType().getTypeCategory(), properties.get(attribute.getName()));
+
+        if (attribute.getAttributeType().getTypeCategory().equals(TypeCategory.PRIMITIVE) ||
+                attribute.getAttributeType().getTypeCategory().equals(TypeCategory.ENUM)) {
+            return properties.get(attribute.getName());
+        }
+
+        if (attribute.getAttributeType().getTypeCategory().equals(TypeCategory.ARRAY) &&
+                (attribute.getAttributeType()).getTypeCategory().getClass().getComponentType().toString().equals("class java.lang.String")) {
             return properties.get(attribute.getName());
         }
 
-        if (AtlasConfiguration.ATLAS_INDEXSEARCH_ENABLE_FETCHING_NON_PRIMITIVE_ATTRIBUTES.getBoolean() && !attribute.getAttributeType().getTypeCategory().equals(TypeCategory.PRIMITIVE)) {
+        Set<TypeCategory> ENRICH_PROPERTY_TYPES = new HashSet<>(Arrays.asList(TypeCategory.STRUCT, TypeCategory.OBJECT_ID_TYPE, TypeCategory.MAP));
+        if (ENRICH_PROPERTY_TYPES.contains(attribute.getAttributeType().getTypeCategory())) {
             AtlasPerfMetrics.MetricRecorder nonPrimitiveAttributes = RequestContext.get().startMetricRecord("processNonPrimitiveAttributes");
-            LOG.info("Fetching non primitive attributes for entity: {}", attribute.getName());
             Object mappedVertex = mapVertexToAttribute(vertex, attribute, null, false);
             properties.put(attribute.getName(), mappedVertex);
             RequestContext.get().endMetricRecord(nonPrimitiveAttributes);