<!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>[11905] CalendarServer/branches/users/sagen/groupcacher</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/11905">11905</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2013-11-07 11:38:49 -0800 (Thu, 07 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More cleanup and docstrings</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhogroupspy">CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhotesttest_groupspy">CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py (11904 => 11905)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-11-07 19:20:46 UTC (rev 11904)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-11-07 19:38:49 UTC (rev 11905)
</span><span class="lines">@@ -194,12 +194,6 @@
</span><span class="cx">
</span><span class="cx"> yield txn.updateGroup(groupGUID, record.fullNames[0], membershipHash)
</span><span class="cx">
</span><del>- results = (yield txn.groupByGUID(groupGUID))
- if len(results) == 1:
- groupID, name, cachedMembershipHash = results[0]
- else:
- self.log.error("Multiple group entries for {guid}", guid=groupGUID)
-
</del><span class="cx"> if membershipChanged:
</span><span class="cx"> newMemberGUIDs = set()
</span><span class="cx"> for member in members:
</span><span class="lines">@@ -212,10 +206,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def synchronizeMembers(self, txn, groupID, newMemberGUIDs):
</span><span class="cx"> numRemoved = numAdded = 0
</span><del>- cachedMemberGUIDs = set()
- results = (yield txn.membersOfGroup(groupID))
- for row in results:
- cachedMemberGUIDs.add(row[0])
</del><ins>+ cachedMemberGUIDs = (yield txn.membersOfGroup(groupID))
</ins><span class="cx">
</span><span class="cx"> for memberGUID in cachedMemberGUIDs:
</span><span class="cx"> if memberGUID not in newMemberGUIDs:
</span><span class="lines">@@ -233,9 +224,9 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def cachedMembers(self, txn, groupID):
</span><span class="cx"> members = set()
</span><del>- results = (yield txn.membersOfGroup(groupID))
- for row in results:
- record = (yield self.directory.recordWithGUID(row[0]))
</del><ins>+ memberGUIDs = (yield txn.membersOfGroup(groupID))
+ for guid in memberGUIDs:
+ record = (yield self.directory.recordWithGUID(guid))
</ins><span class="cx"> if record is not None:
</span><span class="cx"> members.add(record)
</span><span class="cx"> returnValue(members)
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py (11904 => 11905)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-11-07 19:20:46 UTC (rev 11904)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-11-07 19:38:49 UTC (rev 11905)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_expandedMembers(self):
</span><ins>+ """
+ Verify _expandedMembers() returns a "flattened" set of records
+ belonging to a group (and does not return sub-groups themselves,
+ only their members)
+ """
</ins><span class="cx"> record = yield self.xmlService.recordWithUID("__top_group_1__")
</span><span class="cx"> memberUIDs = set()
</span><span class="cx"> for member in (yield _expandedMembers(record)):
</span><span class="lines">@@ -48,6 +53,7 @@
</span><span class="cx"> self.assertEquals(memberUIDs, set(["__cdaboo__",
</span><span class="cx"> "__glyph__", "__sagen__", "__wsanchez__"]))
</span><span class="cx">
</span><ins>+ # Non group records return an empty set() of members
</ins><span class="cx"> record = yield self.xmlService.recordWithUID("__sagen__")
</span><span class="cx"> members = yield _expandedMembers(record)
</span><span class="cx"> self.assertEquals(0, len(list(members)))
</span><span class="lines">@@ -63,24 +69,24 @@
</span><span class="cx"> store = self.storeUnderTest()
</span><span class="cx"> txn = store.newTransaction()
</span><span class="cx">
</span><del>- guid = "49b350c69611477b94d95516b13856ab"
- yield self.groupCacher.refreshGroup(txn, guid)
</del><ins>+ record = yield self.xmlService.recordWithUID("__top_group_1__")
+ yield self.groupCacher.refreshGroup(txn, record.guid)
</ins><span class="cx">
</span><del>- groupID, name, membershipHash = (yield txn.groupByGUID(guid))
</del><ins>+ groupID, name, membershipHash = (yield txn.groupByGUID(record.guid))
</ins><span class="cx"> self.assertEquals(membershipHash, "e90052eb63d47f32d5b03df0073f7854")
</span><span class="cx">
</span><span class="cx"> groupGUID, name, membershipHash = (yield txn.groupByID(groupID))
</span><del>- self.assertEquals(groupGUID, guid)
</del><ins>+ self.assertEquals(groupGUID, record.guid)
</ins><span class="cx"> self.assertEquals(name, "Top Group 1")
</span><span class="cx"> self.assertEquals(membershipHash, "e90052eb63d47f32d5b03df0073f7854")
</span><span class="cx">
</span><del>- results = (yield txn.membersOfGroup(groupID))
</del><ins>+ members = (yield txn.membersOfGroup(groupID))
</ins><span class="cx"> self.assertEquals(
</span><span class="cx"> set(["9064df911dbc4e079c2b6839b0953876",
</span><span class="cx"> "4ad155cbae9b475f986ce08a7537893e",
</span><span class="cx"> "3bdcb95484d54f6d8035eac19a6d6e1f",
</span><span class="cx"> "7d45cb10479e456bb54d528958c5734b"]),
</span><del>- set([r[0] for r in results])
</del><ins>+ members
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> records = (yield self.groupCacher.cachedMembers(txn, groupID))
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py (11904 => 11905)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-07 19:20:46 UTC (rev 11904)
+++ CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-07 19:38:49 UTC (rev 11905)
</span><span class="lines">@@ -1001,9 +1001,24 @@
</span><span class="cx"> return self._removeMemberFromGroupQuery.on(self,
</span><span class="cx"> groupID=groupID, memberGUID=memberGUID)
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def membersOfGroup(self, groupID):
</span><del>- return self._selectGroupMembersQuery.on(self, groupID=groupID)
</del><ins>+ """
+ Returns the cached set of GUIDs for members of the given groupID.
+ Sub-groups are not returned in the results but their members are.
</ins><span class="cx">
</span><ins>+ @param groupID: the group ID
+ @type groupID: C{int}
+ @return: the set of member GUIDs
+ @rtype: a Deferred which fires with a set() of C{str} GUIDs
+ """
+ members = set()
+ results = (yield self._selectGroupMembersQuery.on(self,
+ groupID=groupID))
+ for row in results:
+ members.add(row[0])
+ returnValue(members)
+
</ins><span class="cx"> # End of Group Members
</span><span class="cx">
</span><span class="cx"> # Delegates
</span></span></pre>
</div>
</div>
</body>
</html>