Skip to content

RANGER-3899: Policy creation/updation takes more time when there are more users,groups,roles #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mneethiraj merged 4 commits into from
May 24, 2026
Merged

RANGER-3899: Policy creation/updation takes more time when there are more users,groups,roles #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03d5553
RANGER-3899: Policy creation/updation takes more time when there are …
May 21, 2026
8f94498
Fixing Review comments
May 22, 2026
262cba9
readability improvements
mneethiraj May 23, 2026
7ecc350
RANGER-3899: Fix JaCoCo coverage report for multi-release JAR classes
May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dev-support/checks/coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ find . -type d -name 'target' -prune -exec find {} -type f \( -name 'ranger-*.ja
-or -name '*shim*' -prune \
| xargs -n1 unzip -o -q -d target/coverage-classes

# Multi-release JARs (e.g. BouncyCastle) ship the same classes under
# META-INF/versions/* and at the root; JaCoCo fails with duplicate class names.
rm -rf target/coverage-classes/META-INF/versions || true

# get all source file paths
src=$(find . -path '*/src/main/java' -o -path './target' -prune | sed 's/^/--sourcefiles /g' | xargs echo)

Expand Down
735 changes: 509 additions & 226 deletions security-admin/src/main/java/org/apache/ranger/biz/PolicyRefUpdater.java
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,11 +1472,9 @@ public RangerPolicy updatePolicy(RangerPolicy policy) throws Exception {

XXPolicy newUpdPolicy = daoMgr.getXXPolicy().getById(policy.getId());

policyRefUpdater.cleanupRefTables(policy);

deleteExistingPolicyLabel(policy);

policyRefUpdater.createNewPolMappingForRefTable(policy, newUpdPolicy, xServiceDef, bizUtil.getCreatePrincipalsIfAbsent());
policyRefUpdater.createNewPolMappingForRefTable(policy, newUpdPolicy, xServiceDef, bizUtil.getCreatePrincipalsIfAbsent(), true);

createOrMapLabels(newUpdPolicy, uniquePolicyLabels);

Expand Down Expand Up @@ -2290,7 +2288,7 @@ public RangerPolicy createPolicy(RangerPolicy policy, boolean createPrincipalsIf

XXPolicy xCreatedPolicy = daoMgr.getXXPolicy().getById(policy.getId());

policyRefUpdater.createNewPolMappingForRefTable(policy, xCreatedPolicy, xServiceDef, createPrincipalsIfAbsent);
policyRefUpdater.createNewPolMappingForRefTable(policy, xCreatedPolicy, xServiceDef, createPrincipalsIfAbsent, false);

createOrMapLabels(xCreatedPolicy, uniquePolicyLabels);

Expand Down
27 changes: 27 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,27 @@

package org.apache.ranger.db;

import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAccessTypeDef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

@Service
public class XXAccessTypeDefDao extends BaseDao<XXAccessTypeDef> {
private static final Logger logger = LoggerFactory.getLogger(XXAccessTypeDefDao.class);

public XXAccessTypeDefDao(RangerDaoManagerBase daoManager) {
super(daoManager);
}
Expand Down Expand Up @@ -76,4 +85,22 @@ public List<String> getNamesByServiceName(String serviceName) {

return ret != null ? ret : Collections.emptyList();
}

public Map<String, Long> findAccessTypeDefIdsByNamesAndServiceId(Set<String> names, Long serviceId) {
if (serviceId != null && CollectionUtils.isNotEmpty(names)) {
try {
Collection<Object[]> result = getEntityManager()
.createNamedQuery("XXAccessTypeDef.findAccessTypeDefIdsByNamesAndServiceId", Object[].class)
.setParameter("names", names)
.setParameter("serviceId", serviceId)
.getResultList();

return result.stream().collect(Collectors.toMap(object -> (String) object[1], object -> (Long) object[0], (a, b) -> a));
} catch (NoResultException e) {
logger.debug(e.getMessage());
}
}

return Collections.emptyMap();
}
}
27 changes: 27 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,27 @@

package org.apache.ranger.db;

import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXDataMaskTypeDef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

@Service
public class XXDataMaskTypeDefDao extends BaseDao<XXDataMaskTypeDef> {
private static final Logger logger = LoggerFactory.getLogger(XXDataMaskTypeDefDao.class);

public XXDataMaskTypeDefDao(RangerDaoManagerBase daoManager) {
super(daoManager);
}
Expand Down Expand Up @@ -76,4 +85,22 @@ public List<String> getNamesByServiceName(String serviceName) {

return ret != null ? ret : Collections.emptyList();
}

public Map<String, Long> findDataMaskTypeDefIdsByNamesAndServiceId(Set<String> names, Long serviceId) {
if (serviceId != null && CollectionUtils.isNotEmpty(names)) {
try {
Collection<Object[]> result = getEntityManager()
.createNamedQuery("XXDataMaskTypeDef.findDataMaskTypeDefIdsByNamesAndServiceId", Object[].class)
.setParameter("names", names)
.setParameter("serviceId", serviceId)
.getResultList();

return result.stream().collect(Collectors.toMap(object -> (String) object[1], object -> (Long) object[0], (a, b) -> a));
} catch (NoResultException e) {
logger.debug(e.getMessage());
}
}

return Collections.emptyMap();
}
}
21 changes: 21 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

package org.apache.ranger.db;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ranger.authorization.utils.JsonUtils;
import org.apache.ranger.common.RangerCommonEnums;
Expand All @@ -32,9 +33,12 @@
import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.apache.ranger.plugin.util.RangerCommonConstants.SCRIPT_FIELD__IS_INTERNAL;
import static org.apache.ranger.plugin.util.RangerCommonConstants.SCRIPT_FIELD__SYNC_SOURCE;
Expand Down Expand Up @@ -114,6 +118,23 @@ public List<GroupInfo> getAllGroupsInfo() {
return ret;
}

public Map<String, Long> getIdsByGroupNames(Collection<String> groupNames) {
if (CollectionUtils.isNotEmpty(groupNames)) {
try {
Collection<Object[]> result = getEntityManager()
.createNamedQuery("XXGroup.getIdsByGroupNames", Object[].class)
.setParameter("names", groupNames)
.getResultList();

return result.stream().collect(Collectors.toMap(object -> (String) (object[1]), object -> (Long) (object[0])));
} catch (NoResultException excp) {
logger.debug(excp.getMessage());
}
}

return Collections.emptyMap();
}

private GroupInfo toGroupInfo(Object[] row) {
String name = (String) row[0];
String description = (String) row[1];
Expand Down
28 changes: 28 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,27 @@

package org.apache.ranger.db;

import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyConditionDef;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;

import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

@Service
public class XXPolicyConditionDefDao extends BaseDao<XXPolicyConditionDef> {
private static final Logger logger = LoggerFactory.getLogger(XXPolicyConditionDefDao.class);

public XXPolicyConditionDefDao(RangerDaoManagerBase daoManager) {
super(daoManager);
}
Expand Down Expand Up @@ -60,4 +70,22 @@ public XXPolicyConditionDef findByServiceDefIdAndName(Long serviceDefId, String
return null;
}
}

public Map<String, Long> findConditionDefIdsByServiceDefIdAndNames(Long serviceDefId, Set<String> names) {
if (serviceDefId != null && CollectionUtils.isNotEmpty(names)) {
try {
Collection<Object[]> result = getEntityManager()
.createNamedQuery("XXPolicyConditionDef.findConditionDefIdsByServiceDefIdAndNames", Object[].class)
.setParameter("serviceDefId", serviceDefId)
.setParameter("names", names)
.getResultList();

return result.stream().collect(Collectors.toMap(object -> (String) object[1], object -> (Long) object[0], (a, b) -> a));
} catch (NoResultException e) {
logger.debug(e.getMessage());
}
}

return Collections.emptyMap();
}
}
29 changes: 29 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefGroupDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class XXPolicyRefGroupDao extends BaseDao<XXPolicyRefGroup> {
Expand Down Expand Up @@ -120,4 +123,30 @@ public void deleteByPolicyId(Long policyId) {

batchDeleteByIds("XXPolicyRefGroup.deleteByIds", ids, "ids");
}

public Map<String, Long> findGroupNameByPolicyId(Long policyId) {
Map<String, Long> ret = Collections.emptyMap();
if (policyId != null) {
try {
Collection<Object[]> results = getEntityManager()
.createNamedQuery("XXPolicyRefGroup.findGroupNameByPolicyId", Object[].class)
.setParameter("policyId", policyId)
.getResultList();
ret = results.stream().collect(
Collectors.toMap(
object -> (String) object[0],
object -> (Long) object[1]));
} catch (NoResultException e) {
// ignore
}
}
return ret;
}

public void deletePolicyRefGroupByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
batchDeleteByIds("XXPolicyRefGroup.deletePolicyRefGroupByIds", ids, "ids");
}
}
29 changes: 29 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefRoleDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class XXPolicyRefRoleDao extends BaseDao<XXPolicyRefRole> {
Expand Down Expand Up @@ -133,4 +136,30 @@ public void deleteByPolicyId(Long policyId) {

batchDeleteByIds("XXPolicyRefRole.deleteByIds", ids, "ids");
}

public Map<String, Long> findRoleNameIdByPolicyId(Long policyId) {
Map<String, Long> ret = Collections.emptyMap();
if (policyId != null) {
try {
Collection<Object[]> results = getEntityManager()
.createNamedQuery("XXPolicyRefRole.findRoleNameIdByPolicyId", Object[].class)
.setParameter("policyId", policyId)
.getResultList();
ret = results.stream().collect(
Collectors.toMap(
object -> (String) object[0],
object -> (Long) object[1]));
} catch (NoResultException e) {
// ignore
}
}
return ret;
}

public void deletePolicyRefRoleByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
batchDeleteByIds("XXPolicyRefRole.deletePolicyRefRoleByIds", ids, "ids");
}
}
29 changes: 29 additions & 0 deletions security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefUserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
import javax.persistence.NoResultException;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

@Service
public class XXPolicyRefUserDao extends BaseDao<XXPolicyRefUser> {
Expand Down Expand Up @@ -133,4 +136,30 @@ public void deleteByPolicyId(Long policyId) {

batchDeleteByIds("XXPolicyRefUser.deleteByIds", ids, "ids");
}

public Map<String, Long> findUserNameIdByPolicyId(Long policyId) {
Map<String, Long> ret = Collections.emptyMap();
if (policyId != null) {
try {
Collection<Object[]> results = getEntityManager()
.createNamedQuery("XXPolicyRefUser.findUserNameIdByPolicyId", Object[].class)
.setParameter("policyId", policyId)
.getResultList();
ret = results.stream().collect(
Collectors.toMap(
object -> (String) object[0],
object -> (Long) object[1]));
} catch (NoResultException e) {
// ignore
}
}
return ret;
}

public void deletePolicyRefUserByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
batchDeleteByIds("XXPolicyRefUser.deletePolicyRefUserByIds", ids, "ids");
}
}
Loading
Loading