Nice work! Just one nitpick:
=== modified file 'lib/lp/buildmaster/model/builder.py' --- lib/lp/buildmaster/model/builder.py 2010-05-18 08:54:36 +0000 +++ lib/lp/buildmaster/model/builder.py 2010-06-04 15:28:29 +0000
[...]
@@ -702,33 +703,34 @@ DistroArchSeries) from lp.soyuz.model.processor import Processor
- store = Store.of(processor) - origin = ( - Archive, - BinaryPackageBuild, - PackageBuild, - BuildFarmJob, - BuildPackageJob, - BuildQueue, - DistroArchSeries, + find_spec = ( + Count(), + Sum(BuildQueue.estimated_duration), Processor, + Archive.require_virtualized, ) - queue = store.using(*origin).find( - BuildQueue, + store = getUtility(IStoreSelector).get(MAIN_STORE, SLAVE_FLAVOR) + results = store.find( + find_spec, BuildPackageJob.job == BuildQueue.jobID, BuildPackageJob.build == BinaryPackageBuild.id, - BinaryPackageBuild.distro_arch_series == DistroArchSeries.id, BinaryPackageBuild.package_build == PackageBuild.id, + PackageBuild.build_farm_job == BuildFarmJob.id, PackageBuild.archive == Archive.id, - PackageBuild.build_farm_job == BuildFarmJob.id, + BinaryPackageBuild.distro_arch_series == DistroArchSeries.id, DistroArchSeries.processorfamilyID == Processor.familyID, + # WHERE
This "WHERE" looks a bit odd ;) I think you can remove it.
« Back to merge proposal
Nice work! Just one nitpick:
=== modified file 'lib/lp/ buildmaster/ model/builder. py' buildmaster/ model/builder. py 2010-05-18 08:54:36 +0000 buildmaster/ model/builder. py 2010-06-04 15:28:29 +0000
--- lib/lp/
+++ lib/lp/
[...]
@@ -702,33 +703,34 @@
DistroArc hSeries) model.processor import Processor
from lp.soyuz.
- store = Store.of(processor) estimated_ duration) ,
Processor , require_ virtualized, *origin) .find( IStoreSelector) .get(MAIN_ STORE, SLAVE_FLAVOR)
BuildPack ageJob. job == BuildQueue.jobID,
BuildPack ageJob. build == BinaryPackageBu ild.id, ild.distro_ arch_series == DistroArchSerie s.id,
BinaryPac kageBuild. package_ build == PackageBuild.id, build_farm_ job == BuildFarmJob.id,
PackageBu ild.archive == Archive.id, build_farm_ job == BuildFarmJob.id, ild.distro_ arch_series == DistroArchSerie s.id,
DistroArc hSeries. processorfamily ID == Processor.familyID,
- origin = (
- Archive,
- BinaryPackageBuild,
- PackageBuild,
- BuildFarmJob,
- BuildPackageJob,
- BuildQueue,
- DistroArchSeries,
+ find_spec = (
+ Count(),
+ Sum(BuildQueue.
+ Archive.
)
- queue = store.using(
- BuildQueue,
+ store = getUtility(
+ results = store.find(
+ find_spec,
- BinaryPackageBu
+ PackageBuild.
- PackageBuild.
+ BinaryPackageBu
+ # WHERE
This "WHERE" looks a bit odd ;) I think you can remove it.