Merge lp:~jtv/launchpad/cleanups-475435 into lp:launchpad

[Jeroen T. Vermeulen]

Cleanups instead of fix for bug 475435.

= Cleanups for bug 475435 =

Bug 7475435 turns out to be triaged as High but actually considered Low. But while I was looking into these timeouts, I came up with some cleanups that are nice to have anyway.

This is all semantically neutral: make use of some caching (the cached value isn't ever supposed to fall out of sync anyway), improve some docstrings, simplify some queries, remove some commented-out code. It should make a few things slightly faster, but nothing dramatic.

No lint.

Jeroen

Unmerged revisions

10467. By Jeroen T. Vermeulen on 2010-03-10

Turns out there's no point in fixing the bug just now; but here are some cleanups.

=== modified file 'lib/lp/translations/interfaces/potemplate.py'
--- lib/lp/translations/interfaces/potemplate.py	2009-11-27 12:50:16 +0000
+++ lib/lp/translations/interfaces/potemplate.py	2010-03-10 18:38:19 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -377,10 +377,12 @@
         """
 
     def getPOTMsgSetsCount(current=True):
-        """Return the number of POTMsgSet objects related to this object.
-
-        The current argument is used to select only current POTMsgSets or all
-        of them.
+        """Count the number of `POTMsgSet`s in this template.
+
+        Use this in recomputing statistics.  Otherwise, use
+        `messageCount` which relies on a cached count instead.
+
+        :param current: Count only messages that are currently in use?
         """
 
     def __getitem__(key):

=== modified file 'lib/lp/translations/model/pofile.py'
--- lib/lp/translations/model/pofile.py	2010-01-14 16:39:18 +0000
+++ lib/lp/translations/model/pofile.py	2010-03-10 18:38:19 +0000
@@ -378,8 +378,7 @@
         Orders the result by TranslationTemplateItem.sequence which must
         be among `origin_tables`.
         """
-        store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
-        results = store.using(origin_tables).find(
+        results = Store.of(self).using(origin_tables).find(
             POTMsgSet, SQL(query))
         return results.order_by(TranslationTemplateItem.sequence)
 
@@ -609,13 +608,6 @@
     def translated(self):
         """See `IPOFile`."""
         raise NotImplementedError
-        # return iter(TranslationMessage.select('''
-        #     POMsgSet.pofile = %d AND
-        #     POMsgSet.iscomplete=TRUE AND
-        #     POMsgSet.potmsgset = POTMsgSet.id AND
-        #     POTMsgSet.sequence > 0''' % self.id,
-        #     clauseTables = ['POMsgSet']
-        #     ))
 
     def untranslated(self):
         """See `IPOFile`."""
@@ -963,7 +955,7 @@
         if self.potemplate.messageCount() > 0:
             total = self.potemplate.messageCount()
         else:
-            total = self.potemplate.getPOTMsgSets().count()
+            total = self.potemplate.getPOTMsgSetsCount()
             self.potemplate.messagecount = total
 
         # Get number of translations done only in Launchpad.

=== modified file 'lib/lp/translations/model/potemplate.py'
--- lib/lp/translations/model/potemplate.py	2010-01-12 21:29:03 +0000
+++ lib/lp/translations/model/potemplate.py	2010-03-10 18:38:19 +0000
@@ -326,13 +326,10 @@
 
     @property
     def language_count(self):
-        return Language.select('''
-            POFile.language = Language.id AND
-            POFile.currentcount + POFile.rosettacount > 0 AND
-            POFile.potemplate = %s
-            ''' % sqlvalues(self.id),
-            clauseTables=['POFile'],
-            distinct=True).count()
+        return Store.of(self).find(
+            POFile,
+            POFile.potemplate == self,
+            POFile.rosettacount > 0).count()
 
     @property
     def translationtarget(self):
@@ -442,8 +439,10 @@
 
     def getPOTMsgSetsCount(self, current=True):
         """See `IPOTemplate`."""
-        results = self.getPOTMsgSets(current, prefetch=False)
-        return results.count()
+        clauses = (TranslationTemplateItem.potmsgset == self)
+        if current:
+            clauses = And(clauses, TranslationTemplateItem.sequence > 0)
+        return Store.of(self).find(TranslationTemplateItem, clauses).count()
 
     def getPOTMsgSetByID(self, id):
         """See `IPOTemplate`."""

=== modified file 'lib/lp/translations/templates/object-templates.pt'
--- lib/lp/translations/templates/object-templates.pt	2010-02-15 16:00:01 +0000
+++ lib/lp/translations/templates/object-templates.pt	2010-03-10 18:38:19 +0000
@@ -108,7 +108,7 @@
                 </tal:inactive>
               </td>
               <td class="length_column"
-                  tal:content="template/getPOTMsgSetsCount">1777</td>
+                  tal:content="template/messageCount">1777</td>
               <td class="languages_column"
                   tal:content="template/language_count">777</td>
               <td class="lastupdate_column">