Merge lp:~edwin-grubbs/launchpad/bug-669724-projectgroup-milestones-timeout into lp:launchpad

[Edwin Grubbs]

[r=sinzui][ui=none][bug=669724] Fixed timeout on $projectgroup/+milestones page.

Summary
-------

This branch fixes timeouts on the $projectgroup/+milestones page by
removing the counts for bugs and blueprints, since that information has
already been removed for projects and distributions.
It would be possible to re-add the bug and blueprints counts by writing
a query that gets the counts for all the milestones at once. However,
this will require rewriting the templates or adding a decorator on the
milestone object with count data for the various types of milestone
targets.

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

The +pillar-table-row for IProjectGroupMilestone was using MilestoneView
instead of MilestonesView, which has show_series_context=True, and that
caused should_show_bugs_and_blueprints to be false for projects and
distributions, but not for project groups. I made this more explicit. I
renamed MilestonesView to avoid confusing it with MilestoneView, and it
also wasn't a very accurate name. Cache the milestones as a list so
that it can be referenced multiple times in the template without
evaluating the storm result set multiple times.
    lib/lp/registry/browser/configure.zcml
    lib/lp/registry/browser/milestone.py
    lib/lp/registry/stories/milestone/object-milestones.txt
    lib/lp/registry/templates/object-milestones.pt

Reduced the number of queries in the page by preventing the menu from
querying whether the project group has projects for each menu item.
    lib/lp/registry/browser/project.py

Instead of one query per project, use one query to get all bug tags for
the project group.
    lib/lp/registry/model/projectgroup.py

Fixed test for attribute that now returns storm result set.
    lib/lp/bugs/doc/official-bug-tags.txt

Tests
-----

./bin/test -vv -t 'official-bug-tags.txt|object-milestones.txt'

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

* Open https://launchpad.net/openobject/+milestones
  * It should not timeout.

Lint
----

No lint.

[Curtis Hovey (sinzui)]

Thank you for discovering my typo. The renaming and clean ups are very appreciated.

review: Approve (code)

=== modified file 'lib/lp/bugs/doc/official-bug-tags.txt'
--- lib/lp/bugs/doc/official-bug-tags.txt	2010-10-20 19:41:34 +0000
+++ lib/lp/bugs/doc/official-bug-tags.txt	2011-01-19 21:51:20 +0000
@@ -1,4 +1,5 @@
-= Official Bug Tags =
+Official Bug Tags
+=================
 
 Distributions and products can define official bug tags.
 
@@ -49,7 +50,8 @@
     >>> transaction.abort()
 
 
-== Targets of official bug tags ==
+Targets of official bug tags
+----------------------------
 
 Distribution owners and other persons with the permission launchpad.Edit
 can add and remove offical bug tags by calling addOfficialBugTag()
@@ -169,7 +171,8 @@
     >>> ubuntu.official_bug_tags = [u'foo', u'bar']
     Traceback (most recent call last):
     ...
-    Unauthorized: (<Distribution 'Ubuntu' (ubuntu)>, 'official_bug_tags', 'launchpad.BugSupervisor')
+    Unauthorized: (<Distribution 'Ubuntu' (ubuntu)>,
+                   'official_bug_tags', 'launchpad.BugSupervisor')
 
 The same is available for products.
 
@@ -180,7 +183,8 @@
     [u'bar', u'foo']
 
 
-== Official tags for additional bug targets ==
+Official tags for additional bug targets
+----------------------------------------
 
 All IHasBugs implementations provide an official_bug_tags property. They are
 taken from the relevant distribution or product.
@@ -213,7 +217,8 @@
     >>> thunderbird.official_bug_tags = [u'baz']
     >>> logout()
     >>> login('[e-mail]')
-    >>> getUtility(IProjectGroupSet).getByName('mozilla').official_bug_tags
+    >>> mozilla = getUtility(IProjectGroupSet).getByName('mozilla')
+    >>> list(mozilla.official_bug_tags)
     [u'bar', u'baz', u'foo']
     >>> logout()
 
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2011-01-18 20:49:35 +0000
+++ lib/lp/registry/browser/configure.zcml	2011-01-19 21:51:20 +0000
@@ -1330,14 +1330,14 @@
     <browser:page
         name="+pillar-table-row"
         for="lp.registry.interfaces.milestone.IMilestone"
-        class="lp.registry.browser.milestone.MilestonesView"
+        class="lp.registry.browser.milestone.MilestoneWithoutCountsView"
         facet="overview"
         permission="zope.Public"
         template="../templates/productseries-milestone-table-row.pt"/>
     <browser:page
         name="+pillar-table-row"
         for="lp.registry.interfaces.milestone.IProjectGroupMilestone"
-        class="lp.registry.browser.milestone.MilestoneView"
+        class="lp.registry.browser.milestone.MilestoneWithoutCountsView"
         facet="overview"
         permission="zope.Public"
         template="../templates/productseries-milestone-table-row.pt"/>
 
=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2010-12-10 15:06:12 +0000
+++ lib/lp/registry/browser/milestone.py	2011-01-19 21:51:20 +0000
@@ -15,7 +15,7 @@
     'MilestoneNavigation',
     'MilestoneOverviewNavigationMenu',
     'MilestoneSetNavigation',
-    'MilestonesView',
+    'MilestoneWithoutCountsView',
     'MilestoneView',
     'ObjectMilestonesView',
     ]
@@ -55,9 +55,7 @@
     LaunchpadFormView,
     )
 from lp.bugs.browser.bugtask import BugTaskListingItem
-from lp.bugs.interfaces.bugtask import (
-    IBugTaskSet,
-    )
+from lp.bugs.interfaces.bugtask import IBugTaskSet
 from lp.registry.browser import (
     get_status_counts,
     RegistryDeleteViewMixin,
@@ -213,7 +211,7 @@
     @property
     def should_show_bugs_and_blueprints(self):
         """Display the summary of bugs/blueprints for this milestone?"""
-        return (not self.show_series_context) and self.milestone.active
+        return self.milestone.active
 
     @property
     def page_title(self):
@@ -368,9 +366,11 @@
         return len(self.bugtasks) > 0 or len(self.specifications) > 0
 
 
-class MilestonesView(MilestoneView):
+class MilestoneWithoutCountsView(MilestoneView):
     """Show a milestone in a list of milestones."""
+
     show_series_context = True
+    should_show_bugs_and_blueprints = False
 
 
 class MilestoneAddView(LaunchpadFormView):
@@ -516,3 +516,7 @@
     """A view for listing the milestones for any `IHasMilestones` object"""
 
     label = 'Milestones'
+
+    @cachedproperty
+    def milestones(self):
+        return list(self.context.all_milestones)
 
=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2010-12-13 21:41:15 +0000
+++ lib/lp/registry/browser/project.py	2011-01-19 21:51:20 +0000
@@ -164,29 +164,33 @@
     enable_only = ['overview', 'branches', 'bugs', 'specifications',
                    'answers', 'translations']
 
+    @cachedproperty
+    def has_products(self):
+        return self.context.hasProducts()
+
     def branches(self):
         text = 'Code'
-        return Link('', text, enabled=self.context.hasProducts())
+        return Link('', text, enabled=self.has_products)
 
     def bugs(self):
         site = 'bugs'
         text = 'Bugs'
-        return Link('', text, enabled=self.context.hasProducts(), site=site)
+        return Link('', text, enabled=self.has_products, site=site)
 
     def answers(self):
         site = 'answers'
         text = 'Answers'
-        return Link('', text, enabled=self.context.hasProducts(), site=site)
+        return Link('', text, enabled=self.has_products, site=site)
 
     def specifications(self):
         site = 'blueprints'
         text = 'Blueprints'
-        return Link('', text, enabled=self.context.hasProducts(), site=site)
+        return Link('', text, enabled=self.has_products, site=site)
 
     def translations(self):
         site = 'translations'
         text = 'Translations'
-        return Link('', text, enabled=self.context.hasProducts(), site=site)
+        return Link('', text, enabled=self.has_products, site=site)
 
 
 class ProjectAdminMenuMixin:
 
=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2010-12-25 21:28:14 +0000
+++ lib/lp/registry/model/projectgroup.py	2011-01-19 21:51:20 +0000
@@ -20,8 +20,8 @@
     )
 from storm.expr import (
     And,
+    Join,
     SQL,
-    Join,
     )
 from storm.locals import Int
 from storm.store import Store
@@ -91,6 +91,7 @@
     IProjectGroupSet,
     )
 from lp.registry.model.announcement import MakesAnnouncements
+from lp.registry.model.hasdrivers import HasDriversMixin
 from lp.registry.model.karma import KarmaContextMixin
 from lp.registry.model.milestone import (
     HasMilestonesMixin,
@@ -100,7 +101,6 @@
 from lp.registry.model.pillar import HasAliasMixin
 from lp.registry.model.product import Product
 from lp.registry.model.productseries import ProductSeries
-from lp.registry.model.hasdrivers import HasDriversMixin
 from lp.registry.model.structuralsubscription import (
     StructuralSubscriptionTargetMixin,
     )
@@ -327,10 +327,13 @@
     @property
     def official_bug_tags(self):
         """See `IHasBugs`."""
-        official_bug_tags = set()
-        for product in self.products:
-            official_bug_tags.update(product.official_bug_tags)
-        return sorted(official_bug_tags)
+        store = Store.of(self)
+        result = store.find(
+            OfficialBugTag.tag,
+            OfficialBugTag.product == Product.id,
+            Product.project == self.id).order_by(OfficialBugTag.tag)
+        result.config(distinct=True)
+        return result
 
     def getUsedBugTags(self):
         """See `IHasBugs`."""
 
=== modified file 'lib/lp/registry/stories/milestone/object-milestones.txt'
--- lib/lp/registry/stories/milestone/object-milestones.txt	2010-12-21 23:49:34 +0000
+++ lib/lp/registry/stories/milestone/object-milestones.txt	2011-01-19 21:51:20 +0000
@@ -129,8 +129,7 @@
     GNOME 1.3    A date      This is an inactive milestone
     GNOME 1.2    A date      not yet released
     GNOME 1.1.   A date      not yet released
-    GNOME 1.1    A date      not yet released Bugs targeted: 3 Confirmed
-                                              Blueprints targeted: 2 Unknown
+    GNOME 1.1    A date      not yet released
 
 
 Individual milestones
 
=== modified file 'lib/lp/registry/templates/object-milestones.pt'
--- lib/lp/registry/templates/object-milestones.pt	2010-08-20 04:14:22 +0000
+++ lib/lp/registry/templates/object-milestones.pt	2011-01-19 21:51:20 +0000
@@ -14,7 +14,7 @@
       Milestones belong to a series and can be created from the series page
       by a project owner or series release manager.
     </p>
-    
+
     <ul class="horizontal"
       tal:condition="context/project|nothing">
       <li>
@@ -25,10 +25,10 @@
     </ul>
   </div>
 
-  <tal:milestones define="milestones context/all_milestones">
+  <tal:milestones>
     <table id="milestones" class="listing"
       tal:define="has_series context/series|nothing"
-      tal:condition="context/has_milestones">
+      tal:condition="view/milestones">
       <thead>
         <tr>
           <th>Version</th>
@@ -40,12 +40,12 @@
       </thead>
       <tbody>
           <tal:row
-            repeat="milestone milestones"
+            repeat="milestone view/milestones"
             replace="structure milestone/@@+pillar-table-row" />
       </tbody>
     </table>
 
-    <tal:no-milestones condition="not: context/has_milestones">
+    <tal:no-milestones condition="not: view/milestones">
       <p>There are no milestones associated with
         <span tal:replace="context/title" />
       </p>