Merge lp:~julian-edwards/launchpad/slow-deathrow into lp:launchpad

[Julian Edwards]

Fix a slow query in process-death-row that PG8.4 hates that 8.3 didn't.

After PG8.4 was put in production the process-death-row script starting
failing. It turns out to be a bad query that 8.3 let us get away with - this
branch fixes the query to remove an unncessaary table join.

[Brad Crittenden (bac)]

review: Approve (code)

[Julian Edwards (julian-edwards)]

This is ok to land r-c since it's already cowboyed.

review: Approve (release-critical)

=== modified file 'lib/lp/archivepublisher/deathrow.py'
--- lib/lp/archivepublisher/deathrow.py	2010-08-23 16:51:11 +0000
+++ lib/lp/archivepublisher/deathrow.py	2010-10-08 10:20:58 +0000
@@ -120,8 +120,7 @@
             SourcePackagePublishingHistory.scheduleddeletiondate < %s AND
             SourcePackagePublishingHistory.dateremoved IS NULL AND
             NOT EXISTS (
-              SELECT 1 FROM sourcepackagepublishinghistory as spph,
-                  sourcepackagerelease as spr
+              SELECT 1 FROM sourcepackagepublishinghistory as spph
               WHERE
                   SourcePackagePublishingHistory.sourcepackagerelease =
                       spph.sourcepackagerelease AND
@@ -136,8 +135,7 @@
             BinaryPackagePublishingHistory.scheduleddeletiondate < %s AND
             BinaryPackagePublishingHistory.dateremoved IS NULL AND
             NOT EXISTS (
-              SELECT 1 FROM binarypackagepublishinghistory as bpph,
-                  binarypackagerelease as bpr
+              SELECT 1 FROM binarypackagepublishinghistory as bpph
               WHERE
                   BinaryPackagePublishingHistory.binarypackagerelease =
                       bpph.binarypackagerelease AND