Merge lp:~stevenk/launchpad/getpublishedsources-too-eager into lp:launchpad

[Steve Kowalik]

[no-qa] [r=lifeless,wgrant][bug=744849] Don't eager load by default in IArchive.getPublishedSources(), but instruct the API that it always should.

Add a eager_load parameter to IArchive.getPublishedSources() that disables eager loading for those callsites that do not require it. It defaults to True, so the API/page renders will always get it. So far the only callsite that disables it is the package cloner.

[Robert Collins (lifeless)]

review: Approve

[William Grant (wgrant)]

Thanks for the default inversion. s/if eager_load is False/if not eager_load/, otherwise fine.

review: Approve (code*)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2011-03-29 13:49:07 +0000
+++ lib/lp/soyuz/browser/archive.py	2011-04-12 01:45:06 +0000
@@ -824,7 +824,8 @@
         return self.context.getPublishedSources(
             name=self.specified_name_filter,
             status=self.getSelectedFilterValue('status_filter'),
-            distroseries=self.getSelectedFilterValue('series_filter'))
+            distroseries=self.getSelectedFilterValue('series_filter'),
+            eager_load=True)
 
     @property
     def default_status_filter(self):
 
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2011-02-24 15:30:54 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2011-04-12 01:45:06 +0000
@@ -987,11 +987,13 @@
             required=False))
     # Really returns ISourcePackagePublishingHistory, see below for
     # patch to avoid circular import.
+    @call_with(eager_load=True)
     @operation_returns_collection_of(Interface)
     @export_read_operation()
     def getPublishedSources(name=None, version=None, status=None,
                             distroseries=None, pocket=None,
-                            exact_match=False, created_since_date=None):
+                            exact_match=False, created_since_date=None,
+                            eager_load=False):
         """All `ISourcePackagePublishingHistory` target to this archive.
 
         :param name: source name filter (exact match or SQL LIKE controlled
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2011-03-23 18:29:09 +0000
+++ lib/lp/soyuz/model/archive.py	2011-04-12 01:45:06 +0000
@@ -465,7 +465,8 @@
 
     def getPublishedSources(self, name=None, version=None, status=None,
                             distroseries=None, pocket=None,
-                            exact_match=False, created_since_date=None):
+                            exact_match=False, created_since_date=None,
+                            eager_load=False):
         """See `IArchive`."""
         # clauses contains literal sql expressions for things that don't work
         # easily in storm : this method was migrated from sqlobject but some
@@ -526,6 +527,8 @@
         resultset = store.find(SourcePackagePublishingHistory,
             *storm_clauses).order_by(
             *orderBy)
+        if not eager_load:
+            return resultset
         # Its not clear that this eager load is necessary or sufficient, it
         # replaces a prejoin that had pathological query plans.
         def eager_load(rows):