Merge pull request #3367 from atlanhq/disc-367-glossary-filter

fix: make all glossary queries at once
atlanhq · Jul 24, 2024 · 93f70e5 · 93f70e5
2 parents 976baa3 + 39e04ea
commit 93f70e5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/aliasstore/ESAliasStore.java b/repository/src/main/java/org/apache/atlas/repository/store/aliasstore/ESAliasStore.java
@@ -179,6 +179,7 @@ private Map<String, Object> getFilterForPurpose(AtlasEntity purpose) throws Atla
     private void personaPolicyToESDslClauses(List<AtlasEntity> policies,
                                              List<Map<String, Object>> allowClauseList) throws AtlasBaseException {
         List<String> terms = new ArrayList<>();
+        Set<String> glossaryQualifiedNames =new HashSet<>();
 
         for (AtlasEntity policy: policies) {
 
@@ -211,7 +212,7 @@ private void personaPolicyToESDslClauses(List<AtlasEntity> policies,
                 } else if (getPolicyActions(policy).contains(ACCESS_READ_PERSONA_GLOSSARY)) {
                     if (CollectionUtils.isNotEmpty(assets)) {
                         terms.addAll(assets);
-                        allowClauseList.add(mapOf("terms", mapOf(GLOSSARY_PROPERTY_KEY, assets)));
+                        glossaryQualifiedNames.addAll(assets);
                     }
                 } else if (getPolicyActions(policy).contains(ACCESS_READ_PERSONA_DOMAIN)) {
                     for (String asset : assets) {
@@ -249,6 +250,10 @@ private void personaPolicyToESDslClauses(List<AtlasEntity> policies,
         }
 
         allowClauseList.add(mapOf("terms", mapOf(QUALIFIED_NAME, terms)));
+
+        if (CollectionUtils.isNotEmpty(glossaryQualifiedNames)) {
+            allowClauseList.add(mapOf("terms", mapOf(GLOSSARY_PROPERTY_KEY, new ArrayList<>(glossaryQualifiedNames))));
+        }
     }
 
     private boolean isAllDomain(String asset) {