Allow filtering retrieved mirror statuses by mirror_id

When we don't need them all, no need to fetch them all. Let the database
do the work for us, hopefully.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 19 insertions, 8 deletions

diff --git a/mirrors/utils.py b/mirrors/utils.py
index 0a32b766..ba027c99 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -31,7 +31,7 @@ def annotate_url(url, delays):
 
 
 @cache_function(123)
-def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
+def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_ids=None):
     cutoff_time = now() - cutoff
     # I swear, this actually has decent performance...
     urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter(
@@ -43,6 +43,9 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
             last_check=Max('logs__check_time'),
             duration_avg=Avg('logs__duration'))
 
+    if mirror_ids:
+        urls = urls.filter(mirror_id__in=mirror_ids)
+
     vendor = database_vendor(MirrorUrl)
     if vendor != 'sqlite':
         urls = urls.annotate(duration_stddev=StdDev('logs__duration'))
@@ -54,6 +57,8 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
             'url_id', 'check_time', 'last_sync').filter(
             is_success=True, last_sync__isnull=False,
             check_time__gte=cutoff_time)
+    if mirror_ids:
+        times = times.filter(url__mirror_id__in=mirror_ids)
     delays = {}
     for url_id, check_time, last_sync in times:
         delay = check_time - last_sync
@@ -62,8 +67,10 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
     if urls:
         last_check = max([u.last_check for u in urls])
         num_checks = max([u.check_count for u in urls])
-        check_info = MirrorLog.objects.filter(
-                check_time__gte=cutoff_time).aggregate(
+        check_info = MirrorLog.objects.filter(check_time__gte=cutoff_time)
+        if mirror_ids:
+            check_info = check_info.filter(url__mirror_id__in=mirror_ids)
+        check_info = check_info.aggregate(
                 mn=Min('check_time'), mx=Max('check_time'))
         if num_checks > 1:
             check_frequency = (check_info['mx'] - check_info['mn']) \
@@ -91,7 +98,7 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF):
 
 
 @cache_function(117)
-def get_mirror_errors(cutoff=DEFAULT_CUTOFF):
+def get_mirror_errors(cutoff=DEFAULT_CUTOFF, mirror_ids=None):
     cutoff_time = now() - cutoff
     errors = MirrorLog.objects.filter(
             is_success=False, check_time__gte=cutoff_time,
@@ -100,6 +107,10 @@ def get_mirror_errors(cutoff=DEFAULT_CUTOFF):
             'url__mirror__country', 'url__mirror__tier', 'error').annotate(
             error_count=Count('error'), last_occurred=Max('check_time')
             ).order_by('-last_occurred', '-error_count')
+
+    if mirror_ids:
+        urls = urls.filter(mirror_id__in=mirror_ids)
+
     errors = list(errors)
     for err in errors:
         ctry_code = err['url__country'] or err['url__mirror__country']
diff --git a/mirrors/views.py b/mirrors/views.py
index cbd86611..4b9721dc 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -14,7 +14,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django_countries.countries import COUNTRIES
 
 from .models import Mirror, MirrorUrl, MirrorProtocol, MirrorLog
-from .utils import get_mirror_statuses, get_mirror_errors
+from .utils import get_mirror_statuses, get_mirror_errors, DEFAULT_CUTOFF
 
 COUNTRY_LOOKUP = dict(COUNTRIES)
 
@@ -171,7 +171,7 @@ def mirror_details(request, name):
             (not mirror.public or not mirror.active):
         raise Http404
 
-    status_info = get_mirror_statuses()
+    status_info = get_mirror_statuses(mirror_ids=[mirror.id])
     checked_urls = [url for url in status_info['urls'] \
             if url.mirror_id == mirror.id]
     all_urls = mirror.urls.select_related('protocol')
@@ -186,7 +186,7 @@ def mirror_details(request, name):
 
 def mirror_details_json(request, name):
     mirror = get_object_or_404(Mirror, name=name)
-    status_info = get_mirror_statuses()
+    status_info = get_mirror_statuses(mirror_ids=[mirror.id])
     data = status_info.copy()
     data['version'] = 3
     # include only URLs for this particular mirror
@@ -266,7 +266,7 @@ class ExtendedMirrorStatusJSONEncoder(MirrorStatusJSONEncoder):
     def default(self, obj):
         if isinstance(obj, MirrorUrl):
             data = super(ExtendedMirrorStatusJSONEncoder, self).default(obj)
-            cutoff = now() - timedelta(hours=24)
+            cutoff = now() - DEFAULT_CUTOFF
             data['logs'] = obj.logs.filter(check_time__gte=cutoff)
             return data
         if isinstance(obj, MirrorLog):