Merge lp:~deryck/launchpad/adapt-badges-listing-item-901122 into lp:launchpad

[Deryck Hodge]

Ensure bug listing code adapts badges for display via BugTaskListingItemImageDisplayAPI to save queries.

This is the second and final branch in getting the new bug data we added in custom buglistings loading with less queries. This is a simple one line fix with a lot of power. There's already a class to ensure we don't issue too many queries when getting badges. See lp.app.browser.tales.BugTaskListingItemImageDisplayAPI. But there is also it's super class lp.app.browser.tales.BugTaskImageDisplayAPI. Since we were adapting based on bugtasks rather than self (which is the BugTaskListingItem) we were adapting to the super class and not BugTaskListingItemImageDisplayAPI, which is the class that helps us avoid the additional queries.

This fix is magical. It brings us back down to pre-custom buglistings query levels +2. But the +2 is consistent no matter the data size, and are attributed to cached queries to get tags and reporter name.

lifeless suggested I add a scaling test in the pre-req branch for this one, which I'll gladly add into this branch before considering the work done.

[Steve Kowalik (stevenk)]

Excellent work! I will echo Robert's suggestion of a query counting test, too.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2012-02-29 21:51:21 +0000
+++ lib/lp/bugs/browser/bugtask.py	2012-02-29 21:51:22 +0000
@@ -2200,7 +2200,7 @@
             date_last_updated = self.bug.date_last_updated
         last_updated_formatter = DateTimeFormatterAPI(date_last_updated)
         last_updated = last_updated_formatter.displaydate()
-        badges = getAdapter(self.bugtask, IPathAdapter, 'image').badges()
+        badges = getAdapter(self, IPathAdapter, 'image').badges()
         target_image = getAdapter(self.target, IPathAdapter, 'image')
         if self.bugtask.milestone is not None:
             milestone_name = self.bugtask.milestone.displayname

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2012-02-29 21:51:21 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2012-02-29 21:51:22 +0000
@@ -1859,6 +1859,33 @@
         view.initialize()
         return view
 
+    def invalidate_caches(self, obj):
+        store = Store.of(obj)
+        # Make sure everything is in the database.
+        store.flush()
+        # And invalidate the cache (not a reset, because that stops us using
+        # the domain objects)
+        store.invalidate()
+
+    def test_rendered_query_counts_constant_with_many_bugtasks(self):
+        product = self.factory.makeProduct()
+        bug = self.factory.makeBug(product=product)
+        buggy_product = self.factory.makeProduct()
+        for _ in range(10):
+            self.factory.makeBug(product=buggy_product)
+        recorder = QueryCollector()
+        recorder.register()
+        self.addCleanup(recorder.unregister)
+        self.invalidate_caches(bug)
+        # count with single task
+        url = canonical_url(product, view_name='+bugs')
+        self.getUserBrowser(url)
+        self.assertThat(recorder, HasQueryCount(LessThan(24)))
+        # count with many tasks
+        buggy_url = canonical_url(buggy_product, view_name='+bugs')
+        self.getUserBrowser(buggy_url)
+        self.assertThat(recorder, HasQueryCount(LessThan(24)))
+
     def test_mustache_model_missing_if_no_flag(self):
         """The IJSONRequestCache should contain mustache_model."""
         view = self.makeView()