<!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>[13334] CalendarServer/trunk/txdav/caldav/datastore/sql.py</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/13334">13334</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 14:34:01 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>optimize CalendarObject.reconcileGroupAttendees() to only call Component.reconcileGroupAttendees() if group has changed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13333 => 13334)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-18 21:02:12 UTC (rev 13333)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-18 21:34:01 UTC (rev 13334)
</span><span class="lines">@@ -1931,7 +1931,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def reconcileGroupAttendees(self, component):
</del><ins>+ def reconcileGroupAttendees(self, component, inserting=False):
</ins><span class="cx"> """
</span><span class="cx"> reconcile group attendees
</span><span class="cx"> """
</span><span class="lines">@@ -1954,23 +1954,33 @@
</span><span class="cx"> [member.attendeeProperty(params={"MEMBER": groupCUA}) for member in members]
</span><span class="cx"> )
</span><span class="cx">
</span><del>- # sync group attendees
- changed = component.reconcileGroupAttendees(groupCUAToAttendeeMemberPropMap)
-
</del><span class="cx"> # save for post processing
</span><span class="cx"> self._groupCUAToAttendeeMemberPropMap = groupCUAToAttendeeMemberPropMap
</span><span class="cx">
</span><ins>+ # sync group attendee members if inserting or group changed
+ changed = False
+ if inserting or (yield self.updateGROUP_ATTENDEE(groupCUAToAttendeeMemberPropMap)):
+ changed = component.reconcileGroupAttendees(groupCUAToAttendeeMemberPropMap)
+
+ # save for post processing when self._resourceID is non-zero
+ if inserting:
+ self._groupCUAToAttendeeMemberPropMap = groupCUAToAttendeeMemberPropMap
+
</ins><span class="cx"> returnValue(changed)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def updateGROUP_ATTENDEE(self):
</del><ins>+ def updateGROUP_ATTENDEE(self, groupCUAToAttendeeMemberPropMap=None):
</ins><span class="cx"> """
</span><span class="cx"> update schema.GROUP_ATTENDEE
</span><span class="cx"> """
</span><del>- if not hasattr(self, "_groupCUAToAttendeeMemberPropMap"):
- returnValue(None)
</del><ins>+ if groupCUAToAttendeeMemberPropMap is None:
+ if not hasattr(self, "_groupCUAToAttendeeMemberPropMap"):
+ returnValue(False)
+ else:
+ groupCUAToAttendeeMemberPropMap = self._groupCUAToAttendeeMemberPropMap
</ins><span class="cx">
</span><ins>+ changed = False
</ins><span class="cx"> ga = schema.GROUP_ATTENDEE
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [ga.GROUP_ID, ga.MEMBERSHIP_HASH],
</span><span class="lines">@@ -1979,7 +1989,7 @@
</span><span class="cx"> ).on(self._txn)
</span><span class="cx"> oldGAs = dict(rows)
</span><span class="cx">
</span><del>- for groupCUA, memberAttendeeProps in self._groupCUAToAttendeeMemberPropMap.iteritems():
</del><ins>+ for groupCUA, memberAttendeeProps in groupCUAToAttendeeMemberPropMap.iteritems():
</ins><span class="cx"> groupRecord = yield self.directoryService().recordWithCalendarUserAddress(groupCUA)
</span><span class="cx"> if groupRecord:
</span><span class="cx"> members = set([(
</span><span class="lines">@@ -2005,6 +2015,7 @@
</span><span class="cx"> ga.GROUP_ID == groupID
</span><span class="cx"> )
</span><span class="cx"> ).on(self._txn)
</span><ins>+ changed = True
</ins><span class="cx"> del oldGAs[groupID]
</span><span class="cx"> else:
</span><span class="cx"> yield Insert({
</span><span class="lines">@@ -2013,6 +2024,7 @@
</span><span class="cx"> ga.MEMBERSHIP_HASH: membershipHash,
</span><span class="cx"> }
</span><span class="cx"> ).on(self._txn)
</span><ins>+ changed = True
</ins><span class="cx">
</span><span class="cx"> for groupID in oldGAs:
</span><span class="cx"> yield Delete(
</span><span class="lines">@@ -2021,8 +2033,11 @@
</span><span class="cx"> ga.GROUP_ID == groupID
</span><span class="cx"> )
</span><span class="cx"> ).on(self._txn)
</span><ins>+ changed = True
</ins><span class="cx">
</span><ins>+ returnValue(changed)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def validCalendarDataCheck(self, component, inserting):
</span><span class="cx"> """
</span><span class="cx"> Check that the calendar data is valid iCalendar.
</span><span class="lines">@@ -2435,7 +2450,7 @@
</span><span class="cx">
</span><span class="cx"> # group attendees
</span><span class="cx"> if scheduler.state == "organizer":
</span><del>- yield self.reconcileGroupAttendees(component)
</del><ins>+ yield self.reconcileGroupAttendees(component, inserting)
</ins><span class="cx">
</span><span class="cx"> # Set an attribute on this object to indicate that it is valid to check for an event split. We need to do this here so that if a timeout
</span><span class="cx"> # occurs whilst doing implicit processing (most likely because the event is too big) we are able to subsequently detect that it is OK
</span></span></pre>
</div>
</div>
</body>
</html>