<!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>[12052] 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/12052">12052</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 15:31:37 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix GroupCacher.groupsToRefresh() + minor cleaning</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="#CalendarServerbranchesuserssagengroupcachertxdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/groupcacher/txdav/caldav/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 (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-12-11 22:16:01 UTC (rev 12051)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-12-11 23:31:37 UTC (rev 12052)
</span><span class="lines">@@ -319,7 +319,24 @@
</span><span class="cx"> delegatedGUIDs = set((yield allGroupDelegates(txn)))
</span><span class="cx"> self.log.info("There are %d group delegates" % (len(delegatedGUIDs),))
</span><span class="cx">
</span><del>- # TODO: Retrieve the set of attendee group guids
</del><span class="cx"> attendeeGroupGUIDs = set()
</span><ins>+
+ # get all groups from events
+ groupAttendee = schema.GROUP_ATTENDEE
+ rows = yield Select(
+ [groupAttendee.GROUP_ID, ],
+ From=groupAttendee,
+ ).on(txn)
+ groupIDs = set([row[0] for row in rows])
</ins><span class="cx">
</span><ins>+ # get groupGUIDs
+ if groupIDs:
+ gr = schema.GROUPS
+ rows = yield Select(
+ [gr.GROUP_GUID, ],
+ From=gr,
+ Where=gr.GROUP_ID.In(groupIDs)
+ ).on(txn)
+ attendeeGroupGUIDs = set([row[0] for row in rows])
+
</ins><span class="cx"> returnValue(delegatedGUIDs.union(attendeeGroupGUIDs))
</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 (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-12-11 22:16:01 UTC (rev 12051)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-12-11 23:31:37 UTC (rev 12052)
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> vcalendar1 = Component.fromString(data_put_1)
</span><del>- cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</del><ins>+ yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> vcalendar1 = Component.fromString(data_put_1)
</span><del>- cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</del><ins>+ yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx"> vcalendar1 = Component.fromString(data_put_1)
</span><del>- cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</del><ins>+ yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> vcalendar1 = Component.fromString(data_put_1)
</span><del>- cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</del><ins>+ yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> vcalendar1 = Component.fromString(data_put_1)
</span><del>- cobj1 = yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</del><ins>+ yield calendar.createCalendarObjectWithName("data1.ics", vcalendar1)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> cobj1 = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/txdav/caldav/datastore/sql.py (12051 => 12052)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/txdav/caldav/datastore/sql.py 2013-12-11 22:16:01 UTC (rev 12051)
+++ CalendarServer/branches/users/sagen/groupcacher/txdav/caldav/datastore/sql.py 2013-12-11 23:31:37 UTC (rev 12052)
</span><span class="lines">@@ -1625,9 +1625,9 @@
</span><span class="cx"> groupRecord = yield self.directoryService().recordWithGUID(groupGUID)
</span><span class="cx"> if groupRecord:
</span><span class="cx"> members = yield expandedMembers(groupRecord)
</span><ins>+ memberGUIDs = sorted([member.guid for member in members])
+
</ins><span class="cx"> membershipHashContent = hashlib.md5()
</span><del>- members = yield expandedMembers(groupRecord)
- memberGUIDs = sorted([member.guid for member in members])
</del><span class="cx"> for memberGUID in memberGUIDs:
</span><span class="cx"> membershipHashContent.update(str(memberGUID))
</span><span class="cx"> membershipHash = membershipHashContent.hexdigest()
</span></span></pre>
</div>
</div>
</body>
</html>