[CalendarServer-changes] [14544] CalendarServer/branches/users/sagen/trashcan-5/txdav/common/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 14544
          http://trac.calendarserver.org//changeset/14544
Author:   sagen at apple.com
Date:     2015-03-09 19:22:13 -0700 (Mon, 09 Mar 2015)
Log Message:
-----------
Cache children via name and resourceID, regardless of which was used to fault in

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py	2015-03-10 00:28:51 UTC (rev 14543)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py	2015-03-10 02:22:13 UTC (rev 14544)
@@ -3482,6 +3482,7 @@
             child = yield self._childClass.objectWithName(self, name, onlyInTrash=onlyInTrash)
             if child is not None:
                 self._children[childrenKey][name] = child
+                self._children[childrenKey][child._resourceID] = child
         returnValue(self._children[childrenKey].get(name, None))
 
 
@@ -3510,6 +3511,7 @@
             child = yield self._childClass.objectWithID(self, resourceID, onlyInTrash=onlyInTrash)
             if child is not None:
                 self._children[childrenKey][resourceID] = child
+                self._children[childrenKey][child._name] = child
         returnValue(self._children[childrenKey].get(resourceID, None))
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150309/d36cc768/attachment.html>