External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Activity Stream prefetch update to new fields, avoid distinct.count repeated queries

Browse Source
This commit is contained in:
AlanCoding
2016-06-24 13:31:10 -04:00
parent 1b9b14d6f7
commit 02dac5299c
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -2621,7 +2621,7 @@ class ActivityStreamSerializer(BaseSerializer):
if not hasattr(obj, fk): if not hasattr(obj, fk):
continue continue
allm2m = getattr(obj, fk).distinct() allm2m = getattr(obj, fk).distinct()
if allm2m.count() > 0: if getattr(obj, fk).exists():
rel[fk] = [] rel[fk] = []
for thisItem in allm2m: for thisItem in allm2m:
rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,))) rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,)))
@@ -2636,7 +2636,7 @@ class ActivityStreamSerializer(BaseSerializer):
if not hasattr(obj, fk): if not hasattr(obj, fk):
continue continue
allm2m = getattr(obj, fk).distinct() allm2m = getattr(obj, fk).distinct()
if allm2m.count() > 0: if getattr(obj, fk).exists():
summary_fields[fk] = [] summary_fields[fk] = []
for thisItem in allm2m: for thisItem in allm2m:
if fk == 'job': if fk == 'job':

20
awx/main/access.py
View File

@@ -1466,7 +1466,8 @@ class ActivityStreamAccess(BaseAccess):
qs = qs.select_related('actor') qs = qs.select_related('actor')
qs = qs.prefetch_related('organization', 'user', 'inventory', 'host', 'group', 'inventory_source', qs = qs.prefetch_related('organization', 'user', 'inventory', 'host', 'group', 'inventory_source',
'inventory_update', 'credential', 'team', 'project', 'project_update', 'inventory_update', 'credential', 'team', 'project', 'project_update',
'permission', 'job_template', 'job') 'permission', 'job_template', 'job', 'ad_hoc_command',
'notification_template', 'notification', 'label', 'role')
if self.user.is_superuser: if self.user.is_superuser:
return qs.all() return qs.all()
if self.user in Role.singleton('system_auditor'): if self.user in Role.singleton('system_auditor'):
@@ -1475,17 +1476,14 @@ class ActivityStreamAccess(BaseAccess):
inventory_set = Inventory.accessible_objects(self.user, 'read_role') inventory_set = Inventory.accessible_objects(self.user, 'read_role')
credential_set = Credential.accessible_objects(self.user, 'read_role') credential_set = Credential.accessible_objects(self.user, 'read_role')
organization_set = Organization.accessible_objects(self.user, 'read_role') organization_set = Organization.accessible_objects(self.user, 'read_role')
admin_of_orgs = Organization.accessible_objects(self.user, 'admin_role')
group_set = Group.objects.filter(inventory__in=inventory_set) group_set = Group.objects.filter(inventory__in=inventory_set)
project_set = Project.accessible_objects(self.user, 'read_role') project_set = Project.accessible_objects(self.user, 'read_role')
jt_set = JobTemplate.accessible_objects(self.user, 'read_role') jt_set = JobTemplate.accessible_objects(self.user, 'read_role')
team_set = Team.accessible_objects(self.user, 'read_role') team_set = Team.accessible_objects(self.user, 'read_role')
ad_hoc_results = qs.filter( return qs.filter(
ad_hoc_command__inventory__in=inventory_set, Q(ad_hoc_command__inventory__in=inventory_set) |
ad_hoc_command__credential__in=credential_set
)
global_results = qs.filter(
Q(user__in=organization_set.values('member_role__members')) | Q(user__in=organization_set.values('member_role__members')) |
Q(user=self.user) | Q(user=self.user) |
Q(organization__in=organization_set) | Q(organization__in=organization_set) |
@@ -1500,13 +1498,11 @@ class ActivityStreamAccess(BaseAccess):
Q(project_update__project__in=project_set) | Q(project_update__project__in=project_set) |
Q(job_template__in=jt_set) | Q(job_template__in=jt_set) |
Q(job__job_template__in=jt_set) | Q(job__job_template__in=jt_set) |
Q(notification_template__organization__admin_role__members__in=[self.user]) | Q(notification_template__organization__in=admin_of_orgs) |
Q(notification__notification_template__organization__admin_role__members__in=[self.user]) | Q(notification__notification_template__organization__in=admin_of_orgs) |
Q(label__organization__in=organization_set) | Q(label__organization__in=organization_set) |
Q(role__in=Role.visible_roles(self.user)) Q(role__in=Role.visible_roles(self.user))
) ).distinct()
return (ad_hoc_results | global_results).distinct()
def can_add(self, data): def can_add(self, data):
return False return False