<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13637] CalendarServer/trunk/twistedcaldav/directory</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13637">13637</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-06-13 14:13:05 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing unused delegate assignment deletion code</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_proxyprincipaldbpy">CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py (13636 => 13637)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py        2014-06-13 13:36:18 UTC (rev 13636)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py        2014-06-13 21:13:05 UTC (rev 13637)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> import itertools
</span><del>-import time
</del><span class="cx"> import uuid
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="lines">@@ -531,34 +530,7 @@
</span><span class="cx"> def deleteMembership(self, guid):
</span><span class="cx"> return self.delete("memberships:%s" % (str(guid),))
</span><span class="cx">
</span><del>- def setDeletionTimer(self, guid, delay):
- return self.set("del:%s" % (str(guid),), str(self.getTime() + delay))
</del><span class="cx">
</span><del>- def checkDeletionTimer(self, guid):
- # True means it's overdue, False means it's not, None means no timer
- def _value(value):
- if value:
- if int(value) <= self.getTime():
- return True
- else:
- return False
- else:
- return None
- d = self.get("del:%s" % (str(guid),))
- d.addCallback(_value)
- return d
-
- def clearDeletionTimer(self, guid):
- return self.delete("del:%s" % (str(guid),))
-
- def getTime(self):
- if hasattr(self, 'theTime'):
- theTime = self.theTime
- else:
- theTime = int(time.time())
- return theTime
-
-
</del><span class="cx"> def __init__(self, dbID, dbapiName, dbapiArgs, **kwargs):
</span><span class="cx"> AbstractADBAPIDatabase.__init__(self, dbID, dbapiName, dbapiArgs, True, **kwargs)
</span><span class="cx">
</span><span class="lines">@@ -642,70 +614,6 @@
</span><span class="cx"> yield self._memcacher.deleteMember(principalUID)
</span><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
- def removePrincipal(self, principalUID, delay=None):
- """
- Remove a group membership record.
-
- @param principalUID: the UID of the principal to remove.
- """
- # FIXME: This method doesn't appear to be used anywhere. Still needed?
-
- if delay:
- # We are going to remove the principal only after <delay> seconds
- # has passed since we first chose to remove it, to protect against
- # transient directory problems.
- # If <delay> is specified, first see if there was a timer set
- # previously. If the timer is more than delay seconds old, we
- # go ahead and remove the principal. Otherwise, do nothing.
-
- overdue = yield self._memcacher.checkDeletionTimer(principalUID)
-
- if overdue is False:
- # Do nothing
- returnValue(None)
-
- elif overdue is None:
- # No timer was previously set
- self.log.debug("Delaying removal of missing proxy principal '%s'"
- % (principalUID,))
- yield self._memcacher.setDeletionTimer(principalUID, delay=delay)
- returnValue(None)
-
- self.log.warn("Removing missing proxy principal for '%s'"
- % (principalUID,))
-
- for suffix in ("calendar-proxy-read", "calendar-proxy-write",):
- groupUID = "%s#%s" % (principalUID, suffix,)
- yield self._delete_from_db(groupUID)
-
- # Update cache
- members = yield self.getMembers(groupUID)
- if members:
- for member in members:
- yield self._memcacher.deleteMembership(member)
- yield self._memcacher.deleteMember(groupUID)
-
- memberships = (yield self.getMemberships(principalUID))
- for groupUID in memberships:
- yield self._memcacher.deleteMember(groupUID)
-
- yield self._delete_from_db_member(principalUID)
- yield self._memcacher.deleteMembership(principalUID)
- yield self._memcacher.clearDeletionTimer(principalUID)
-
-
- def refreshPrincipal(self, principalUID):
- """
- Bring back to life a principal that was previously deleted.
-
- @param principalUID:
- @type principalUID:
- """
-
- return self._memcacher.clearDeletionTimer(principalUID)
-
-
</del><span class="cx"> def getMembers(self, principalUID):
</span><span class="cx"> """
</span><span class="cx"> Return the list of group member UIDs for the specified principal.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_proxyprincipaldbpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py (13636 => 13637)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py        2014-06-13 13:36:18 UTC (rev 13636)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_proxyprincipaldb.py        2014-06-13 21:13:05 UTC (rev 13637)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ProxyPrincipalDBSqlite (twistedcaldav.test.util.TestCase):
</span><span class="cx"> """
</span><span class="cx"> Directory service provisioned principals.
</span><span class="lines">@@ -333,50 +334,7 @@
</span><span class="cx"> yield db.clean()
</span><span class="cx">
</span><span class="cx">
</span><del>- @inlineCallbacks
- def test_cachingDBRemovePrincipal(self):
</del><span class="cx">
</span><del>- for processType in ("Single", "Combined",):
- config.ProcessType = processType
-
- # Get the DB
- db_path = os.path.abspath(self.mktemp())
- db = ProxySqliteDB(db_path)
-
- # Do one insert and check the result
- yield db.setGroupMembers("A", ("B", "C", "D",))
- yield db.setGroupMembers("X", ("B", "C",))
-
- membersA = yield db.getMembers("A")
- membersX = yield db.getMembers("X")
- membershipsB = yield db.getMemberships("B")
- membershipsC = yield db.getMemberships("C")
- membershipsD = yield db.getMemberships("D")
-
- self.assertEqual(membersA, set(("B", "C", "D",)))
- self.assertEqual(membersX, set(("B", "C",)))
- self.assertEqual(membershipsB, set(("A", "X",)))
- self.assertEqual(membershipsC, set(("A", "X",)))
- self.assertEqual(membershipsD, set(("A",)))
-
- # Remove and check the result
- yield db.removePrincipal("B")
-
- membersA = yield db.getMembers("A")
- membersX = yield db.getMembers("X")
- membershipsB = yield db.getMemberships("B")
- membershipsC = yield db.getMemberships("C")
- membershipsD = yield db.getMemberships("D")
-
- self.assertEqual(membersA, set(("C", "D",)))
- self.assertEqual(membersX, set(("C",)))
- self.assertEqual(membershipsB, set())
- self.assertEqual(membershipsC, set(("A", "X",)))
- self.assertEqual(membershipsD, set(("A",),))
-
- yield db.clean()
-
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_cachingDBInsertUncached(self):
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>