Merge lp:~edwin-grubbs/launchpad/bug-590840-getMembershipInformation-timeout-2 into lp:launchpad

[Edwin Grubbs]

In the prerequisite branch bug-590840-getMembershipInformation-timeout, after I got the review, I discovered that it was testing both of the unioned queries. I added tests in this branch, and I also optimized MailingList.getSenderAddresses() like I did in the previous branch for MailingListSet.getSenderAddresses(team_names) by not selecting information that would be thrown away.

[Brad Crittenden (bac)]

Looks fine, Edwin. Thanks for the clarifications on IRC.

review: Approve (code)

=== modified file 'lib/lp/registry/doc/message-holds.txt'
--- lib/lp/registry/doc/message-holds.txt	2010-01-12 22:23:02 +0000
+++ lib/lp/registry/doc/message-holds.txt	2010-06-11 18:56:33 +0000
@@ -412,6 +412,12 @@
     >>> sorted(email.email for email in list_three.getSenderAddresses())
     [u'[e-mail]']
 
+    >>> from lp.registry.interfaces.mailinglist import IMailingListSet
+    >>> mailinglist_set = getUtility(IMailingListSet)
+    >>> bulk_addresses = mailinglist_set.getSenderAddresses(['test-three'])
+    >>> sorted(email for name, email in bulk_addresses['test-three'])
+    [u'[e-mail]']
+
 Salgado posts another message to the list, but this time it's approved.
 
     >>> message = message_set.fromEmail("""\
@@ -435,6 +441,10 @@
     >>> sorted(email.email for email in list_three.getSenderAddresses())
     [u'[e-mail]', u'[e-mail]']
 
+    >>> bulk_addresses = mailinglist_set.getSenderAddresses(['test-three'])
+    >>> sorted(email for name, email in bulk_addresses['test-three'])
+    [u'[e-mail]', u'[e-mail]']
+
 But he will still not get messages delivered to his address, since he's not
 subscribed to the team mailing list.
 

=== modified file 'lib/lp/registry/model/mailinglist.py'
--- lib/lp/registry/model/mailinglist.py	2010-06-11 18:56:32 +0000
+++ lib/lp/registry/model/mailinglist.py	2010-06-11 18:56:33 +0000
@@ -467,15 +467,13 @@
         # are allowed to post to the mailing list.
         tables = (
             Person,
-            LeftJoin(Account, Account.id == Person.accountID),
-            LeftJoin(EmailAddress, EmailAddress.personID == Person.id),
-            LeftJoin(TeamParticipation,
-                     TeamParticipation.personID == Person.id),
-            LeftJoin(MailingList,
-                     MailingList.teamID == TeamParticipation.teamID),
+            Join(Account, Account.id == Person.accountID),
+            Join(EmailAddress, EmailAddress.personID == Person.id),
+            Join(TeamParticipation, TeamParticipation.personID == Person.id),
+            Join(MailingList, MailingList.teamID == TeamParticipation.teamID),
             )
         team_members = store.using(*tables).find(
-            (EmailAddress, Person),
+            EmailAddress,
             And(TeamParticipation.team == self.team,
                 MailingList.status != MailingListStatus.INACTIVE,
                 Person.teamowner == None,
@@ -489,13 +487,12 @@
         # global approvals.
         tables = (
             Person,
-            LeftJoin(Account, Account.id == Person.accountID),
-            LeftJoin(EmailAddress, EmailAddress.personID == Person.id),
-            LeftJoin(MessageApproval,
-                     MessageApproval.posted_byID == Person.id),
+            Join(Account, Account.id == Person.accountID),
+            Join(EmailAddress, EmailAddress.personID == Person.id),
+            Join(MessageApproval, MessageApproval.posted_byID == Person.id),
             )
         approved_posters = store.using(*tables).find(
-            (EmailAddress, Person),
+            EmailAddress,
             And(MessageApproval.mailing_list == self,
                 MessageApproval.status.is_in(MESSAGE_APPROVAL_STATUSES),
                 EmailAddress.status.is_in(EMAIL_ADDRESS_STATUSES),
@@ -509,8 +506,7 @@
         # email_address.person.displayname, so the prejoin to Person is
         # critical to acceptable performance.  Indeed, without the prejoin, we
         # were getting tons of timeout OOPSes.  See bug 259440.
-        for email_address, person in team_members.union(approved_posters):
-            yield email_address
+        return team_members.union(approved_posters)
 
     def holdMessage(self, message):
         """See `IMailingList`."""