Merge lp:~lifeless/launchpad/bug-711104 into lp:launchpad

[Robert Collins]

eager load PackageBuild and BuildFarmJob for +uploaded-packages

Eager load PackageBuild and BuildFarmJob for +uploaded-packages

[Robert Collins (lifeless)]

Note that the changed function only has one call site.

[Tim Penhey (thumper)]

review: Approve

=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2011-01-24 20:57:37 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2011-03-14 02:29:58 +0000
@@ -353,6 +353,8 @@
                                         buildstate=None):
         """Return all builds related with the given list of source releases.
 
+        Eager loads the PackageBuild and BuildFarmJob records for the builds.
+
         :param sourcepackagerelease_ids: list of `ISourcePackageRelease`s;
         :param buildstate: option build state filter.
 

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2011-01-26 21:22:49 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2011-03-14 02:29:58 +0000
@@ -19,6 +19,7 @@
     Desc,
     Join,
     LeftJoin,
+    SQL,
     )
 from storm.locals import (
     Int,
@@ -57,6 +58,7 @@
 from canonical.launchpad.interfaces.lpstorm import (
     IMasterObject,
     ISlaveStore,
+    IStore,
     )
 from canonical.launchpad.mail import (
     format_address,
@@ -1101,6 +1103,8 @@
         if (sourcepackagerelease_ids is None or
             len(sourcepackagerelease_ids) == 0):
             return []
+        # Circular.
+        from lp.soyuz.model.archive import Archive
 
         query = """
             source_package_release IN %s AND
@@ -1113,9 +1117,13 @@
         if buildstate is not None:
             query += "AND buildfarmjob.status = %s" % sqlvalues(buildstate)
 
-        return BinaryPackageBuild.select(
-            query, orderBy=["-buildfarmjob.date_created", "id"],
-            clauseTables=["Archive", "PackageBuild", "BuildFarmJob"])
+        resultset = IStore(BinaryPackageBuild).using(
+            BinaryPackageBuild, PackageBuild, BuildFarmJob, Archive).find(
+            (BinaryPackageBuild, PackageBuild, BuildFarmJob),
+            SQL(query))
+        resultset.order_by(
+            Desc(BuildFarmJob.date_created), BinaryPackageBuild.id)
+        return DecoratedResultSet(resultset, operator.itemgetter(0))
 
     def getStatusSummaryForBuilds(self, builds):
         """See `IBinaryPackageBuildSet`."""