Merge lp:~wgrant/launchpad/more-buildmaster-cleanup into lp:launchpad

[William Grant]

Finish the BuildQueue generalisation by moving the last two Soyuz-specific methods from BuildQueueSet to BuildSet.

This branch moves the last two Soyuz-specific methods from BuildQueueSet to BuildSet, completing the BuildQueue generalisation.

[Aaron Bentley (abentley)]

This looks reasonable. Was there a preimplementation call? Was there lint?

review: Needs Information

[Michael Nelson (michael.nelson)]

Thanks William. As noted, please verify/clean any lint, but otherwise r=me.

review: Approve (code)

[William Grant (wgrant)]

There is no lint, beyond the external import complaints that appear to have become accepted fixtures.

=== modified file 'lib/lp/buildmaster/doc/buildqueue.txt'
--- lib/lp/buildmaster/doc/buildqueue.txt	2010-03-05 13:52:32 +0000
+++ lib/lp/buildmaster/doc/buildqueue.txt	2010-04-03 04:16:21 +0000
@@ -255,7 +255,7 @@
 Note that the results are ordered by descending BuildQueue.lastscore
 and restricted
 
-    >>> for bq in bqset.calculateCandidates(archseries):
+    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
     ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
@@ -287,7 +287,7 @@
 The fake language pack will be queued behind the other source packages
 as intended.
 
-    >>> for bq in bqset.calculateCandidates(archseries):
+    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
     ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
@@ -299,7 +299,7 @@
 Restricting the domain to only hoary/hppa:
 
     >>> archseries = [hoary['hppa']]
-    >>> for bq in bqset.calculateCandidates(archseries):
+    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
     ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
@@ -308,12 +308,12 @@
 This method asserts a valid 'archseries' argument, None or an empty
 list will result in a AssertionFailure.
 
-    >>> bqset.calculateCandidates(None).count()
+    >>> getUtility(IBuildSet).calculateCandidates(None).count()
     Traceback (most recent call last):
     ...
     AssertionError: Given 'archseries' cannot be None/empty.
 
-    >>> bqset.calculateCandidates([]).count()
+    >>> getUtility(IBuildSet).calculateCandidates([]).count()
     Traceback (most recent call last):
     ...
     AssertionError: Given 'archseries' cannot be None/empty.

=== modified file 'lib/lp/buildmaster/interfaces/buildqueue.py'
--- lib/lp/buildmaster/interfaces/buildqueue.py	2010-03-16 05:08:47 +0000
+++ lib/lp/buildmaster/interfaces/buildqueue.py	2010-04-03 04:16:21 +0000
@@ -148,20 +148,3 @@
 
     def getActiveBuildJobs():
         """Return All active Build Jobs."""
-
-    def calculateCandidates(archseries):
-        """Return the BuildQueue records for the given archseries.
-
-        Returns a selectRelease of BuildQueue items sorted by descending
-        'lastscore' within the given archseries.
-
-        'archseries' argument should be a list of DistroArchSeries and it is
-        asserted to not be None/empty.
-        """
-
-    def getForBuilds(build_ids):
-        """Return the IBuildQueue instance for the IBuild IDs at hand.
-
-        Retrieve the build queue and related builder rows associated with the
-        builds in question where they exist.
-        """

=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py	2010-03-17 05:58:22 +0000
+++ lib/lp/buildmaster/model/buildqueue.py	2010-04-03 04:16:21 +0000
@@ -18,7 +18,6 @@
 
 from sqlobject import (
     StringCol, ForeignKey, BoolCol, IntCol, IntervalCol, SQLObjectNotFound)
-from storm.expr import In, Join, LeftJoin
 from storm.store import Store
 from zope.component import getSiteManager, getUtility
 from zope.interface import implements
@@ -27,7 +26,6 @@
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.launchpad.webapp.interfaces import (
     DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, NotFoundError)
-from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, IBuildFarmJob)
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
@@ -35,7 +33,6 @@
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
-from lp.soyuz.model.buildpackagejob import BuildPackageJob
 
 
 def normalize_virtualization(virtualized):
@@ -526,48 +523,3 @@
             Job._status == JobStatus.RUNNING,
             Job.date_started != None)
         return result_set
-
-    def calculateCandidates(self, archseries):
-        """See `IBuildQueueSet`."""
-        if not archseries:
-            raise AssertionError("Given 'archseries' cannot be None/empty.")
-
-        arch_ids = [d.id for d in archseries]
-
-        query = """
-           Build.distroarchseries IN %s AND
-           Build.buildstate = %s AND
-           BuildQueue.job_type = %s AND
-           BuildQueue.job = BuildPackageJob.job AND
-           BuildPackageJob.build = build.id AND
-           BuildQueue.builder IS NULL
-        """ % sqlvalues(
-            arch_ids, BuildStatus.NEEDSBUILD, BuildFarmJobType.PACKAGEBUILD)
-
-        candidates = BuildQueue.select(
-            query, clauseTables=['Build', 'BuildPackageJob'],
-            orderBy=['-BuildQueue.lastscore'])
-
-        return candidates
-
-    def getForBuilds(self, build_ids):
-        """See `IBuildQueueSet`."""
-        # Avoid circular import problem.
-        from lp.soyuz.model.build import Build
-        from lp.buildmaster.model.builder import Builder
-
-        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-
-        origin = (
-            BuildPackageJob,
-            Join(BuildQueue, BuildPackageJob.job == BuildQueue.jobID),
-            Join(Build, BuildPackageJob.build == Build.id),
-            LeftJoin(
-                Builder,
-                BuildQueue.builderID == Builder.id),
-            )
-        result_set = store.using(*origin).find(
-            (BuildQueue, Builder, BuildPackageJob),
-            In(Build.id, build_ids))
-
-        return result_set

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-03-16 05:09:55 +0000
+++ lib/lp/soyuz/browser/build.py	2010-04-03 04:16:21 +0000
@@ -33,9 +33,8 @@
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.lazr.utils import safe_hasattr
 from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.services.job.interfaces.job import JobStatus
-from lp.soyuz.interfaces.build import IBuild, IBuildRescoreForm
+from lp.soyuz.interfaces.build import IBuild, IBuildRescoreForm, IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
 from lp.soyuz.interfaces.queue import PackageUploadStatus
@@ -321,7 +320,7 @@
 
     prefetched_data = dict()
     build_ids = [build.id for build in builds]
-    results = getUtility(IBuildQueueSet).getForBuilds(build_ids)
+    results = getUtility(IBuildSet).getQueueEntriesForBuildIDs(build_ids)
     for (buildqueue, _builder, build_job) in results:
         # Get the build's id, 'buildqueue', 'sourcepackagerelease' and
         # 'buildlog' (from the result set) respectively.

=== modified file 'lib/lp/soyuz/interfaces/build.py'
--- lib/lp/soyuz/interfaces/build.py	2010-03-25 14:38:25 +0000
+++ lib/lp/soyuz/interfaces/build.py	2010-04-03 04:16:21 +0000
@@ -311,6 +311,23 @@
         build queue entry. If not found, return None.
         """
 
+    def getQueueEntriesForBuildIDs(build_ids):
+        """Return the IBuildQueue instances for the IBuild IDs at hand.
+
+        Retrieve the build queue and related builder rows associated with the
+        builds in question where they exist.
+        """
+
+    def calculateCandidates(archseries):
+        """Return the BuildQueue records for the given archseries's Builds.
+
+        Returns a selectRelease of BuildQueue items for sorted by descending
+        'lastscore' for Builds within the given archseries.
+
+        'archseries' argument should be a list of DistroArchSeries and it is
+        asserted to not be None/empty.
+        """
+
 
 class IBuildRescoreForm(Interface):
     """Form for rescoring a build."""

=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/model/build.py	2010-04-03 04:16:21 +0000
@@ -1062,3 +1062,44 @@
             BuildQueue.job == queue_entry.job)
 
         return result_set.one()
+
+    def getQueueEntriesForBuildIDs(self, build_ids):
+        """See `IBuildSet`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+
+        origin = (
+            BuildPackageJob,
+            Join(BuildQueue, BuildPackageJob.job == BuildQueue.jobID),
+            Join(Build, BuildPackageJob.build == Build.id),
+            LeftJoin(
+                Builder,
+                BuildQueue.builderID == Builder.id),
+            )
+        result_set = store.using(*origin).find(
+            (BuildQueue, Builder, BuildPackageJob),
+            In(Build.id, build_ids))
+
+        return result_set
+
+    def calculateCandidates(self, archseries):
+        """See `IBuildSet`."""
+        if not archseries:
+            raise AssertionError("Given 'archseries' cannot be None/empty.")
+
+        arch_ids = [d.id for d in archseries]
+
+        query = """
+           Build.distroarchseries IN %s AND
+           Build.buildstate = %s AND
+           BuildQueue.job_type = %s AND
+           BuildQueue.job = BuildPackageJob.job AND
+           BuildPackageJob.build = build.id AND
+           BuildQueue.builder IS NULL
+        """ % sqlvalues(
+            arch_ids, BuildStatus.NEEDSBUILD, BuildFarmJobType.PACKAGEBUILD)
+
+        candidates = BuildQueue.select(
+            query, clauseTables=['Build', 'BuildPackageJob'],
+            orderBy=['-BuildQueue.lastscore'])
+
+        return candidates

=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2010-04-01 04:18:57 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-04-03 04:16:21 +0000
@@ -19,7 +19,6 @@
 from lp.archivepublisher.utils import process_in_batches
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
-from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.scripts.base import (
@@ -187,8 +186,7 @@
             return
 
         # Get the current build job candidates.
-        bqset = getUtility(IBuildQueueSet)
-        candidates = bqset.calculateCandidates(archseries)
+        candidates = getUtility(IBuildSet).calculateCandidates(archseries)
 
         self.logger.info("Found %d build in NEEDSBUILD state. Rescoring"
                          % candidates.count())