Merge lp:~rvb/launchpad/builder-history-lfa into lp:launchpad

[Raphaël Badin]

[r=adeuring][bug=905380] Prefetch LibraryFileAlias objects.

This branch adds the prefetching of LibraryFileAlias objects to {sourcepackagerecipebuild, translationtemplatesbuild}preloadBuildsData.

= Tests =
(modified tests)
./bin/test -vvc test_builder_views test_build_history

= Q/A =
Find a builder/+history page and make sure that this query http://paste.ubuntu.com/772360/ is not among the repeated statements.

[Abel Deuring (adeuring)]

review: Approve (code)

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2012-01-02 11:21:14 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2012-01-06 08:50:00 +0000
@@ -290,8 +290,12 @@
     def preloadBuildsData(cls, builds):
         # Circular imports.
         from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
+        from lp.services.librarian.model import LibraryFileAlias
         package_builds = load_related(
             PackageBuild, builds, ['package_build_id'])
+        build_farm_jobs = [
+            build.build_farm_job for build in builds]
+        load_related(LibraryFileAlias, build_farm_jobs, ['log_id'])
         archives = load_related(Archive, package_builds, ['archive_id'])
         load_related(Person, archives, ['ownerID'])
         sprs = load_related(

=== modified file 'lib/lp/soyuz/browser/tests/test_builder.py'
--- lib/lp/soyuz/browser/tests/test_builder.py	2012-01-02 11:21:14 +0000
+++ lib/lp/soyuz/browser/tests/test_builder.py	2012-01-06 08:50:00 +0000
@@ -100,7 +100,7 @@
 
         self.assertThat(
             recorder2,
-            HasQueryCount(LessThan(recorder1.count + 3 * 2 + 1)))
+            HasQueryCount(LessThan(recorder1.count + 4 * 2 + 1)))
 
     def test_builders_translation_template_build_query_count(self):
         def create_build():

=== modified file 'lib/lp/soyuz/browser/tests/test_builder_views.py'
--- lib/lp/soyuz/browser/tests/test_builder_views.py	2012-01-06 08:50:00 +0000
+++ lib/lp/soyuz/browser/tests/test_builder_views.py	2012-01-06 08:50:00 +0000
@@ -15,7 +15,10 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
-from lp.buildmaster.enums import BuildFarmJobType
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.buildfarmjob import (
     IBuildFarmJobSource,
     InconsistentBuildFarmJobError,
@@ -159,6 +162,15 @@
 
 class BuildCreationMixin(object):
 
+    def markAsBuilt(self, build):
+        lfa = self.factory.makeLibraryFileAlias()
+        naked_build = removeSecurityProxy(build)
+        naked_build.log = lfa
+        naked_build.date_started = self.factory.getUniqueDate()
+        naked_build.date_finished = self.factory.getUniqueDate()
+        naked_build.status = BuildStatus.FULLYBUILT
+        transaction.commit()
+
     def createTranslationTemplateBuildWithBuilder(self, builder=None):
         if builder is None:
             builder = self.factory.makeBuilder()
@@ -169,7 +181,7 @@
         branch = self.factory.makeBranch()
         build = source.create(build_farm_job, branch)
         removeSecurityProxy(build).builder = builder
-        self.addFakeBuildLog(build)
+        self.markAsBuilt(build)
         return build
 
     def createRecipeBuildWithBuilder(self, private_branch=False,
@@ -187,14 +199,9 @@
                     True, getUtility(IPersonSet).getByEmail(ADMIN_EMAIL))
         Store.of(build).flush()
         removeSecurityProxy(build).builder = builder
-        self.addFakeBuildLog(build)
+        self.markAsBuilt(build)
         return build
 
-    def addFakeBuildLog(self, build):
-        lfa = self.factory.makeLibraryFileAlias('mybuildlog.txt')
-        removeSecurityProxy(build).log = lfa
-        transaction.commit()
-
     def createBinaryPackageBuild(self, in_ppa=False, builder=None):
         if builder is None:
             builder = self.factory.makeBuilder()
@@ -206,7 +213,7 @@
         naked_build.builder = builder
         naked_build.date_started = self.factory.getUniqueDate()
         naked_build.date_finished = self.factory.getUniqueDate()
-        self.addFakeBuildLog(build)
+        self.markAsBuilt(build)
         return build
 
 

=== modified file 'lib/lp/translations/model/translationtemplatesbuild.py'
--- lib/lp/translations/model/translationtemplatesbuild.py	2012-01-01 02:58:52 +0000
+++ lib/lp/translations/model/translationtemplatesbuild.py	2012-01-06 08:50:00 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """`TranslationTemplatesBuild` class."""
@@ -117,21 +117,28 @@
         """See `ITranslationTemplatesBuildSource`."""
         store = cls._getStore(store)
 
-        def eager_load(rows):
-            # Load the related branches, products.
-            branches = load_related(
-                Branch, rows, ['branch_id'])
-            load_related(
-                Product, branches, ['productID'])
-            # Preload branches cached associated product series and
-            # suite source packages for all the related branches.
-            GenericBranchCollection.preloadDataForBranches(branches)
-
         resultset = store.find(
             TranslationTemplatesBuild,
             TranslationTemplatesBuild.build_farm_job_id.is_in(
                 buildfarmjob_ids))
-        return DecoratedResultSet(resultset, pre_iter_hook=eager_load)
+        return DecoratedResultSet(
+            resultset, pre_iter_hook=cls.preloadBuildsData)
+
+    @classmethod
+    def preloadBuildsData(cls, builds):
+        # Circular imports.
+        from lp.services.librarian.model import LibraryFileAlias
+        # Load the related branches, products.
+        branches = load_related(
+            Branch, builds, ['branch_id'])
+        load_related(
+            Product, branches, ['productID'])
+        # Preload branches cached associated product series and
+        # suite source packages for all the related branches.
+        GenericBranchCollection.preloadDataForBranches(branches)
+        build_farm_jobs = [
+            build.build_farm_job for build in builds]
+        load_related(LibraryFileAlias, build_farm_jobs, ['log_id'])
 
     @classmethod
     def findByBranch(cls, branch, store=None):