[CalendarServer-changes] [9466] CalendarServer/branches/users/gaya/inviteclean

[source_changes at macosforge.org]

Revision: 9466
          http://trac.macosforge.org/projects/calendarserver/changeset/9466
Author:   gaya at apple.com
Date:     2012-07-19 15:58:36 -0700 (Thu, 19 Jul 2012)
Log Message:
-----------
use home table in invitedAs()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py
    CalendarServer/branches/users/gaya/inviteclean/txdav/caldav/datastore/sql.py
    CalendarServer/branches/users/gaya/inviteclean/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py	2012-07-19 22:35:05 UTC (rev 9465)
+++ CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/sharing.py	2012-07-19 22:58:36 UTC (rev 9466)
@@ -665,18 +665,23 @@
         invitations.sort(key=lambda invitation:invitation.shareeUID())
         
         oinvitations = yield self._oallInvitations()
-        if len(oinvitations) != len(invitations):
-            print("len(oinvitations)=%s != len(invitations)=%s" % (len(oinvitations),len(invitations),))
-        else:
-            for i in range(len(oinvitations)):
-                new = invitations[i]
-                nstr = "uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (new.uid(), new.sharerUID(), new.shareeUID(), new.shareeAccess(), new.state(), new.summary(), )
-                old = oinvitations[i]
-                ostr = "uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (old.uid(), old.sharerUID(), old.shareeUID(), old.shareeAccess(), old.state(), old.summary(), )
-                if nstr != ostr:
-                    print("UNEQUAL new[%s] uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (i, new.uid(), new.sharerUID(), new.shareeUID(), new.shareeAccess(), new.state(), new.summary(), ))
-                    print("UNEQUAL old[%s] uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (i, old.uid(), old.sharerUID(), old.shareeUID(), old.shareeAccess(), old.state(), old.summary(), ))
+        
+        oinvitationsTestStrings = []
+        for i in range(len(oinvitations)):
+            invitation = oinvitations[i]
+            testStr = "i=%s, uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (i, invitation.uid(), invitation.sharerUID(), invitation.shareeUID(), invitation.shareeAccess(), invitation.state(), invitation.summary(), )
+            oinvitationsTestStrings += [testStr,]
 
+        invitationsTestStrings = []
+        for i in range(len(invitations)):
+            invitation = invitations[i]
+            testStr = "i=%s, uid=%s, sharerUID=%s, shareeUID=%s, shareeAccess=%s, state=%s, summary=%s" % (i, invitation.uid(), invitation.sharerUID(), invitation.shareeUID(), invitation.shareeAccess(), invitation.state(), invitation.summary(), )
+            invitationsTestStrings += [testStr,]
+            
+        if oinvitationsTestStrings != invitationsTestStrings:
+            print("MISMATCH old: %s" % oinvitationsTestStrings)
+            print("MISMATCH new: %s" % invitationsTestStrings)
+        
         returnValue(invitations)
 
     @inlineCallbacks

Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/txdav/caldav/datastore/sql.py	2012-07-19 22:35:05 UTC (rev 9465)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/caldav/datastore/sql.py	2012-07-19 22:58:36 UTC (rev 9466)
@@ -397,6 +397,7 @@
     implements(ICalendar)
 
     # structured tables.  (new, preferred)
+    _homeSchema = schema.CALENDAR_HOME
     _bindSchema = schema.CALENDAR_BIND
     _homeChildSchema = schema.CALENDAR
     _homeChildMetaDataSchema = schema.CALENDAR_METADATA

Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/txdav/carddav/datastore/sql.py	2012-07-19 22:35:05 UTC (rev 9465)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/carddav/datastore/sql.py	2012-07-19 22:58:36 UTC (rev 9466)
@@ -148,6 +148,7 @@
     implements(IAddressBook)
 
     # structured tables.  (new, preferred)
+    _homeSchema = schema.ADDRESSBOOK_HOME
     _bindSchema = schema.ADDRESSBOOK_BIND
     _homeChildSchema = schema.ADDRESSBOOK
     _homeChildMetaDataSchema = schema.ADDRESSBOOK_METADATA

Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py	2012-07-19 22:35:05 UTC (rev 9465)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py	2012-07-19 22:58:36 UTC (rev 9466)
@@ -2257,7 +2257,6 @@
         
         #FIXME performance: change schema to get rid if INVITE table -> no join
         #
-        '''
         # similar to sql_legacy.py
         inv = schema.INVITE
         home = cls._homeSchema
@@ -2277,7 +2276,7 @@
                 .And(inv.HOME_RESOURCE_ID == bind.HOME_RESOURCE_ID))
         )
         '''
-        # This seems to work so far and is simpler. home table is not needed
+        # The ALMOST worked, but returns too many rows in some cases.  
         inv = schema.INVITE
         bind = cls._bindSchema
         return Select(
@@ -2292,6 +2291,7 @@
                 .And(inv.HOME_RESOURCE_ID == bind.HOME_RESOURCE_ID)
                 .And(bind.BIND_MODE != _BIND_MODE_OWN)
         )
+        '''
 
     @inlineCallbacks
     def asInvited(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120719/5113af0b/attachment.html>