Merge pull request #3898 from atlanhq/dev/hotfix/cassandraOptimisation

Hotfix assandra optimisation
atlanhq · Dec 18, 2024 · 19b1c3d · 19b1c3d
2 parents ef4bdb3 + 1207ae5
commit 19b1c3d
Show file tree

Hide file tree

Showing 3 changed files with 4 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
@@ -1081,7 +1081,7 @@ private void retrieveEdgeLabels(AtlasVertex entityVertex, AtlasEdgeDirection edg
                }
 
             String edgeTypeName = edgesTypeName.get(edgeLabel);
-            if (relationshipsLookup.containsKey(edgeTypeName) && attribute.equals(relationshipsLookup.get(edgeTypeName))) {
+            if (MapUtils.isNotEmpty(relationshipsLookup) && relationshipsLookup.containsKey(edgeTypeName) && attribute.equals(relationshipsLookup.get(edgeTypeName))) {
                 edgeLabels.add(attribute);
             }
         }));
@@ -1960,7 +1960,7 @@ public Object getVertexAttributePreFetchCache(AtlasVertex vertex, AtlasAttribute
         }
 
         // value is present as marker , fetch the value from the vertex
-        if (properties.get(attribute.getName()) == StringUtils.SPACE) {
+        if (properties.get(attribute.getName()) != null && properties.get(attribute.getName()).equals(StringUtils.SPACE)) {
             return mapVertexToAttribute(vertex, attribute, null, false);
         }
 

diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/DiscoveryREST.java
@@ -446,6 +446,7 @@ public AtlasSearchResult indexSearch(@Context HttpServletRequest servletRequest,
             if (enableSearchLogging && parameters.isSaveSearchLog()) {
                 logSearchLog(parameters, servletRequest, abe, System.currentTimeMillis() - startTime);
             }
+            abe.setStackTrace(e.getStackTrace());
             throw abe;
         } finally {
             if(CollectionUtils.isNotEmpty(parameters.getUtmTags())) {

diff --git a/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java b/webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java
@@ -1269,7 +1269,7 @@ public void setClassifications(AtlasEntityHeaders entityHeaders, @QueryParam("ov
 
         try {
             if (AtlasPerfTracer.isPerfTraceEnabled(PERF_LOG)) {
-                perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, "EntityREST.setClassifications()");
+                perf = AtlasPerfTracer.getPerfTracer(PERF_LOG, "EntityREST.setClassifications(" + overrideClassifications +")");
             }
 
             ClassificationAssociator.Updater associator = new ClassificationAssociator.Updater(typeRegistry, entitiesStore, entityGraphMapper, entityChangeNotifier, instanceConverter);