Changeset 57a2ad6 for asadb/space/diffs.py

Timestamp:

Mar 28, 2012, 5:57:20 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

96ef09f

Parents:

6ae8c4a

git-author:

Alex Dehnert <adehnert@…> (03/28/12 05:57:20)

git-committer:

Alex Dehnert <adehnert@…> (03/28/12 05:57:20)

Message:

Optimize space/diffs.py a bit by batching a query

We don't care for running this on the server, but cutting the edittest cycle
time from 10s to 5s is worthwhile...

File:

• asadb/space/diffs.py (modified) (3 diffs)

asadb/space/diffs.py

@@ -22 +22 @@
 import util.emails
 
-role = {}
+role = {
+    'office': groups.models.OfficerRole.objects.get(slug='office-access')
+}
+
 people_name = {} # username -> full name
 people_id = {} # username -> MIT ID
@@ -28 +31 @@
 all_spaces = {} # Space.pk -> Space
 
+def bulk_fill_people(times):
+    max_time = max(times)
+    min_time = min(times)
+    active_holders = groups.models.OfficeHolder.objects.filter(
+        start_time__lte=max_time,
+        end_time__gte=min_time,
+        role__in=role.values(),
+    )
+    usernames = active_holders.values_list('person', flat=True,)
+    people = groups.models.AthenaMoiraAccount.objects.filter(username__in=usernames)
+    for person in people:
+        people_name[person.username] = person.format()
+        people_id[person.username] = person.mit_id
+
 def fill_people(holder):
     if not holder.person in people_name:
+        #print "Person %s not pre-cached" % (holder.person, )
         try:
             person = groups.models.AthenaMoiraAccount.objects.get(username=holder.person)
@@ -136 +154 @@
     new_time = datetime.datetime.utcnow()
     old_time = new_time - datetime.timedelta(days=1)
+    bulk_fill_people([old_time, new_time])
     group_data = {} # Group.pk -> GroupInfo
     changed_groups = []