Merge lp:~edwin-grubbs/launchpad/bug-458169-distroseries-timeout into lp:launchpad

[Edwin Grubbs]

Fixed timeouts on distroseries page and distro milestone page.

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

Fixed timeout on https://launchpad.net/ubuntu/karmic
and https://launchpad.net/ubuntu/+milestone/ubuntu-9.10/+index.

Implementation details
----------------------

Cached the Distribution.serieses and Distribution.currentseries
properties.

Tests
-----

./bin/test -vv -t 'distribution-soyuz.txt|productseries-views.txt'

Demo and Q/A
------------

* Open https://staging.launchpad.net/ubuntu/karmic
    * Should not timeout.
* Open https://staging.launchpad.net/ubuntu/+milestone/ubuntu-9.10/+index.
    * Should not timeout.

[Brad Crittenden (bac)]

Nice fix Edwin! This branch has to win the biggest bang for the buck award.

review: Approve (code)

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2009-10-22 09:24:53 +0000
+++ lib/lp/registry/browser/productseries.py	2009-10-23 16:28:12 +0000
@@ -310,7 +310,7 @@
 
     @property
     def is_obsolete(self):
-        """Return True if the series is OBSOLETE"
+        """Return True if the series is OBSOLETE.
 
         Obsolete series do not need to display as much information as other
         series. Accessing private bugs is an expensive operation and showing
@@ -359,7 +359,7 @@
     label = page_title
 
     def __init__(self, context, request):
-        """Set the staic packaging information for this series."""
+        """Set the static packaging information for this series."""
         super(ProductSeriesUbuntuPackagingView, self).__init__(
             context, request)
         ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
 
=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2009-10-16 15:00:55 +0000
+++ lib/lp/registry/model/distribution.py	2009-10-23 16:28:12 +0000
@@ -10,8 +10,7 @@
 from zope.interface import alsoProvides, implements
 from zope.component import getUtility
 
-from sqlobject import (
-    BoolCol, ForeignKey, SQLRelatedJoin, StringCol, SQLObjectNotFound)
+from sqlobject import BoolCol, ForeignKey, SQLObjectNotFound, StringCol
 from sqlobject.sqlbuilder import SQLConstant
 from storm.locals import Desc, In, Join, SQL
 from storm.store import Store
@@ -26,6 +25,7 @@
 from canonical.launchpad.components.decoratedresultset import (
     DecoratedResultSet)
 from canonical.launchpad.components.storm_operators import FTQ, Match, RANK
+from canonical.lazr.utils import safe_hasattr
 from lp.registry.model.announcement import MakesAnnouncements
 from lp.soyuz.model.archive import Archive
 from lp.soyuz.model.binarypackagename import BinaryPackageName
@@ -325,10 +325,7 @@
             return (2, self.name)
         return (3, self.name)
 
-    # XXX: 2008-01-29 kiko: This is used in a number of places and given it's
-    # already listified, why not spare the trouble of regenerating this as a
-    # cachedproperty? Answer: because it breaks tests.
-    @property
+    @cachedproperty('_cached_serieses')
     def serieses(self):
         """See `IDistribution`."""
         ret = DistroSeries.selectBy(distribution=self)
@@ -1497,6 +1494,9 @@
         if owner.inTeam(self.driver) and not owner.inTeam(self.owner):
             # This driver is a release manager.
             series.driver = owner
+
+        if safe_hasattr(self, '_cached_serieses'):
+            del self._cached_serieses
         return series
 
     @property