[CalendarServer-changes] [6663] CalendarServer/trunk/contrib/performance

[source_changes at macosforge.org]

Revision: 6663
          http://trac.macosforge.org/projects/calendarserver/changeset/6663
Author:   exarkun at twistedmatrix.com
Date:     2010-12-01 07:48:59 -0800 (Wed, 01 Dec 2010)
Log Message:
-----------
Updates to other users of makeEvent: pass the new organizerSequence parameter.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/performance/_event_change.py
    CalendarServer/trunk/contrib/performance/event_delete.py
    CalendarServer/trunk/contrib/performance/event_move.py

Modified: CalendarServer/trunk/contrib/performance/_event_change.py
===================================================================
--- CalendarServer/trunk/contrib/performance/_event_change.py	2010-11-30 20:19:29 UTC (rev 6662)
+++ CalendarServer/trunk/contrib/performance/_event_change.py	2010-12-01 15:48:59 UTC (rev 6663)
@@ -75,7 +75,9 @@
     headers = Headers({"content-type": ["text/calendar"]})
 
     events = [
-        (makeEvent(i, attendeeCount), url % (i,))
+        # The organizerSequence here (1) may need to be a parameter.
+        # See also the makeEvent call below.
+        (makeEvent(i, 1, attendeeCount), url % (i,))
         for i in range(samples)]
 
     for (event, url) in events:
@@ -99,7 +101,8 @@
 
     headers = Headers({"content-type": ["text/calendar"]})
 
-    event = makeEvent(0, attendeeCount)
+    # See the makeEvent call above.
+    event = makeEvent(0, 1, attendeeCount)
 
     yield agent.request('PUT', url, headers, StringProducer(event))
 

Modified: CalendarServer/trunk/contrib/performance/event_delete.py
===================================================================
--- CalendarServer/trunk/contrib/performance/event_delete.py	2010-11-30 20:19:29 UTC (rev 6662)
+++ CalendarServer/trunk/contrib/performance/event_delete.py	2010-12-01 15:48:59 UTC (rev 6663)
@@ -34,7 +34,8 @@
 
 @inlineCallbacks
 def measure(host, port, dtrace, attendeeCount, samples):
-    user = password = "user01"
+    organizerSequence = 1
+    user = password = "user%02d" % (organizerSequence,)
     root = "/"
     principal = "/"
     calendar = "event-deletion-benchmark"
@@ -51,7 +52,8 @@
     yield initialize(agent, host, port, user, password, root, principal, calendar)
 
     # An infinite stream of VEVENTs to PUT to the server.
-    events = ((i, makeEvent(i, attendeeCount)) for i in count(2))
+    events = ((i, makeEvent(i, organizerSequence, attendeeCount))
+              for i in count(2))
 
     # Create enough events to delete
     uri = 'http://%s:%d/calendars/__uids__/%s/%s/foo-%%d.ics' % (

Modified: CalendarServer/trunk/contrib/performance/event_move.py
===================================================================
--- CalendarServer/trunk/contrib/performance/event_move.py	2010-11-30 20:19:29 UTC (rev 6662)
+++ CalendarServer/trunk/contrib/performance/event_move.py	2010-12-01 15:48:59 UTC (rev 6663)
@@ -30,7 +30,8 @@
 
 @inlineCallbacks
 def measure(host, port, dtrace, attendeeCount, samples):
-    user = password = "user01"
+    organizerSequence = 1
+    user = password = "user%02d" % (organizerSequence,)
     root = "/"
     principal = "/"
 
@@ -59,7 +60,8 @@
     # Create the event that will move around
     headers = Headers({"content-type": ["text/calendar"]})
     yield agent.request(
-        'PUT', fooURI, headers, StringProducer(makeEvent(attendeeCount, 1)))
+        'PUT', fooURI, headers,
+        StringProducer(makeEvent(1, organizerSequence, attendeeCount)))
 
     # Move it around sooo much
     source = cycle([fooURI, barURI])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101201/15f42c09/attachment.html>