Merge lp:~michael.nelson/launchpad/437037-queue-timeout into lp:launchpad

[Michael Nelson]

[Michael Nelson (michael.nelson)]

= Summary =

This branch avoids instantiating SourcePackageRelease objects just to
find their IDs for the IN-clause of the next query, by combining the two
queries into one.

== Proposed fix ==

== Pre-implementation notes ==

== Implementation details ==

== Tests ==

bin/test -vvt doc/build.txt

== Demo and Q/A ==
No demo.

QA - We'll need to get Scott to provide feedback. We could qa on df with
the right setup if needed.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/model/sourcepackagerelease.py

--
Michael

[Eleanor Berger (intellectronica)]

review: Approve

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2009-09-23 12:02:35 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2009-09-28 08:45:25 +0000
@@ -341,25 +341,23 @@
         if archive.purpose != ArchivePurpose.PRIMARY:
             archives.append(distroarchseries.main_archive.id)
 
-        # Look for all sourcepackagerelease instances that match the name.
-        matching_sprs = SourcePackageRelease.select("""
+        # Look for all sourcepackagerelease instances that match the name
+        # and get the (successfully built) build records for this
+        # package.
+        completed_builds = Build.select("""
+            Build.sourcepackagerelease = SourcePackageRelease.id AND
+            SourcePackageRelease.sourcepackagename = SourcePackageName.id AND
             SourcePackageName.name = %s AND
-            SourcePackageRelease.sourcepackagename = SourcePackageName.id
-            """ % sqlvalues(self.name),
-            clauseTables=['SourcePackageName', 'SourcePackageRelease'])
-
-        # Get the (successfully built) build records for this package.
-        completed_builds = Build.select("""
-            sourcepackagerelease IN %s AND
             distroarchseries = %s AND
             archive IN %s AND
             buildstate = %s
-            """ % sqlvalues([spr.id for spr in matching_sprs],
+            """ % sqlvalues(self.name,
                             distroarchseries, archives,
                             BuildStatus.FULLYBUILT),
-            orderBy=['-datebuilt', '-id'])
+            orderBy=['-datebuilt', '-id'],
+            clauseTables=['SourcePackageName', 'SourcePackageRelease'])
 
-        if completed_builds:
+        if completed_builds.count() > 0:
             # Historic build data exists, use the most recent value.
             most_recent_build = completed_builds[0]
             estimated_build_duration = most_recent_build.buildduration