This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch RANGER-5104_master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit c6e52024293c2e60f668e82e123e78d754bedea8 Author: Pradeep AgrawaL <[email protected]> AuthorDate: Wed Jan 15 15:27:01 2025 +0530 RANGER-5104: Ranger Upgrade is failing while executing the PatchPreSql057_ForUpdateToUniqueGUID_J10052 --- .../main/java/org/apache/ranger/db/XXSecurityZoneDao.java | 15 +++++++++++++++ .../PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java | 2 +- .../src/main/resources/META-INF/jpa_named_queries.xml | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java index 51b4d1a1e..4a872b702 100644 --- a/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java +++ b/security-admin/src/main/java/org/apache/ranger/db/XXSecurityZoneDao.java @@ -158,4 +158,19 @@ public class XXSecurityZoneDao extends BaseDao<XXSecurityZone> { return securityZoneList; } + + public List<XXSecurityZone> getAllZoneIdNames() { + @SuppressWarnings("unchecked") + List<Object[]> results = getEntityManager().createNamedQuery("XXSecurityZone.getAllZoneIdNames").getResultList(); + + List<XXSecurityZone> securityZoneList = new ArrayList<XXSecurityZone>(results.size()); + for (Object[] result : results) { + XXSecurityZone xXSecurityZone = new XXSecurityZone(); + xXSecurityZone.setId((Long) result[0]); + xXSecurityZone.setName((String) result[1]); + securityZoneList.add(xXSecurityZone); + } + + return securityZoneList; + } } diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java index 33c72f58a..8282db56a 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPreSql_057_ForUpdateToUniqueGUID_J10052.java @@ -106,7 +106,7 @@ public class PatchPreSql_057_ForUpdateToUniqueGUID_J10052 extends BaseLoader { private void updatePolicyGUIDToUniqueValue() { logger.info("==> updatePolicyGUIDToUniqueValue() "); - List<XXSecurityZone> allXXZones = daoMgr.getXXSecurityZoneDao().getAll(); + List<XXSecurityZone> allXXZones = daoMgr.getXXSecurityZoneDao().getAllZoneIdNames(); List<XXService> allXXService = daoMgr.getXXService().getAll(); if (CollectionUtils.isNotEmpty(allXXZones) && CollectionUtils.isNotEmpty(allXXService)) { diff --git a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml index 855e27ae5..56eefba40 100755 --- a/security-admin/src/main/resources/META-INF/jpa_named_queries.xml +++ b/security-admin/src/main/resources/META-INF/jpa_named_queries.xml @@ -1724,6 +1724,12 @@ </query> </named-query> + <named-query name="XXSecurityZone.getAllZoneIdNames"> + <query> + select obj.id, obj.name from XXSecurityZone obj + </query> + </named-query> + <named-query name="XXSecurityZoneRefGroup.findByZoneId"> <query> select obj from XXSecurityZoneRefGroup obj where obj.zoneId = :zoneId
