Mercurial > public > sg101
changeset 388:c3231af55778
For #191; r410 is wrong: it is returning the wrong posts. Rework. MySQL is not using an index on our query, and it is taking 10+ seconds. Replace this slow query with a loop that loops over the public forums, then sorts and returns the posts.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Sat, 19 Mar 2011 05:03:51 +0000 |
parents | b15726767ab8 |
children | 3fa61786abf1 |
files | gpp/forums/feeds.py |
diffstat | 1 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/gpp/forums/feeds.py Sat Mar 19 01:52:41 2011 +0000 +++ b/gpp/forums/feeds.py Sat Mar 19 05:03:51 2011 +0000 @@ -60,22 +60,21 @@ # items = Post.objects.filter( # topic__forum__in=Forum.objects.public_forums()) # - # The where clause in the generated SQL looked like this: - # WHERE `forums_topic`.`forum_id` IN ( ... ) - # This was terrible for performance. This does much better: - # WHERE `forums_topic`.`id` IN ( ... ) - # - # So we use Django's .extra() to force the above. + # For some reason, MySQL wasn't using an index when "in" was used. + # So let's do this the hard way as a work-around: public_forum_ids = Forum.objects.public_forum_ids() - ids = ','.join(str(pub) for pub in public_forum_ids) + posts = [] + for forum_id in public_forum_ids: + posts.extend(list(Post.objects.filter( + topic__forum__id=forum_id).order_by('-creation_date').select_related(depth=2)[:30])) - items = Post.objects.extra( - where=['forums_topic.id in (%s)' % ids]) + posts.sort(key=lambda x: x.creation_date, reverse=True) + return posts[:30] else: - items = Post.objects.filter(topic__forum__id=obj.id) - return items.order_by('-creation_date').select_related(depth=2)[:30] + return Post.objects.filter(topic__forum__id=obj.id).order_by( + '-creation_date').select_related(depth=2)[:30] def item_title(self, item): return item.topic.name