<!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>[13326] CalendarServer/branches/users/sagen/newcua/contrib/performance</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/13326">13326</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 12:03:51 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More urn:x-uid: changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformance_event_createpy">CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksbounded_recurrence_autoacceptpy">CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksevent_autoacceptpy">CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksunbounded_recurrence_autoacceptpy">CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksvfreebusypy">CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksvfreebusy_vary_attendeespy">CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformanceloadtestprofilespy">CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py</a></li>
<li><a href="#CalendarServerbranchesuserssagennewcuacontribperformancetest_event_change_datepy">CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagennewcuacontribperformance_event_createpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/_event_create.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -80,13 +80,13 @@
</span><span class="cx">
</span><span class="cx"> attendee = """\
</span><span class="cx"> ATTENDEE;CN=User %(SEQUENCE)02d;CUTYPE=INDIVIDUAL;EMAIL=user%(SEQUENCE)02d@example.com;PARTSTAT=NE
</span><del>- EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:urn:uuid:user%(SEQUENCE)02d
</del><ins>+ EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:urn:x-uid:user%(SEQUENCE)02d
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> organizer = """\
</span><del>-ORGANIZER;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d@example.com:urn:uuid:user%(SEQUENCE)02d
</del><ins>+ORGANIZER;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d@example.com:urn:x-uid:user%(SEQUENCE)02d
</ins><span class="cx"> ATTENDEE;CN=User %(SEQUENCE)02d;EMAIL=user%(SEQUENCE)02d@example.com;PARTSTAT=ACCEPTE
</span><del>- D:urn:uuid:user%(SEQUENCE)02d
</del><ins>+ D:urn:x-uid:user%(SEQUENCE)02d
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def formatDate(d):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksbounded_recurrence_autoacceptpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/bounded_recurrence_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> from contrib.performance._event_create import (
</span><span class="cx"> makeAttendees, makeVCalendar, formatDate, measure as _measure)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def makeEvent(i, organizerSequence, attendeeCount):
</span><span class="cx"> """
</span><span class="cx"> Create a new half-hour long event that starts soon and recurs
</span><span class="lines">@@ -38,7 +39,7 @@
</span><span class="cx"> attendees = makeAttendees(attendeeCount)
</span><span class="cx"> attendees.append(
</span><span class="cx"> 'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
</span><del>- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
</del><ins>+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
</ins><span class="cx"> return makeVCalendar(
</span><span class="cx"> uuid4(), start, end, rrule, organizerSequence, attendees)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksevent_autoacceptpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/event_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> attendees = makeAttendees(attendeeCount)
</span><span class="cx"> attendees.append(
</span><span class="cx"> 'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
</span><del>- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
</del><ins>+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
</ins><span class="cx"> return makeVCalendar(
</span><span class="cx"> uuid4(),
</span><span class="cx"> base + i * interval,
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksunbounded_recurrence_autoacceptpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/unbounded_recurrence_autoaccept.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> attendees = makeAttendees(attendeeCount)
</span><span class="cx"> attendees.append(
</span><span class="cx"> 'ATTENDEE;CN="Resource 01";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;RSVP=T\n'
</span><del>- ' RUE;SCHEDULE-STATUS="1.2":urn:uuid:resource01\n')
</del><ins>+ ' RUE;SCHEDULE-STATUS="1.2":urn:x-uid:40000000-0000-0000-0000-000000000001\n')
</ins><span class="cx"> return makeVCalendar(
</span><span class="cx"> uuid4(), start, end, "RRULE:FREQ=WEEKLY", organizerSequence, attendees)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksvfreebusypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> X-CALENDARSERVER-MASK-UID:EC75A61B-08A3-44FD-BFBB-2457BBD0D490
</span><span class="cx"> DTSTAMP:20100729T174751Z
</span><span class="cx"> ORGANIZER:mailto:user01@example.com
</span><del>-SUMMARY:Availability for urn:uuid:user02
</del><ins>+SUMMARY:Availability for urn:x-uid:user02
</ins><span class="cx"> END:VFREEBUSY
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def measure(host, port, dtrace, events, samples):
</span><span class="cx"> user = password = "user01"
</span><ins>+ uid = "10000000-0000-0000-0000-000000000001"
</ins><span class="cx"> root = "/"
</span><span class="cx"> principal = "/"
</span><span class="cx"> calendar = "vfreebusy-benchmark"
</span><span class="lines">@@ -150,12 +151,12 @@
</span><span class="cx"> headers = Headers({
</span><span class="cx"> "content-type": ["text/calendar"],
</span><span class="cx"> "originator": ["mailto:%s@example.com" % (user,)],
</span><del>- "recipient": ["urn:uuid:%s, urn:uuid:user02" % (user,)]})
</del><ins>+ "recipient": ["urn:x-uid:%s, urn:x-uid:10000000-0000-0000-0000-000000000002" % (uid,)]})
</ins><span class="cx">
</span><span class="cx"> vfb = VFREEBUSY % {
</span><span class="cx"> "attendees": "".join([
</span><del>- "ATTENDEE:urn:uuid:%s\n" % (user,),
- "ATTENDEE:urn:uuid:user02\n"]),
</del><ins>+ "ATTENDEE:urn:x-uid:%s\n" % (uid,),
+ "ATTENDEE:urn:x-uid:10000000-0000-0000-0000-000000000002\n"]),
</ins><span class="cx"> "start": formatDate(baseTime.replace(hour=0, minute=0)) + 'Z',
</span><span class="cx"> "end": formatDate(
</span><span class="cx"> baseTime.replace(hour=0, minute=0) + timedelta(days=1)) + 'Z'}
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancebenchmarksvfreebusy_vary_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/benchmarks/vfreebusy_vary_attendees.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> from contrib.performance.benchmarks.vfreebusy import VFREEBUSY, formatDate, makeEventNear
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def measure(host, port, dtrace, attendees, samples):
</span><span class="cx"> userNumber = 1
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> for i in [userNumber] + targets:
</span><span class="cx"> targetUser = "user%02d" % (i,)
</span><span class="cx"> for path in ["calendars/users/%s/" % (targetUser,),
</span><del>- "calendars/__uids__/%s/" % (targetUser,)]:
</del><ins>+ "calendars/__uids__/10000000-0000-0000-0000-000000000%03d/" % (i,)]:
</ins><span class="cx"> authinfo.add_password(
</span><span class="cx"> realm="Test Realm",
</span><span class="cx"> uri="http://%s:%d/%s" % (host, port, path),
</span><span class="lines">@@ -75,14 +76,14 @@
</span><span class="cx">
</span><span class="cx"> # And now issue the actual VFREEBUSY request
</span><span class="cx"> method = 'POST'
</span><del>- uri = 'http://%s:%d/calendars/__uids__/%s/outbox/' % (host, port, user)
</del><ins>+ uri = 'http://%s:%d/calendars/__uids__/10000000-0000-0000-0000-000000000001/outbox/' % (host, port)
</ins><span class="cx"> headers = Headers({
</span><span class="cx"> "content-type": ["text/calendar"],
</span><span class="cx"> "originator": ["mailto:%s@example.com" % (user,)],
</span><del>- "recipient": [", ".join(["urn:uuid:user%02d" % (i,) for i in [userNumber] + targets])]})
</del><ins>+ "recipient": [", ".join(["urn:x-uid:10000000-0000-0000-0000-000000000%03d" % (i,) for i in [userNumber] + targets])]})
</ins><span class="cx"> body = StringProducer(VFREEBUSY % {
</span><span class="cx"> "attendees": "".join([
</span><del>- "ATTENDEE:urn:uuid:user%02d\n" % (i,)
</del><ins>+ "ATTENDEE:urn:x-uid:10000000-0000-0000-0000-000000000%03d\n" % (i,)
</ins><span class="cx"> for i in [userNumber] + targets]),
</span><span class="cx"> "start": formatDate(baseTime.replace(hour=0, minute=0)) + 'Z',
</span><span class="cx"> "end": formatDate(
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformanceloadtestprofilespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/loadtest/profiles.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> except IndexError:
</span><span class="cx"> continue
</span><span class="cx"> cuaddr = u'mailto:%s' % (record.email,)
</span><del>- uuid = u'urn:uuid:%s' % (record.uid,)
</del><ins>+ uuid = u'urn:x-uid:%s' % (record.uid,)
</ins><span class="cx"> if cuaddr not in invitees and uuid not in invitees:
</span><span class="cx"> break
</span><span class="cx"> else:
</span><span class="lines">@@ -592,21 +592,21 @@
</span><span class="cx"> A Calendar user who creates new events.
</span><span class="cx"> """
</span><span class="cx"> _eventTemplate = Component.fromString("""\
</span><del>-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.3//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-CREATED:20101018T155431Z
-UID:C98AD237-55AD-4F7D-9009-0D355D835822
-DTEND;TZID=America/New_York:20101021T130000
-TRANSP:OPAQUE
-SUMMARY:Simple event
-DTSTART;TZID=America/New_York:20101021T120000
-DTSTAMP:20101018T155438Z
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR
</del><ins>+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.3//EN
+CALSCALE:GREGORIAN
+BEGIN:VEVENT
+CREATED:20101018T155431Z
+UID:C98AD237-55AD-4F7D-9009-0D355D835822
+DTEND;TZID=America/New_York:20101021T130000
+TRANSP:OPAQUE
+SUMMARY:Simple event
+DTSTART;TZID=America/New_York:20101021T120000
+DTSTAMP:20101018T155438Z
+SEQUENCE:2
+END:VEVENT
+END:VCALENDAR
</ins><span class="cx"> """.replace("\n", "\r\n"))
</span><span class="cx">
</span><span class="cx"> def setParameters(
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagennewcuacontribperformancetest_event_change_datepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py (13325 => 13326)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py 2014-04-18 18:25:17 UTC (rev 13325)
+++ CalendarServer/branches/users/sagen/newcua/contrib/performance/test_event_change_date.py 2014-04-18 19:03:51 UTC (rev 13326)
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx">
</span><span class="cx"> calendarTail = """\
</span><span class="cx"> ATTENDEE;CN=User 02;CUTYPE=INDIVIDUAL;EMAIL=user02@example.com;PARTSTAT=NE
</span><del>- EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:uuid:use
</del><ins>+ EDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:use
</ins><span class="cx"> r02
</span><span class="cx"> CREATED:20100729T193912Z
</span><span class="cx"> DTSTAMP:20100729T195557Z
</span><del>-ORGANIZER;CN=User 03;EMAIL=user03@example.com:urn:uuid:user03
</del><ins>+ORGANIZER;CN=User 03;EMAIL=user03@example.com:urn:x-uid:user03
</ins><span class="cx"> SEQUENCE:1
</span><span class="cx"> SUMMARY:STUFF IS THINGS
</span><span class="cx"> TRANSP:OPAQUE
</span></span></pre>
</div>
</div>
</body>
</html>