Merge branch 'master' into beta-sync-helper

atlanhq · Dec 19, 2023 · 0138517 · 0138517
2 parents c2fdf44 + ba89dfb
commit 0138517
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...ry/src/main/java/org/apache/atlas/repository/store/graph/v2/ClassificationAssociator.java b/...ry/src/main/java/org/apache/atlas/repository/store/graph/v2/ClassificationAssociator.java
@@ -290,12 +290,14 @@ private void deleteClassifications(String entityGuid, String typeName, List<Atla
             if (CollectionUtils.isEmpty(list)) {
                 return;
             }
-            String classificationNames = getClassificationNames(list);
-            try {
-                entitiesStore.deleteClassifications(entityGuid, list);
-            } catch (AtlasBaseException e) {
-                LOG.error("Failed to remove classification association between {}, entity with guid {}", classificationNames, entityGuid);
-                throw e;
+
+            for (AtlasClassification c : list) {
+                try {
+                    entitiesStore.deleteClassification(entityGuid, c.getTypeName());
+                } catch (AtlasBaseException e) {
+                    LOG.error("Failed to remove classification association between {}, entity with guid {}", c.getTypeName(), c.getEntityGuid());
+                    throw e;
+                }
             }
         }
 

diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
@@ -201,7 +201,6 @@ public class EntityGraphMapper {
     private final IAtlasEntityChangeNotifier entityChangeNotifier;
     private final AtlasInstanceConverter    instanceConverter;
     private final EntityGraphRetriever      entityRetriever;
-    private final EntityGraphRetriever      entityRetrieverNoRelation;
     private final IFullTextMapper           fullTextMapperV2;
     private final TaskManagement            taskManagement;
     private final TransactionInterceptHelper   transactionInterceptHelper;
@@ -220,7 +219,6 @@ public EntityGraphMapper(DeleteHandlerDelegate deleteDelegate, RestoreHandlerV1
         this.entityChangeNotifier = entityChangeNotifier;
         this.instanceConverter    = instanceConverter;
         this.entityRetriever      = new EntityGraphRetriever(graph, typeRegistry);
-        this.entityRetrieverNoRelation     = new EntityGraphRetriever(graph, typeRegistry, true);
         this.fullTextMapperV2     = fullTextMapperV2;
         this.taskManagement       = taskManagement;
         this.transactionInterceptHelper = transactionInterceptHelper;

diff --git a/server-api/src/main/java/org/apache/atlas/RequestContext.java b/server-api/src/main/java/org/apache/atlas/RequestContext.java
@@ -161,6 +161,9 @@ public void clearCache() {
         this.relationshipMutationMap.clear();
         this.currentTask = null;
         this.skipAuthorizationCheck = false;
+        this.delayTagNotifications = false;
+        deletedClassificationAndVertices.clear();
+        addedClassificationAndVertices.clear();
 
         if (metrics != null && !metrics.isEmpty()) {
             METRICS.debug(metrics.toString());