<!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>[15332] CalendarServer/trunk/contrib/performance/loadtest/ical.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/15332">15332</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-11-18 13:24:01 -0800 (Wed, 18 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>The sim will skip downloading events on the initial sync of a run, in calendars for which there is no cached record, thereby allowing you to point it at a populated calendar server and yet not download every single event.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (15331 => 15332)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-11-18 21:21:48 UTC (rev 15331)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-11-18 21:24:01 UTC (rev 15332)
</span><span class="lines">@@ -904,12 +904,12 @@
</span><span class="cx"> return calendars, notificationCollection
</span><span class="cx">
</span><span class="cx">
</span><del>- def _updateCalendar(self, calendar, newToken):
</del><ins>+ def _updateCalendar(self, calendar, newToken, fetchEvents=True):
</ins><span class="cx"> """
</span><span class="cx"> Update the local cached data for a calendar in an appropriate manner.
</span><span class="cx"> """
</span><span class="cx"> if self.supportSync:
</span><del>- return self._updateCalendar_SYNC(calendar, newToken)
</del><ins>+ return self._updateCalendar_SYNC(calendar, newToken, fetchEvents=fetchEvents)
</ins><span class="cx"> else:
</span><span class="cx"> return self._updateCalendar_PROPFIND(calendar, newToken)
</span><span class="cx">
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def _updateCalendar_SYNC(self, calendar, newToken):
</del><ins>+ def _updateCalendar_SYNC(self, calendar, newToken, fetchEvents=True):
</ins><span class="cx"> """
</span><span class="cx"> Execute a sync REPORT against a calendar and apply changes to the local cache.
</span><span class="cx"> The new token from the changed collection is passed in and must be applied to
</span><span class="lines">@@ -976,36 +976,37 @@
</span><span class="cx">
</span><span class="cx"> result, others = result
</span><span class="cx">
</span><del>- changed = []
- for responseHref in result:
- if responseHref == calendar.url:
- continue
</del><ins>+ if fetchEvents:
+ changed = []
+ for responseHref in result:
+ if responseHref == calendar.url:
+ continue
</ins><span class="cx">
</span><del>- try:
- etag = result[responseHref].getTextProperties()[davxml.getetag]
- except KeyError:
- # XXX Ignore things with no etag? Seems to be dropbox.
- continue
</del><ins>+ try:
+ etag = result[responseHref].getTextProperties()[davxml.getetag]
+ except KeyError:
+ # XXX Ignore things with no etag? Seems to be dropbox.
+ continue
</ins><span class="cx">
</span><del>- # Differentiate a remove vs new/update result
- if result[responseHref].getStatus() / 100 == 2:
- if responseHref not in self._events:
- self._setEvent(responseHref, Event(self.serializeLocation(), responseHref, None))
</del><ins>+ # Differentiate a remove vs new/update result
+ if result[responseHref].getStatus() / 100 == 2:
+ if responseHref not in self._events:
+ self._setEvent(responseHref, Event(self.serializeLocation(), responseHref, None))
</ins><span class="cx">
</span><del>- event = self._events[responseHref]
- if event.etag != etag:
- changed.append(responseHref)
- elif result[responseHref].getStatus() == 404:
- self._removeEvent(responseHref)
</del><ins>+ event = self._events[responseHref]
+ if event.etag != etag:
+ changed.append(responseHref)
+ elif result[responseHref].getStatus() == 404:
+ self._removeEvent(responseHref)
</ins><span class="cx">
</span><del>- yield self._updateChangedEvents(calendar, changed)
</del><ins>+ yield self._updateChangedEvents(calendar, changed)
</ins><span class="cx">
</span><del>- # Handle removals only when doing an initial sync
- if fullSync:
- # Detect removed items and purge them
- remove_hrefs = old_hrefs - set(changed)
- for href in remove_hrefs:
- self._removeEvent(href)
</del><ins>+ # Handle removals only when doing an initial sync
+ if fullSync:
+ # Detect removed items and purge them
+ remove_hrefs = old_hrefs - set(changed)
+ for href in remove_hrefs:
+ self._removeEvent(href)
</ins><span class="cx">
</span><span class="cx"> # Now update calendar to the new token taken from the report
</span><span class="cx"> for node in others:
</span><span class="lines">@@ -1269,7 +1270,14 @@
</span><span class="cx"> # Calendar seen for the first time - reload it
</span><span class="cx"> self._calendars[cal.url] = cal
</span><span class="cx"> cal.changeToken = ""
</span><del>- yield self._updateCalendar(self._calendars[cal.url], newToken)
</del><ins>+ # If this is the first time this run and we have no cached copy
+ # of this calendar, do an update but don't fetch the events.
+ # We'll only take notice of ongoing activity and not bother
+ # with existing events.
+ yield self._updateCalendar(
+ self._calendars[cal.url], newToken,
+ fetchEvents=(not firstTime)
+ )
</ins><span class="cx"> elif self._calendars[cal.url].changeToken != newToken:
</span><span class="cx"> # Calendar changed - reload it
</span><span class="cx"> yield self._updateCalendar(self._calendars[cal.url], newToken)
</span></span></pre>
</div>
</div>
</body>
</html>