novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed slow query on domain list / stats

Browse source
This commit is contained in:
Eliot Berriot 2018-12-27 22:45:43 +01:00
commit 9d55320b56
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
5 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/funkwhale_api/federation/models.py
View file

@ -66,15 +66,6 @@ class DomainQuerySet(models.QuerySet):
def external(self):
return self.exclude(pk=settings.FEDERATION_HOSTNAME)
def with_last_activity_date(self):
activities = Activity.objects.filter(
actor__domain=models.OuterRef("pk")
).order_by("-creation_date")
return self.annotate(
last_activity_date=models.Subquery(activities.values("creation_date")[:1])
)
def with_actors_count(self):
return self.annotate(actors_count=models.Count("actors", distinct=True))
@ -111,7 +102,6 @@ class Domain(models.Model):
actors=models.Count("actors", distinct=True),
outbox_activities=models.Count("actors__outbox_activities", distinct=True),
libraries=models.Count("actors__libraries", distinct=True),
uploads=models.Count("actors__libraries__uploads", distinct=True),
received_library_follows=models.Count(
"actors__libraries__received_follows", distinct=True
),
@ -130,6 +120,7 @@ class Domain(models.Model):
).count()
uploads = music_models.Upload.objects.filter(library__actor__domain_id=self.pk)
data["uploads"] = uploads.count()
data["media_total_size"] = uploads.aggregate(v=models.Sum("size"))["v"] or 0
data["media_downloaded_size"] = (
uploads.with_file().aggregate(v=models.Sum("size"))["v"] or 0