<!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>[13784] CalendarServer/trunk</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/13784">13784</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 08:53:32 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>White space.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtestprofilespy">CalendarServer/trunk/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingworkpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/profiles.py (13783 => 13784)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2014-07-24 15:17:50 UTC (rev 13783)
+++ CalendarServer/trunk/contrib/performance/loadtest/profiles.py 2014-07-24 15:53:32 UTC (rev 13784)
</span><span class="lines">@@ -216,11 +216,11 @@
</span><span class="cx"> name=u'ATTENDEE',
</span><span class="cx"> value=cuaddr.encode("utf-8"),
</span><span class="cx"> params={
</span><del>- 'CN': record.commonName,
- 'CUTYPE': 'INDIVIDUAL',
- 'PARTSTAT': 'NEEDS-ACTION',
- 'ROLE': 'REQ-PARTICIPANT',
- 'RSVP': 'TRUE',
</del><ins>+ 'CN': record.commonName,
+ 'CUTYPE': 'INDIVIDUAL',
+ 'PARTSTAT': 'NEEDS-ACTION',
+ 'ROLE': 'REQ-PARTICIPANT',
+ 'RSVP': 'TRUE',
</ins><span class="cx"> },
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -368,11 +368,11 @@
</span><span class="cx"> name=u'ATTENDEE',
</span><span class="cx"> value=cuaddr.encode("utf-8"),
</span><span class="cx"> params={
</span><del>- 'CN': record.commonName,
- 'CUTYPE': 'INDIVIDUAL',
- 'PARTSTAT': 'NEEDS-ACTION',
- 'ROLE': 'REQ-PARTICIPANT',
- 'RSVP': 'TRUE',
</del><ins>+ 'CN': record.commonName,
+ 'CUTYPE': 'INDIVIDUAL',
+ 'PARTSTAT': 'NEEDS-ACTION',
+ 'ROLE': 'REQ-PARTICIPANT',
+ 'RSVP': 'TRUE',
</ins><span class="cx"> },
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> u"start" : u"%(user)s - - - - - - - - - - - %(label)8s BEGIN %(lag)s",
</span><span class="cx"> u"end" : u"%(user)s - - - - - - - - - - - %(label)8s END [%(duration)5.2f s]",
</span><span class="cx"> u"failed": u"%(user)s x x x x x x x x x x x %(label)8s FAILED %(reason)s",
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> lagFormat = u'{lag %5.2f ms}'
</span><span class="cx">
</span><span class="lines">@@ -831,12 +831,14 @@
</span><span class="cx"> def report(self, output):
</span><span class="cx"> output.write("\n")
</span><span class="cx"> self.printHeader(output, [
</span><del>- (label, width)
- for (label, width, _ignore_fmt)
- in self._fields])
- self.printData(output,
</del><ins>+ (label, width)
+ for (label, width, _ignore_fmt) in self._fields
+ ])
+ self.printData(
+ output,
</ins><span class="cx"> [fmt for (label, width, fmt) in self._fields],
</span><del>- sorted(self._perOperationTimes.items()))
</del><ins>+ sorted(self._perOperationTimes.items())
+ )
</ins><span class="cx">
</span><span class="cx"> _LATENCY_REASON = "Median %(operation)s scheduling lag greater than %(cutoff)sms"
</span><span class="cx"> _FAILED_REASON = "Greater than %(cutoff).0f%% %(operation)s failed"
</span><span class="lines">@@ -847,12 +849,12 @@
</span><span class="cx"> for operation, lags in self._perOperationLags.iteritems():
</span><span class="cx"> if median(lags) > self._lag_cut_off:
</span><span class="cx"> reasons.append(self._LATENCY_REASON % dict(
</span><del>- operation=operation.upper(), cutoff=self._lag_cut_off * 1000))
</del><ins>+ operation=operation.upper(), cutoff=self._lag_cut_off * 1000))
</ins><span class="cx">
</span><span class="cx"> for operation, times in self._perOperationTimes.iteritems():
</span><span class="cx"> failures = len([success for (success, _ignore_duration) in times if not success])
</span><span class="cx"> if failures * 100.0 / len(times) > self._fail_cut_off:
</span><span class="cx"> reasons.append(self._FAILED_REASON % dict(
</span><del>- operation=operation.upper(), cutoff=self._fail_cut_off))
</del><ins>+ operation=operation.upper(), cutoff=self._fail_cut_off))
</ins><span class="cx">
</span><span class="cx"> return reasons
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13783 => 13784)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-07-24 15:17:50 UTC (rev 13783)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-07-24 15:53:32 UTC (rev 13784)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> values are (possibly empty) lists of parameter values.
</span><span class="cx"> """
</span><span class="cx"> if name is None:
</span><del>- assert value is None
</del><ins>+ assert value is None
</ins><span class="cx"> assert params is None
</span><span class="cx">
</span><span class="cx"> pyobj = kwargs["pycalendar"]
</span><span class="lines">@@ -3227,7 +3227,7 @@
</span><span class="cx">
</span><span class="cx"> timeRange = Period(
</span><span class="cx"> start=dtstart.value(),
</span><del>- end=dtend.value() if dtend is not None else None,
</del><ins>+ end=dtend.value() if dtend is not None else None,
</ins><span class="cx"> duration=duration.value() if duration is not None else None,
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py (13783 => 13784)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py 2014-07-24 15:17:50 UTC (rev 13783)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py 2014-07-24 15:53:32 UTC (rev 13784)
</span><span class="lines">@@ -739,8 +739,10 @@
</span><span class="cx"> rows = (yield Select(
</span><span class="cx"> (srw.WORK_ID,),
</span><span class="cx"> From=srw,
</span><del>- Where=(srw.HOME_RESOURCE_ID == self.homeResourceID).And(
- srw.RESOURCE_ID == self.resourceID),
</del><ins>+ Where=(
+ srw.HOME_RESOURCE_ID == self.homeResourceID).And(
+ srw.RESOURCE_ID == self.resourceID
+ ),
</ins><span class="cx"> ).on(self.transaction))
</span><span class="cx"> if rows:
</span><span class="cx"> log.debug("Schedule refresh for resource-id: {rid} - ignored", rid=self.resourceID)
</span><span class="lines">@@ -876,7 +878,8 @@
</span><span class="cx"> log.debug("ScheduleAutoReplyWork - running for ID: {id}, UID: {uid}", id=self.workID, uid=self.icalendarUid)
</span><span class="cx">
</span><span class="cx"> # Delete all other work items with the same pushID
</span><del>- yield Delete(From=self.table,
</del><ins>+ yield Delete(
+ From=self.table,
</ins><span class="cx"> Where=self.table.RESOURCE_ID == self.resourceID
</span><span class="cx"> ).on(self.transaction)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>