External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-06-29 10:28:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

[devel backport][AAP-70902] Use _actor_role_filter() in UnifiedJobTemplate.accessible_pk_qs() (#16513)

Browse Source 
* Use _actor_role_filter() in UnifiedJobTemplate.accessible_pk_qs()

Replace `role__in=accessor.has_roles.all()` with the optimized `_actor_role_filter()` subquery pattern from django-ansible-base.

The old pattern causes a 3-table JOIN through RoleUserAssignment -> ObjectRole -> RoleEvaluation on every non-superuser request. _actor_role_filter() skips the ObjectRole table entirely by using a direct subquery on RoleUserAssignment.object_role_id, eliminating the intermediate JOIN and reducing query time for /api/v2/unified_jobs/ requests by non-superusers.
This commit is contained in:
Dirk Julich
2026-06-19 16:45:14 +02:00
committed by GitHub
parent 0dfc168a5f
commit 23b7ad5067
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/unified_jobs.py
View File

@@ -234,7 +234,11 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, ExecutionEn
dab_role_cts = permission_registry.content_type_model.objects.get_for_models(*role_subclasses).values() dab_role_cts = permission_registry.content_type_model.objects.get_for_models(*role_subclasses).values()
return ( return (
RoleEvaluation.objects.filter(role__in=accessor.has_roles.all(), codename__in=all_codenames, content_type_id__in=[ct.id for ct in dab_role_cts]) RoleEvaluation.objects.filter(
**RoleEvaluation._actor_role_filter(accessor),
codename__in=all_codenames,
content_type_id__in=[ct.id for ct in dab_role_cts],
)
.values_list('object_id') .values_list('object_id')
.distinct() .distinct()
) )