Merge lp:~sinzui/launchpad/packaging-timeout-bug-523886 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to make +packaging and +needs-packaging faster.

    lp:~sinzui/launchpad/packaging-timeout-bug-523886
    Diff size: 104
    Launchpad bug: https://bugs.launchpad.net/bugs/523886
    Test command: ./bin/test -vv -t packaging-views
    Pre-implementation: bac
    Target release: 10.02

 make +packaging and +needs-packaging faster
--------------------------------------------------------------------

OOPS-1510EB595 and OOPS-1510ED677 show too much data was called. Though the
core objects are cached, there is a lot of repetition in the queries because
the UI is checking the presence of secondary objects.

The first fix it to reduce the batch size because these pages have too much
information to comprehend. If necessary, try to cache the bug and translation
information.

Rules
-----

    * Reduce the batch size of both view to 20, which is more than enough
      work for one person to see.
    * Consider caching the bug supervisor, bug tracker, branch and templates

    ADDENDUM
    * I looked at the queries and in the case of +needs-packaging there
      were no extra db lookups in template, but there were a tremendous
      number of person/team lookups. I created an empty view with an
      empty template so got a large number of person/team lookups
      to render the header a footer. I will report this as a separate bug.
    * I changed the base view for the two affected views because they
      do not use the base features anymore.
    * Cleaned up some issues reported by lint.

QA
--

    * Visit https://launchpad.net/ubuntu/lucid/+needs-packaging
    * Verify 20 packages are listed and that the page does not timeout
    * Visit https://launchpad.net/ubuntu/lucid/+packaging
    * Verify 20 packages are listed and that the page does not timeout

Lint
----

Linting changed files:
  lib/lp/registry/browser/distroseries.py
  lib/lp/registry/browser/tests/packaging-views.txt

Test
----

    * lib/lp/registry/browser/tests/packaging-views.txt
      * Updated the test to verify that the default batch size is 20.

Implementation
--------------

    * lib/lp/registry/browser/distroseries.py
      * Changed the batch size to 20.

[Paul Hummer (rockstar)]

Looks good. Thanks for the branch!

[Guilherme Salgado (salgado)]

Looks good to me

review: Approve (code)

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2010-02-03 08:43:42 +0000
+++ lib/lp/registry/browser/distroseries.py	2010-02-18 21:50:33 +0000
@@ -55,7 +55,7 @@
 from canonical.launchpad.webapp.menu import (
     ApplicationMenu, Link, NavigationMenu, enabled_with_permission)
 from canonical.launchpad.webapp.publisher import (
-    canonical_url, stepthrough, stepto)
+    canonical_url, LaunchpadView, stepthrough, stepto)
 from canonical.widgets.itemswidgets import LaunchpadDropdownWidget
 from lp.soyuz.interfaces.queue import IPackageUploadSet
 from lp.registry.browser import MilestoneOverlayMixin
@@ -133,6 +133,7 @@
 
 class DistroSeriesBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `IDistroSeries`."""
+
     @property
     def text(self):
         return self.context.named_version
@@ -447,15 +448,14 @@
 
         assert owner is not None
         distroseries = self.context.newSeries(
-            name = data['name'],
-            displayname = data['displayname'],
-            title = data['title'],
-            summary = data['summary'],
-            description = data['description'],
-            version = data['version'],
-            parent_series = data['parent_series'],
-            owner = owner
-            )
+            name=data['name'],
+            displayname=data['displayname'],
+            title=data['title'],
+            summary=data['summary'],
+            description=data['description'],
+            version=data['version'],
+            parent_series=data['parent_series'],
+            owner=owner)
         notify(ObjectCreatedEvent(distroseries))
         self.next_url = canonical_url(distroseries)
         return distroseries
@@ -465,7 +465,7 @@
         return canonical_url(self.context)
 
 
-class DistroSeriesPackagesView(DistroSeriesView):
+class DistroSeriesPackagesView(LaunchpadView):
     """A View to show series package to upstream package relationships."""
 
     label = 'All series packages linked to upstream project series'
@@ -475,12 +475,12 @@
     def cached_packagings(self):
         """The batched upstream packaging links."""
         packagings = self.context.getPriorizedlPackagings()
-        navigator = BatchNavigator(packagings, self.request, size=100)
+        navigator = BatchNavigator(packagings, self.request, size=20)
         navigator.setHeadings('packaging', 'packagings')
         return navigator
 
 
-class DistroSeriesNeedsPackagesView(DistroSeriesView):
+class DistroSeriesNeedsPackagesView(LaunchpadView):
     """A View to show series package to upstream package relationships."""
 
     label = 'Packages that need upstream packaging links'
@@ -490,6 +490,6 @@
     def cached_unlinked_packages(self):
         """The batched `ISourcePackage`s that needs packaging links."""
         packages = self.context.getPriorizedUnlinkedSourcePackages()
-        navigator = BatchNavigator(packages, self.request, size=100)
+        navigator = BatchNavigator(packages, self.request, size=20)
         navigator.setHeadings('package', 'packages')
         return navigator

=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
--- lib/lp/registry/browser/tests/packaging-views.txt	2010-02-03 08:43:42 +0000
+++ lib/lp/registry/browser/tests/packaging-views.txt	2010-02-18 21:50:33 +0000
@@ -359,11 +359,11 @@
 The packages that most need more information to send bugs upstream, build
 packages, and sync translations are listed first. A distro series can have
 thousands of upstream packaging links. The view provides a batch navigator
-to access the packagings. The default batch size is 100.
+to access the packagings. The default batch size is 20.
 
     >>> batch_navigator = view.cached_packagings
     >>> batch_navigator.default_size
-    100
+    20
 
     >>> print batch_navigator.heading
     packagings
@@ -392,7 +392,7 @@
 
     >>> batch_navigator = view.cached_unlinked_packages
     >>> batch_navigator.default_size
-    100
+    20
 
     >>> print batch_navigator.heading
     packages