<!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>[15749] CalendarServer/branches/users/cdaboo/better-next-job</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/15749">15749</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-07 09:14:45 -0700 (Thu, 07 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge from trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobbin_buildsh">CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobbintestpodssim">CalendarServer/branches/users/cdaboo/better-next-job/bin/testpodssim</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobbintestsim">CalendarServer/branches/users/cdaboo/better-next-job/bin/testsim</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobcalendarservertapcaldavpy">CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobcalendarservertaputilpy">CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobconfcaldavdappleplist">CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-apple.plist</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobconfcaldavdstdconfigplist">CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-stdconfig.plist</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjoblibpatchesTwistedsecuretransportpatch">CalendarServer/branches/users/cdaboo/better-next-job/lib-patches/Twisted/securetransport.patch</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobrequirementscstxt">CalendarServer/branches/users/cdaboo/better-next-job/requirements-cs.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobrequirementstwisteddefaulttxt">CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-default.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobrequirementstwistedosxtxt">CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-osx.txt</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobsetuppy">CalendarServer/branches/users/cdaboo/better-next-job/setup.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtwistedcaldavdumpconfigpy">CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/dumpconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtwistedcaldavstdconfigpy">CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavbasedatastoredbapiclientpy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresqlpy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_dumppy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_dump.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_tablespy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretesttest_sql_dumppy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_sql_dump.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretesttest_trashpy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_trash.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretestutilpy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/util.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoreupgradesqltesttest_upgradepy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/test/test_upgrade.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoreupgradesqlupgradepy">CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/upgrade.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobcontribperformanceloadteststandardconfigsacceleratedactivityclientsplist">CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist</a></li>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjobcontribperformanceloadteststandardconfigsacceleratedactivityconfigplist">CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboobetternextjob">CalendarServer/branches/users/cdaboo/better-next-job/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboobetternextjob"></a>
<div class="propset"><h4>Property changes: CalendarServer/branches/users/cdaboo/better-next-job</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/newlog:15301
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/request-socket:14748-14767
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan:14185-14269
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
</span><span class="cx">/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">/CalendarServer/trunk:15717-15725
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/newlog:15301
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pod2pod-migration:14338-14520
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/cdaboo/update-packages:15273-15284
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/request-socket:14748-14767
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan:14185-14269
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-2:14270-14324
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-3:14325-14450
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-4:14451-14471
</span><span class="cx">/CalendarServer/branches/users/sagen/trashcan-5:14471-14555
</span><span class="cx">/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx">/CalendarServer/trunk:15717-15725,15729-15747
</span><a id="CalendarServerbranchesuserscdaboobetternextjobbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/_build.sh 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -602,7 +602,7 @@
</span><span class="cx"> if command -v postgres > /dev/null; then
</span><span class="cx"> using_system "Postgres";
</span><span class="cx"> else
</span><del>- local v="9.3.10";
</del><ins>+ local v="9.5.3";
</ins><span class="cx"> local n="postgresql";
</span><span class="cx"> local p="${n}-${v}";
</span><span class="cx">
</span><span class="lines">@@ -612,10 +612,10 @@
</span><span class="cx"> local enable_dtrace="";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>- c_dependency -m "ec2365548d08f69c8023eddd4f2d1a28" \
</del><ins>+ c_dependency -m "3f0c388566c688c82b01a0edf1e6b7a0" \
</ins><span class="cx"> "PostgreSQL" "${p}" \
</span><span class="cx"> "http://ftp.postgresql.org/pub/source/v${v}/${p}.tar.bz2" \
</span><del>- --with-python ${enable_dtrace};
</del><ins>+ ${enable_dtrace};
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -678,6 +678,12 @@
</span><span class="cx"> --no-setuptools \
</span><span class="cx"> ${virtualenv_opts} \
</span><span class="cx"> "${py_virtualenv}";
</span><ins>+ case "$(uname -s)" in
+ Darwin)
+ echo "macOS virtualenv codesign fix."
+ cp "/usr/bin/python" "${py_bindir}/python";
+ ;;
+ esac;
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> cd "${wd}";
</span><span class="lines">@@ -711,9 +717,11 @@
</span><span class="cx">
</span><span class="cx"> ruler "Patching Python requirements";
</span><span class="cx"> echo "";
</span><del>- if [ ! -e "${py_virtualenv}/lib/python2.7/site-packages/twisted/.patch_applied" ]; then
</del><ins>+ twisted_version=$("${python}" -c 'from twisted._version import version; print version.base()');
+ if [ ! -e "${py_virtualenv}/lib/python2.7/site-packages/twisted/.patch_applied.${twisted_version}" ]; then
</ins><span class="cx"> apply_patches "Twisted" "${py_virtualenv}/lib/python2.7/site-packages"
</span><del>- touch "${py_virtualenv}/lib/python2.7/site-packages/twisted/.patch_applied";
</del><ins>+ find "${py_virtualenv}/lib/python2.7/site-packages/twisted" -type f -name '.patch_applied*' -print0 | xargs -0 rm -f;
+ touch "${py_virtualenv}/lib/python2.7/site-packages/twisted/.patch_applied.${twisted_version}";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> echo "";
</span><span class="lines">@@ -735,37 +743,15 @@
</span><span class="cx">
</span><span class="cx"> bootstrap_virtualenv () {
</span><span class="cx"> mkdir -p "${py_ve_tools}";
</span><del>- mkdir -p "${py_ve_tools}/lib";
- mkdir -p "${py_ve_tools}/junk";
</del><ins>+ export PYTHONUSERBASE="${py_ve_tools}"
</ins><span class="cx">
</span><span class="cx"> for pkg in \
</span><del>- setuptools-18.5 \
- pip-7.1.2 \
- virtualenv-13.1.2 \
</del><ins>+ setuptools==18.5 \
+ pip==8.1.2 \
+ virtualenv==15.0.2 \
</ins><span class="cx"> ; do
</span><del>- local name="${pkg%-*}";
- local version="${pkg#*-}";
- local first="$(echo "${name}" | sed 's|^\(.\).*$|\1|')";
- local url="https://pypi.python.org/packages/source/${first}/${name}/${pkg}.tar.gz";
-
- ruler "Downloading ${pkg}";
-
- local tmp="$(mktemp -d -t ccsXXXXX)";
-
- curl -L "${url}" | tar -C "${tmp}" -xvzf -;
-
- cd "${tmp}/$(basename "${pkg}")";
- PYTHONPATH="${py_ve_tools}/lib" \
- "${bootstrap_python}" setup.py install \
- --install-base="${py_ve_tools}" \
- --install-lib="${py_ve_tools}/lib" \
- --install-headers="${py_ve_tools}/junk" \
- --install-scripts="${py_ve_tools}/junk" \
- --install-data="${py_ve_tools}/junk" \
- ; \
- cd "${wd}";
-
- rm -rf "${tmp}";
</del><ins>+ ruler "Installing ${pkg}";
+ "${bootstrap_python}" -m pip install -I --user "${pkg}";
</ins><span class="cx"> done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -776,7 +762,7 @@
</span><span class="cx"> "${python}" -m pip install \
</span><span class="cx"> --disable-pip-version-check \
</span><span class="cx"> --download="${dev_home}/pip_downloads" \
</span><del>- --pre --allow-all-external \
</del><ins>+ --pre \
</ins><span class="cx"> --no-cache-dir \
</span><span class="cx"> --log-file="${dev_home}/pip.log" \
</span><span class="cx"> "$@";
</span><span class="lines">@@ -786,7 +772,7 @@
</span><span class="cx"> pip_install_from_cache () {
</span><span class="cx"> "${python}" -m pip install \
</span><span class="cx"> --disable-pip-version-check \
</span><del>- --pre --allow-all-external \
</del><ins>+ --pre \
</ins><span class="cx"> --no-index \
</span><span class="cx"> --no-cache-dir \
</span><span class="cx"> --find-links="${dev_patches}" \
</span><span class="lines">@@ -799,7 +785,7 @@
</span><span class="cx"> pip_download_and_install () {
</span><span class="cx"> "${python}" -m pip install \
</span><span class="cx"> --disable-pip-version-check \
</span><del>- --pre --allow-all-external \
</del><ins>+ --pre \
</ins><span class="cx"> --no-cache-dir \
</span><span class="cx"> --find-links="${dev_patches}" \
</span><span class="cx"> --log-file="${dev_home}/pip.log" \
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobbintestpodssim"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/testpodssim (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/bin/testpodssim 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/testpodssim 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> verbose="";
</span><del>- config="${wd}/contrib/performance/loadtest/config.plist";
- clients="${wd}/contrib/performance/loadtest/clients.plist";
</del><ins>+ config="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist";
+ clients="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist";
</ins><span class="cx"> runtime="--runtime 300";
</span><span class="cx"> logfile="";
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobbintestsim"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/bin/testsim (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/bin/testsim 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/bin/testsim 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> verbose="";
</span><del>- config="${wd}/contrib/performance/loadtest/config.plist";
- clients="${wd}/contrib/performance/loadtest/clients.plist";
</del><ins>+ config="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist";
+ clients="${wd}/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist";
</ins><span class="cx"> runtime="--runtime 300";
</span><span class="cx"> logfile="";
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/caldav.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/caldav.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/caldav.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -66,8 +66,7 @@
</span><span class="cx"> from twext.internet.ssl import ChainingOpenSSLContextFactory
</span><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><del>-from twext.enterprise.ienterprise import ORACLE_DIALECT
-from twext.enterprise.ienterprise import POSTGRES_DIALECT
</del><ins>+from twext.enterprise.ienterprise import POSTGRES_DIALECT, ORACLE_DIALECT, DatabaseType
</ins><span class="cx"> from twext.enterprise.jobs.queue import NonPerformingQueuer
</span><span class="cx"> from twext.enterprise.jobs.queue import ControllerQueue
</span><span class="cx"> from twext.enterprise.jobs.queue import WorkerFactory as QueueWorkerFactory
</span><span class="lines">@@ -1565,7 +1564,7 @@
</span><span class="cx"> @rtype: L{IService}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def createSubServiceFactory(dbtype):
</del><ins>+ def createSubServiceFactory(dbtype, dbfeatures=()):
</ins><span class="cx"> if dbtype == "":
</span><span class="cx"> dialect = POSTGRES_DIALECT
</span><span class="cx"> paramstyle = "pyformat"
</span><span class="lines">@@ -1579,8 +1578,8 @@
</span><span class="cx"> def subServiceFactory(connectionFactory, storageService):
</span><span class="cx"> ms = MultiService()
</span><span class="cx"> cp = ConnectionPool(
</span><del>- connectionFactory, dialect=dialect,
- paramstyle=paramstyle,
</del><ins>+ connectionFactory,
+ dbtype=DatabaseType(dialect, paramstyle, dbfeatures),
</ins><span class="cx"> maxConnections=config.MaxDBConnectionsPerPool
</span><span class="cx"> )
</span><span class="cx"> cp.setServiceParent(ms)
</span><span class="lines">@@ -1680,13 +1679,13 @@
</span><span class="cx"> # to it.
</span><span class="cx"> pgserv = pgServiceFromConfig(
</span><span class="cx"> config,
</span><del>- createSubServiceFactory(""),
</del><ins>+ createSubServiceFactory("", config.DBFeatures),
</ins><span class="cx"> uid=overrideUID, gid=overrideGID
</span><span class="cx"> )
</span><span class="cx"> return pgserv
</span><span class="cx"> else:
</span><span class="cx"> # Connect to a database that is already running.
</span><del>- return createSubServiceFactory(config.DBType)(
</del><ins>+ return createSubServiceFactory(config.DBType, config.DBFeatures)(
</ins><span class="cx"> DBAPIConnector.connectorFor(config.DBType, **config.DatabaseConnection).connect, None
</span><span class="cx"> )
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/util.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/util.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/calendarserver/tap/util.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -44,8 +44,7 @@
</span><span class="cx">
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool, ConnectionPoolConnection
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPoolClient
</span><del>-from twext.enterprise.ienterprise import ORACLE_DIALECT
-from twext.enterprise.ienterprise import POSTGRES_DIALECT
</del><ins>+from twext.enterprise.ienterprise import POSTGRES_DIALECT, ORACLE_DIALECT, DatabaseType
</ins><span class="cx"> from twext.internet.ssl import ChainingOpenSSLContextFactory
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="lines">@@ -179,14 +178,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def transactionFactoryFromFD(dbampfd, dialect, paramstyle):
</del><ins>+def transactionFactoryFromFD(dbampfd, dbtype):
</ins><span class="cx"> """
</span><span class="cx"> Create a transaction factory from an inherited file descriptor, such as one
</span><span class="cx"> created by L{ConnectionDispenser}.
</span><span class="cx"> """
</span><span class="cx"> skt = fromfd(dbampfd, AF_UNIX, SOCK_STREAM)
</span><span class="cx"> os.close(dbampfd)
</span><del>- protocol = ConnectionPoolClient(dialect=dialect, paramstyle=paramstyle)
</del><ins>+ protocol = ConnectionPoolClient(dbtype=dbtype)
</ins><span class="cx"> transport = ConnectionWithPeer(skt, protocol)
</span><span class="cx"> protocol.makeConnection(transport)
</span><span class="cx"> transport.startReading()
</span><span class="lines">@@ -830,7 +829,7 @@
</span><span class="cx"> pool = None
</span><span class="cx"> if config.DBAMPFD:
</span><span class="cx"> txnFactory = transactionFactoryFromFD(
</span><del>- int(config.DBAMPFD), dialect, paramstyle
</del><ins>+ int(config.DBAMPFD), DatabaseType(dialect, paramstyle, config.DBFeatures)
</ins><span class="cx"> )
</span><span class="cx"> elif not config.UseDatabase:
</span><span class="cx"> txnFactory = None
</span><span class="lines">@@ -843,8 +842,7 @@
</span><span class="cx"> else:
</span><span class="cx"> connectionFactory = DBAPIConnector.connectorFor(config.DBType, **config.DatabaseConnection).connect
</span><span class="cx">
</span><del>- pool = ConnectionPool(connectionFactory, dialect=dialect,
- paramstyle=paramstyle,
</del><ins>+ pool = ConnectionPool(connectionFactory, dbtype=DatabaseType(dialect, paramstyle, config.DBFeatures),
</ins><span class="cx"> maxConnections=config.MaxDBConnectionsPerPool)
</span><span class="cx"> txnFactory = pool.connection
</span><span class="cx"> else:
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobconfcaldavdappleplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-apple.plist (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-apple.plist 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-apple.plist 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -108,6 +108,11 @@
</span><span class="cx"> <!-- Database connection -->
</span><span class="cx"> <key>DBType</key>
</span><span class="cx"> <string></string>
</span><ins>+
+ <!-- No features - when macOS supports postgres 9.5 and up change
+ this to include 'skip-locked'. -->
+ <key>DBFeatures</key>
+ <array></array>
</ins><span class="cx">
</span><span class="cx"> <key>Postgres</key>
</span><span class="cx"> <dict>
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobconfcaldavdstdconfigplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-stdconfig.plist (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-stdconfig.plist 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/conf/caldavd-stdconfig.plist 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -118,35 +118,43 @@
</span><span class="cx"> <array>
</span><span class="cx"> </array>
</span><span class="cx">
</span><ins>+ <!-- Use a 'meta' FD, i.e. an FD to transmit other FDs to slave processes. -->
+ <key>UseMetaFD</key>
+ <true/>
+
</ins><span class="cx"> <!-- Inherited file descriptor to call recvmsg() on to receive sockets (none =
</span><span class="cx"> don't inherit) -->
</span><span class="cx"> <key>MetaFD</key>
</span><span class="cx"> <integer>0</integer>
</span><span class="cx">
</span><del>- <!-- Use a 'meta' FD, i.e. an FD to transmit other FDs to slave processes. -->
- <key>UseMetaFD</key>
- <true/>
</del><ins>+ <!-- Database configuration information.
</ins><span class="cx">
</span><del>- <!-- True: database; False: files -->
</del><ins>+ Defines what kind of database to use: file (deprecated) or SQL. File-based
+ DB is only supported for migration purposes - it cannot be used for a real
+ service.
+
+ For an SQL-based DB, configuration of connection parameters and various
+ timeouts is provided. -->
+
+ <!-- True: database; False: files (deprecated) -->
</ins><span class="cx"> <key>UseDatabase</key>
</span><span class="cx"> <true/>
</span><span class="cx">
</span><del>- <!-- Timeout transactions that take longer than the specified number of
- seconds. Zero means no timeouts. 5 minute default. -->
- <key>TransactionTimeoutSeconds</key>
- <integer>300</integer>
-
- <!-- When a transactions times out tell HTTP clients clients to retry after
- this amount of time -->
- <key>TransactionHTTPRetrySeconds</key>
- <integer>300</integer>
-
- <!-- 2 possible values: empty, meaning 'spawn postgres yourself', or
- 'postgres', meaning 'connect to a postgres database as specified by the
- 'DSN' configuration key. Will support more values in the future. -->
</del><ins>+ <!-- Possible values: empty, meaning 'spawn postgres yourself', or 'postgres'
+ or 'oracle', meaning 'connect to a postgres or Oracle database as
+ specified by the 'DSN' configuration key. -->
</ins><span class="cx"> <key>DBType</key>
</span><span class="cx"> <string></string>
</span><span class="cx">
</span><ins>+ <!-- Features supported by the database
+
+ 'skip-locked': SKIP LOCKED available with SELECT (remove if using postgres
+ &lt; v9.5) -->
+ <key>DBFeatures</key>
+ <array>
+ <string>skip-locked</string>
+ </array>
+
</ins><span class="cx"> <!-- The username to use when DBType is empty -->
</span><span class="cx"> <key>SpawnedDBUser</key>
</span><span class="cx"> <string>caldav</string>
</span><span class="lines">@@ -175,17 +183,17 @@
</span><span class="cx"> <false/>
</span><span class="cx"> </dict>
</span><span class="cx">
</span><ins>+ <!-- Use a shared database connection pool in the master process, rather than
+ having each client make its connections directly. -->
+ <key>SharedConnectionPool</key>
+ <false/>
+
</ins><span class="cx"> <!-- Internally used by database to tell slave processes to inherit a file
</span><span class="cx"> descriptor and use it as an AMP connection over a UNIX socket; see
</span><span class="cx"> twext.enterprise.adbapi2.ConnectionPoolConnection -->
</span><span class="cx"> <key>DBAMPFD</key>
</span><span class="cx"> <integer>0</integer>
</span><span class="cx">
</span><del>- <!-- Use a shared database connection pool in the master process, rather than
- having each client make its connections directly. -->
- <key>SharedConnectionPool</key>
- <false/>
-
</del><span class="cx"> <!-- Set to True to prevent the server or utility tools from running if the
</span><span class="cx"> database needs a schema upgrade. -->
</span><span class="cx"> <key>FailIfUpgradeNeeded</key>
</span><span class="lines">@@ -203,6 +211,16 @@
</span><span class="cx"> <key>UpgradeHomePrefix</key>
</span><span class="cx"> <string></string>
</span><span class="cx">
</span><ins>+ <!-- Timeout transactions that take longer than the specified number of
+ seconds. Zero means no timeouts. 5 minute default. -->
+ <key>TransactionTimeoutSeconds</key>
+ <integer>300</integer>
+
+ <!-- When a transactions times out tell HTTP clients clients to retry after
+ this amount of time -->
+ <key>TransactionHTTPRetrySeconds</key>
+ <integer>300</integer>
+
</ins><span class="cx"> <!-- Work queue configuration information -->
</span><span class="cx">
</span><span class="cx"> <key>WorkQueue</key>
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobcontribperformanceloadteststandardconfigsacceleratedactivityclientsplistfromrev15745CalendarServertrunkcontribperformanceloadteststandardconfigsacceleratedactivityclientsplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist (from rev 15745, CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist) (0 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist (rev 0)
+++ CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-clients.plist 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -0,0 +1,835 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2016 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <!-- Define the kinds of software and user behavior the load simulation
+ will simulate. -->
+ <key>clients</key>
+
+ <!-- Have as many different kinds of software and user behavior configurations
+ as you want. Each is a dict -->
+ <array>
+
+ <dict>
+
+ <!-- Here is a OS X client simulator. -->
+ <key>software</key>
+ <string>contrib.performance.loadtest.ical.OS_X_10_11</string>
+
+ <!-- Arguments to use to initialize the OS_X_10_11 instance. -->
+ <key>params</key>
+ <dict>
+ <!-- Name that appears in logs. -->
+ <key>title</key>
+ <string>main</string>
+
+ <!-- OS_X_10_11 can poll the calendar home at some interval. This is
+ in seconds. -->
+ <key>calendarHomePollInterval</key>
+ <integer>30</integer>
+
+ <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
+ about calendar home changes instead of polling for them periodically. If
+ this option is true, then look for the server advertisement for xmpp push
+ and use it if possible. Still fall back to polling if there is no xmpp push
+ advertised. -->
+ <key>supportPush</key>
+ <true/>
+
+ <key>supportAmpPush</key>
+ <true/>
+
+ <key>unauthenticatedPercentage</key>
+ <integer>40</integer>
+
+ </dict>
+
+ <!-- The profiles define certain types of user behavior on top of the
+ client software being simulated. -->
+ <key>profiles</key>
+ <array>
+
+ <!-- First an event-creating profile, which will periodically create
+ new events at a random time on a random calendar. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.Eventer</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to create a new event. -->
+ <key>interval</key>
+ <integer>120</integer>
+
+ <!-- Define how start times (DTSTART) for the randomly generated events
+ will be selected. This is an example of a "Distribution" parameter. The value
+ for most "Distribution" parameters are interchangeable and extensible. -->
+ <key>eventStartDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. It produces timestamps
+ in the near future, limited to certain days of the week and certain hours
+ of the day. -->
+ <key>type</key>
+ <string>contrib.performance.stats.WorkDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- These are the days of the week the distribution will use. -->
+ <key>daysOfWeek</key>
+ <array>
+ <string>mon</string>
+ <string>tue</string>
+ <string>wed</string>
+ <string>thu</string>
+ <string>fri</string>
+ </array>
+
+ <!-- The earliest hour of a day at which an event might be scheduled. -->
+ <key>beginHour</key>
+ <integer>8</integer>
+
+ <!-- And the latest hour of a day (at which an event will be scheduled
+ to begin!). -->
+ <key>endHour</key>
+ <integer>16</integer>
+
+ <!-- The timezone in which the event is scheduled. (XXX Does this
+ really work right?) -->
+ <key>tzname</key>
+ <string>America/Los_Angeles</string>
+ </dict>
+ </dict>
+
+ <!-- Define how recurrences are created. -->
+ <key>recurrenceDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. We have a fixed set of
+ RRULEs defined for this distribution and pick each based on a
+ weight. -->
+ <key>type</key>
+ <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- False to disable RRULEs -->
+ <key>allowRecurrence</key>
+ <true/>
+
+ <!-- These are the weights for the specific set of RRULEs. -->
+ <key>weights</key>
+ <dict>
+ <!-- Half of all events will be non-recurring -->
+ <key>none</key>
+ <integer>50</integer>
+
+ <!-- Daily and weekly are pretty common -->
+ <key>daily</key>
+ <integer>10</integer>
+ <key>weekly</key>
+ <integer>20</integer>
+
+ <!-- Monthly, yearly, daily & weekly limit not so common -->
+ <key>monthly</key>
+ <integer>2</integer>
+ <key>yearly</key>
+ <integer>1</integer>
+ <key>dailylimit</key>
+ <integer>2</integer>
+ <key>weeklylimit</key>
+ <integer>5</integer>
+
+ <!-- Work days pretty common -->
+ <key>workdays</key>
+ <integer>10</integer>
+ </dict>
+ </dict>
+ </dict>
+
+ <!-- Percentage of time to attach a file -->
+ <key>fileAttachPercentage</key>
+ <integer>1</integer>
+
+ <!-- Define the attachment size distribution. -->
+ <key>fileSizeDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.NormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mu gives the mean of the normal distribution (in bytes). -->
+ <key>mu</key>
+ <integer>500000</integer>
+
+ <!-- and sigma gives its standard deviation. -->
+ <key>sigma</key>
+ <integer>100000</integer>
+ </dict>
+ </dict>
+
+ </dict>
+ </dict>
+
+ <!-- This profile will create a new event, and then periodically update the ACKNOWLEDGED property. -->
+
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.AlarmAcknowledger</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <false/>
+
+ <!-- Define how often to check (in seconds) whether it's
+ time to do an alarm acknowledgement -->
+ <key>interval</key>
+ <integer>15</integer>
+
+ <!-- Acknowledgements will only actually occur at one of these
+ minutes past the hour: -->
+ <key>pastTheHour</key>
+ <array>
+ <integer>0</integer>
+ <integer>15</integer>
+ <integer>30</integer>
+ <integer>45</integer>
+ </array>
+
+ <!-- Define how start times (DTSTART) for the randomly generated events
+ will be selected. This is an example of a "Distribution" parameter. The value
+ for most "Distribution" parameters are interchangeable and extensible. -->
+ <key>eventStartDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. It produces timestamps
+ in the near future, limited to certain days of the week and certain hours
+ of the day. -->
+ <key>type</key>
+ <string>contrib.performance.stats.WorkDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- These are the days of the week the distribution will use. -->
+ <key>daysOfWeek</key>
+ <array>
+ <string>mon</string>
+ <string>tue</string>
+ <string>wed</string>
+ <string>thu</string>
+ <string>fri</string>
+ </array>
+
+ <!-- The earliest hour of a day at which an event might be scheduled. -->
+ <key>beginHour</key>
+ <integer>8</integer>
+
+ <!-- And the latest hour of a day (at which an event will be scheduled
+ to begin!). -->
+ <key>endHour</key>
+ <integer>16</integer>
+
+ <!-- The timezone in which the event is scheduled. (XXX Does this
+ really work right?) -->
+ <key>tzname</key>
+ <string>America/Los_Angeles</string>
+ </dict>
+ </dict>
+
+ <!-- Define how recurrences are created. -->
+ <key>recurrenceDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. We have a fixed set of
+ RRULEs defined for this distribution and pick each based on a
+ weight. -->
+ <key>type</key>
+ <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- False to disable RRULEs -->
+ <key>allowRecurrence</key>
+ <true/>
+
+ <!-- These are the weights for the specific set of RRULEs. -->
+ <key>weights</key>
+ <dict>
+ <!-- Half of all events will be non-recurring -->
+ <key>none</key>
+ <integer>50</integer>
+
+ <!-- Daily and weekly are pretty common -->
+ <key>daily</key>
+ <integer>25</integer>
+ <key>weekly</key>
+ <integer>25</integer>
+
+ <!-- Monthly, yearly, daily & weekly limit not so common -->
+ <key>monthly</key>
+ <integer>0</integer>
+ <key>yearly</key>
+ <integer>0</integer>
+ <key>dailylimit</key>
+ <integer>0</integer>
+ <key>weeklylimit</key>
+ <integer>0</integer>
+
+ <!-- Work days pretty common -->
+ <key>workdays</key>
+ <integer>0</integer>
+ </dict>
+ </dict>
+ </dict>
+ </dict>
+ </dict>
+
+ <!-- Picks a random event and changes the title -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.TitleChanger</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to create a new event. -->
+ <key>interval</key>
+ <integer>120</integer>
+
+ </dict>
+ </dict>
+
+ <!-- Picks a random event and changes the description -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.DescriptionChanger</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to create a new event. -->
+ <key>interval</key>
+ <integer>120</integer>
+
+ <!-- Define the description length distribution. -->
+ <key>descriptionLengthDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.LogNormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mode - peak-->
+ <key>mode</key>
+ <integer>450</integer>
+ <!-- mean - average-->
+ <key>median</key>
+ <integer>650</integer>
+ <!-- maximum -->
+ <key>maximum</key>
+ <real>1000000</real>
+ </dict>
+ </dict>
+
+ </dict>
+ </dict>
+
+
+ <!-- Removes events from calendars exceeding a threshold -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.EventCountLimiter</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will check
+ for too-large collections. -->
+ <key>interval</key>
+ <integer>60</integer>
+
+ <!-- The upper bound. -->
+ <key>eventCountLimit</key>
+ <integer>100</integer>
+
+ </dict>
+ </dict>
+
+
+ <!-- Shares calendars -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.CalendarSharer</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will share calendars. -->
+ <key>interval</key>
+ <integer>300</integer>
+
+ <!-- Only share a collection with up to this many sharees -->
+ <key>maxSharees</key>
+ <integer>3</integer>
+
+ </dict>
+ </dict>
+
+ <!-- This profile invites some number of new attendees to new events. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.Inviter</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the frequency at which new invitations will be sent out. -->
+ <key>sendInvitationDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.NormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mu gives the mean of the normal distribution (in seconds). -->
+ <key>mu</key>
+ <integer>120</integer>
+
+ <!-- and sigma gives its standard deviation. -->
+ <key>sigma</key>
+ <integer>5</integer>
+ </dict>
+ </dict>
+
+ <!-- Define the distribution of who will be invited to an event.
+
+ When inviteeClumping is turned on each invitee is based on a sample of
+ users "close to" the organizer based on account index. If the clumping
+ is too "tight" for the requested number of attendees, then invites for
+ those larger numbers will simply fail (the sim will report that situation).
+
+ When inviteeClumping is off invitees will be sampled across an entire
+ range of account indexes. In this case the distribution ought to be a
+ UniformIntegerDistribution with min=0 and max set to the number of accounts.
+ -->
+ <key>inviteeDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.UniformIntegerDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- The minimum value (inclusive) of the uniform distribution. -->
+ <key>min</key>
+ <integer>0</integer>
+ <!-- The maximum value (exclusive) of the uniform distribution. -->
+ <key>max</key>
+ <integer>99</integer>
+ </dict>
+ </dict>
+
+ <key>inviteeClumping</key>
+ <true/>
+
+ <!-- Define the distribution of how many attendees will be invited to an event.
+
+ LogNormal is the best fit to observed data.
+
+
+ For LogNormal "mode" is the peak, "mean" is the mean value. For invites,
+ mode should typically be 1, and mean whatever matches the user behavior.
+ Our typical mean is 6.
+ -->
+ <key>inviteeCountDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.LogNormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mode - peak-->
+ <key>mode</key>
+ <integer>6</integer>
+ <!-- mean - average-->
+ <key>median</key>
+ <integer>8</integer>
+ <!-- maximum -->
+ <key>maximum</key>
+ <real>60</real>
+ </dict>
+ </dict>
+
+ <!-- Percentage of time to do a lookup for invitee -->
+ <key>inviteeLookupPercentage</key>
+ <integer>50</integer>
+
+ <!-- Define how start times (DTSTART) for the randomly generated events
+ will be selected. This is an example of a "Distribution" parameter. The value
+ for most "Distribution" parameters are interchangeable and extensible. -->
+ <key>eventStartDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. It produces timestamps
+ in the near future, limited to certain days of the week and certain hours
+ of the day. -->
+ <key>type</key>
+ <string>contrib.performance.stats.WorkDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- These are the days of the week the distribution will use. -->
+ <key>daysOfWeek</key>
+ <array>
+ <string>mon</string>
+ <string>tue</string>
+ <string>wed</string>
+ <string>thu</string>
+ <string>fri</string>
+ </array>
+
+ <!-- The earliest hour of a day at which an event might be scheduled. -->
+ <key>beginHour</key>
+ <integer>8</integer>
+
+ <!-- And the latest hour of a day (at which an event will be scheduled
+ to begin!). -->
+ <key>endHour</key>
+ <integer>16</integer>
+
+ <!-- The timezone in which the event is scheduled. (XXX Does this
+ really work right?) -->
+ <key>tzname</key>
+ <string>America/Los_Angeles</string>
+ </dict>
+ </dict>
+
+ <!-- Define how recurrences are created. -->
+ <key>recurrenceDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. We have a fixed set of
+ RRULEs defined for this distribution and pick each based on a
+ weight. -->
+ <key>type</key>
+ <string>contrib.performance.stats.RecurrenceDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- False to disable RRULEs -->
+ <key>allowRecurrence</key>
+ <true/>
+
+ <!-- These are the weights for the specific set of RRULEs. -->
+ <key>weights</key>
+ <dict>
+ <!-- Half of all events will be non-recurring -->
+ <key>none</key>
+ <integer>50</integer>
+
+ <!-- Daily and weekly are pretty common -->
+ <key>daily</key>
+ <integer>10</integer>
+ <key>weekly</key>
+ <integer>20</integer>
+
+ <!-- Monthly, yearly, daily & weekly limit not so common -->
+ <key>monthly</key>
+ <integer>2</integer>
+ <key>yearly</key>
+ <integer>1</integer>
+ <key>dailylimit</key>
+ <integer>2</integer>
+ <key>weeklylimit</key>
+ <integer>5</integer>
+
+ <!-- Work days pretty common -->
+ <key>workdays</key>
+ <integer>10</integer>
+ </dict>
+ </dict>
+ </dict>
+
+ <!-- Percentage of time to attach a file -->
+ <key>fileAttachPercentage</key>
+ <integer>1</integer>
+
+ <!-- Define the attachment size distribution. -->
+ <key>fileSizeDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.NormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mu gives the mean of the normal distribution (in seconds). -->
+ <key>mu</key>
+ <integer>500000</integer>
+
+ <!-- and sigma gives its standard deviation. -->
+ <key>sigma</key>
+ <integer>100000</integer>
+ </dict>
+ </dict>
+
+ </dict>
+ </dict>
+
+ <!-- This profile accepts invitations to events, handles cancels, and
+ handles replies received. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.Accepter</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define how long to wait after seeing a new invitation before
+ accepting it.
+
+ For LogNormal "mode" is the peak, "median" is the 50% cummulative value
+ (i.e., half of the user have accepted by that time).
+ -->
+ <key>acceptDelayDistribution</key>
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.stats.LogNormalDistribution</string>
+ <key>params</key>
+ <dict>
+ <!-- mode - peak-->
+ <key>mode</key>
+ <integer>300</integer>
+ <!-- median - 50% done-->
+ <key>median</key>
+ <integer>1800</integer>
+ </dict>
+ </dict>
+ </dict>
+ </dict>
+
+
+ <!-- This profile downloads attachments when an event changes. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.AttachmentDownloader</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+ </dict>
+ </dict>
+
+ <!-- A task-creating profile, which will periodically create
+ new tasks at a random time on a random calendar. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.Tasker</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to create a new task. -->
+ <key>interval</key>
+ <integer>300</integer>
+
+ <!-- Define how due times (DUE) for the randomly generated tasks
+ will be selected. This is an example of a "Distribution" parameter. The value
+ for most "Distribution" parameters are interchangeable and extensible. -->
+ <key>taskDueDistribution</key>
+ <dict>
+
+ <!-- This distribution is pretty specialized. It produces timestamps
+ in the near future, limited to certain days of the week and certain hours
+ of the day. -->
+ <key>type</key>
+ <string>contrib.performance.stats.WorkDistribution</string>
+
+ <key>params</key>
+ <dict>
+ <!-- These are the days of the week the distribution will use. -->
+ <key>daysOfWeek</key>
+ <array>
+ <string>mon</string>
+ <string>tue</string>
+ <string>wed</string>
+ <string>thu</string>
+ <string>fri</string>
+ </array>
+
+ <!-- The earliest hour of a day at which an event might be scheduled. -->
+ <key>beginHour</key>
+ <integer>8</integer>
+
+ <!-- And the latest hour of a day (at which an event will be scheduled
+ to begin!). -->
+ <key>endHour</key>
+ <integer>16</integer>
+
+ <!-- The timezone in which the event is scheduled. (XXX Does this
+ really work right?) -->
+ <key>tzname</key>
+ <string>America/Los_Angeles</string>
+ </dict>
+ </dict>
+ </dict>
+ </dict>
+
+
+ <!-- A profile which periodically does calendar-query reports
+ on a random calendar. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.TimeRanger</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to run a report. -->
+ <key>interval</key>
+ <integer>300</integer>
+
+ </dict>
+ </dict>
+
+
+ <!-- A profile which periodically does a "deep refresh" of PROPFINDs
+ on each calendar. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.DeepRefresher</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Define the interval (in seconds) at which this profile will use
+ its client to refresh. -->
+ <key>interval</key>
+ <integer>60</integer>
+
+ </dict>
+ </dict>
+
+ <!-- A profile which will periodically reset itself, as if a user removed
+ and re-added their account. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.Resetter</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <false/>
+
+ <!-- Define the interval (in seconds) at which this profile will
+ reset its client. -->
+ <key>interval</key>
+ <integer>600</integer>
+ </dict>
+ </dict>
+
+ </array>
+
+ <!-- Determine the frequency at which this client configuration will
+ appear in the clients which are created by the load tester. -->
+ <key>weight</key>
+ <integer>1</integer>
+ </dict>
+
+ <dict>
+
+ <!-- Here is a more passive OS X client simulator. -->
+ <key>software</key>
+ <string>contrib.performance.loadtest.ical.OS_X_10_11</string>
+
+ <!-- Arguments to use to initialize the OS_X_10_11 instance. -->
+ <key>params</key>
+ <dict>
+ <!-- Name that appears in logs. -->
+ <key>title</key>
+ <string>idle</string>
+
+ <!-- OS_X_10_11 can poll the calendar home at some interval. This is
+ in seconds. -->
+ <key>calendarHomePollInterval</key>
+ <integer>30</integer>
+
+ <!-- If the server advertises xmpp push, OS_X_10_7 can wait for notifications
+ about calendar home changes instead of polling for them periodically. If
+ this option is true, then look for the server advertisement for xmpp push
+ and use it if possible. Still fall back to polling if there is no xmpp push
+ advertised. -->
+ <key>supportPush</key>
+ <true/>
+
+ <key>supportAmpPush</key>
+ <true/>
+
+ <key>unauthenticatedPercentage</key>
+ <integer>40</integer>
+
+ </dict>
+
+ <!-- The profiles define certain types of user behavior on top of the
+ client software being simulated. -->
+ <key>profiles</key>
+ <array>
+ <!-- This profile downloads attachments when an event changes. -->
+ <dict>
+ <key>class</key>
+ <string>contrib.performance.loadtest.profiles.AttachmentDownloader</string>
+
+ <key>params</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+ </dict>
+ </dict>
+ </array>
+ <!-- Determine the frequency at which this client configuration will
+ appear in the clients which are created by the load tester. -->
+ <key>weight</key>
+ <integer>1</integer>
+ </dict>
+
+ </array>
+ </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobcontribperformanceloadteststandardconfigsacceleratedactivityconfigplistfromrev15745CalendarServertrunkcontribperformanceloadteststandardconfigsacceleratedactivityconfigplist"></a>
<div class="copfile"><h4>Copied: CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist (from rev 15745, CalendarServer/trunk/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist) (0 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist (rev 0)
+++ CalendarServer/branches/users/cdaboo/better-next-job/contrib/performance/loadtest/standard-configs/accelerated-activity-config.plist 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -0,0 +1,241 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2011-2016 Apple Inc. All rights reserved.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <!-- Identify all the servers to be load tested. -->
+ <key>servers</key>
+ <dict>
+ <key>PodA</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <!-- Identify the server to be load tested. -->
+ <key>uri</key>
+ <string>https://localhost:8443</string>
+
+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62311</integer>
+
+ <!-- Define whether server supports stats socket. -->
+ <key>stats</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+ <key>Port</key>
+ <integer>8100</integer>
+ </dict>
+ </dict>
+ <key>PodB</key>
+ <dict>
+ <key>enabled</key>
+ <false/>
+
+ <!-- Identify the server to be load tested. -->
+ <key>uri</key>
+ <string>https://localhost:8543</string>
+
+ <key>ampPushHosts</key>
+ <array>
+ <string>localhost</string>
+ </array>
+ <key>ampPushPort</key>
+ <integer>62312</integer>
+
+ <!-- Define whether server supports stats socket. -->
+ <key>stats</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+ <key>Port</key>
+ <integer>8101</integer>
+ </dict>
+ </dict>
+ </dict>
+
+ <!-- The template URI for doing initial principal lookup on. -->
+ <key>principalPathTemplate</key>
+ <string>/principals/users/%s/</string>
+
+ <!-- Configure Admin Web UI. -->
+ <key>webadmin</key>
+ <dict>
+ <key>enabled</key>
+ <true/>
+
+ <key>HTTPPort</key>
+ <integer>8080</integer>
+ </dict>
+
+ <!-- Define whether client data should be re-used. It will always be saved to the specified path.-->
+ <key>clientDataSerialization</key>
+ <dict>
+ <key>UseOldData</key>
+ <true/>
+ <key>Path</key>
+ <string>/tmp/sim</string>
+ </dict>
+
+ <!-- Define the credentials of the clients which will be used to load test
+ the server. These credentials must already be valid on the server. -->
+ <key>accounts</key>
+ <dict>
+ <!-- The loader is the fully-qualified Python name of a callable which
+ returns a list of directory service records defining all of the client accounts
+ to use. contrib.performance.loadtest.sim.recordsFromCSVFile reads username,
+ password, mailto triples from a CSV file and returns them as a list of faked
+ directory service records. -->
+ <key>loader</key>
+ <string>contrib.performance.loadtest.sim.recordsFromCSVFile</string>
+
+ <!-- Keyword arguments may be passed to the loader. -->
+ <key>params</key>
+ <dict>
+ <!-- recordsFromCSVFile interprets the path relative to the config.plist,
+ to make it independent of the script's working directory while still allowing
+ a relative path. This isn't a great solution. -->
+ <key>path</key>
+ <string>contrib/performance/loadtest/accounts.csv</string>
+
+ <!-- When there are accounts for multiple pods, interleave the accounts for each
+ pod so that the arrival mechanism will cycle clients between each pod. -->
+ <key>interleavePods</key>
+ <true/>
+ </dict>
+ </dict>
+
+ <!-- Define how many clients will participate in the load test and how
+ they will show up. -->
+ <key>arrival</key>
+ <dict>
+
+ <!-- Specify a class which creates new clients and introduces them into
+ the test. contrib.performance.loadtest.population.SmoothRampUp introduces
+ groups of new clients at fixed intervals up to a maximum. The size of the
+ group, interval, and maximum are configured by the parameters below. The
+ total number of clients is groups * groupSize, which needs to be no larger
+ than the number of credentials created in the accounts section. -->
+ <key>factory</key>
+ <string>contrib.performance.loadtest.population.SmoothRampUp</string>
+
+ <key>params</key>
+ <dict>
+ <!-- groups gives the total number of groups of clients to introduce. -->
+ <key>groups</key>
+ <integer>10</integer>
+
+ <!-- groupSize is the number of clients in each group of clients. It's
+ really only a "smooth" ramp up if this is pretty small. -->
+ <key>groupSize</key>
+ <integer>3</integer>
+
+ <!-- Number of seconds between the introduction of each group. -->
+ <key>interval</key>
+ <integer>3</integer>
+
+ <!-- Number of clients each user is assigned to. -->
+ <!-- Set weight of clients to 1 if this is > 1. Number of clients must match this value if > 1. -->
+ <key>clientsPerUser</key>
+ <integer>2</integer>
+ </dict>
+
+ </dict>
+
+ <!-- Define some log observers to report on the load test. -->
+ <key>observers</key>
+ <array>
+ <!-- ReportStatistics generates an end-of-run summary of the HTTP requests
+ made, their timings, and their results. -->
+ <dict>
+ <key>type</key>
+
+ <string>contrib.performance.loadtest.population.ReportStatistics</string>
+ <key>params</key>
+ <dict>
+ <!-- The thresholds for each request type -->
+ <key>thresholdsPath</key>
+ <string>contrib/performance/loadtest/thresholds.json</string>
+
+ <!-- The benchmarks for overall QoS -->
+ <key>benchmarksPath</key>
+ <string>contrib/performance/loadtest/benchmarks.json</string>
+
+ <!-- The % of failures that constitute a failed test -->
+ <key>failCutoff</key>
+ <real>1.0</real>
+ </dict>
+ </dict>
+
+ <!-- RequestLogger generates a realtime log of all HTTP requests made
+ during the load test. -->
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.loadtest.ical.RequestLogger</string>
+ <key>params</key>
+ <dict>
+ </dict>
+ </dict>
+
+ <!-- ErrorLogger logs the request/response bodies whenever an incorrect
+ response code is received, or if the duration exceeds threshold. -->
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.loadtest.ical.ErrorLogger</string>
+ <key>params</key>
+ <dict>
+ <key>directory</key>
+ <string>/tmp/sim_errors</string>
+ <key>durationThreshold</key>
+ <real>10.0</real>
+ </dict>
+ </dict>
+
+ <!-- OperationLogger generates an end-of-run summary of the gross operations
+ performed (logical operations which may span more than one HTTP request,
+ such as inviting an attendee to an event). -->
+ <dict>
+ <key>type</key>
+ <string>contrib.performance.loadtest.profiles.OperationLogger</string>
+ <key>params</key>
+ <dict>
+ <!-- The thresholds for each operation type -->
+ <key>thresholdsPath</key>
+ <string>contrib/performance/loadtest/thresholds.json</string>
+
+ <!-- The % of operations beyond the lag cut-off that constitute a failed test -->
+ <key>lagCutoff</key>
+ <real>1.0</real>
+
+ <!-- The % of failures that constitute a failed test -->
+ <key>failCutoff</key>
+ <real>1.0</real>
+
+ <!-- There must be at least one push operation -->
+ <key>failIfNoPush</key>
+ <true/>
+ </dict>
+ </dict>
+ </array>
+ </dict>
+</plist>
</ins></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjoblibpatchesTwistedsecuretransportpatch"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/lib-patches/Twisted/securetransport.patch (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/lib-patches/Twisted/securetransport.patch 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/lib-patches/Twisted/securetransport.patch 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -2,14 +2,14 @@
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- twisted/internet/_sslverify.py (revision 45115)
</span><span class="cx"> +++ twisted/internet/_sslverify.py (working copy)
</span><del>-@@ -162,7 +162,9 @@
</del><ins>+@@ -174,7 +174,9 @@
+ "rejected."
+ )
</ins><span class="cx">
</span><del>- major, minor = list(int(part) for part in lib.__version__.split("."))[:2]
-
-- if (major, minor) >= (0, 12):
</del><ins>+- if _usablePyOpenSSL(lib.__version__):
</ins><span class="cx"> + if hasattr(lib, "__SecureTransport__"):
</span><span class="cx"> + pass
</span><del>-+ elif (major, minor) >= (0, 12):
</del><ins>++ elif _usablePyOpenSSL(lib.__version__):
</ins><span class="cx"> try:
</span><span class="cx"> from service_identity import VerificationError
</span><span class="cx"> from service_identity.pyopenssl import verify_hostname
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> ===================================================================
</span><span class="cx"> --- twisted/protocols/tls.py (revision 45115)
</span><span class="cx"> +++ twisted/protocols/tls.py (working copy)
</span><del>-@@ -660,7 +660,9 @@
</del><ins>+@@ -705,7 +705,9 @@
</ins><span class="cx"> @rtype: L{OpenSSL.SSL.Connection}
</span><span class="cx"> """
</span><span class="cx"> context = self._oldStyleContextFactory.getContext()
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobrequirementscstxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/requirements-cs.txt (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/requirements-cs.txt 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/requirements-cs.txt 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -7,23 +7,23 @@
</span><span class="cx"> zope.interface==4.1.3
</span><span class="cx"> setuptools==18.5
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/better-next-job@15730#egg=twextpy
- cffi==1.3.0
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/branches/users/cdaboo/better-next-job@15748#egg=twextpy
+ cffi==1.7.0
</ins><span class="cx"> pycparser==2.14
</span><span class="cx"> #twisted
</span><span class="cx">
</span><span class="cx"> # [LDAP] extra
</span><del>- python-ldap==2.4.22
</del><ins>+ python-ldap==2.4.25
</ins><span class="cx"> #setuptools
</span><span class="cx">
</span><span class="cx"> # [DAL] extra
</span><del>- sqlparse==0.1.18
</del><ins>+ sqlparse==0.1.19
</ins><span class="cx">
</span><span class="cx"> # [OpenDirectory] extra
</span><span class="cx"> #pyobjc-framework-OpenDirectory # Use system module
</span><span class="cx">
</span><span class="cx"> # [Postgres] extra
</span><del>- pg8000==1.10.2
</del><ins>+ pg8000==1.10.6
</ins><span class="cx">
</span><span class="cx"> # [Oracle] extra
</span><span class="cx"> #cx_Oracle==5.2 # Needs manual patch
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@15423#egg=kerberos
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@15423#egg=pycalendar
</span><del>- python-dateutil==2.4.2
- pytz==2015.7
</del><ins>+ python-dateutil==2.5.3
+ pytz==2016.4
</ins><span class="cx">
</span><del>- psutil==3.4.2
- setproctitle==1.1.9
</del><ins>+ psutil==4.3.0
+ setproctitle==1.1.10
</ins><span class="cx"> # xattr==0.7.5 # Only needed for upgrades from ancient versions. Added in _cache_deps.
</span><span class="cx"> #cffi
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobrequirementstwisteddefaulttxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-default.txt (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-default.txt 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-default.txt 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -3,27 +3,27 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx">
</span><del>-Twisted==15.4.0
</del><ins>+Twisted==16.3.0
</ins><span class="cx"> #zope.interface
</span><span class="cx">
</span><span class="cx"> # NOTE: Twisted also uses pyOpenSSL, pycrypto and service_identity,
</span><span class="cx"> # but doesn't specify them as dependencies, so that are explicitly
</span><span class="cx"> # added to calendarserver.
</span><span class="cx"> #pyOpenSSL
</span><del>- service_identity==14.0.0
</del><ins>+ service_identity==16.0.0
</ins><span class="cx"> characteristic==14.3.0
</span><span class="cx"> pyasn1==0.1.9
</span><span class="cx"> pyasn1-modules==0.0.8
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- pyOpenSSL==0.15.1
</del><ins>+ pyOpenSSL==16.0.0
</ins><span class="cx"> cryptography==1.1
</span><span class="cx"> idna
</span><span class="cx"> #pyasn1
</span><span class="cx"> #cffi
</span><del>- enum34==1.0.4
</del><ins>+ enum34==1.1.6
</ins><span class="cx"> ipaddress
</span><del>- #setuptools==17.0
</del><ins>+ #setuptools
</ins><span class="cx"> #six
</span><span class="cx"> six==1.10.0
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobrequirementstwistedosxtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-osx.txt (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-osx.txt 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/requirements-twisted-osx.txt 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -2,13 +2,13 @@
</span><span class="cx"> # Twisted dependency for OS X systems (uses pySecureTransport).
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-Twisted==15.4.0
</del><ins>+Twisted==16.3.0
</ins><span class="cx"> #zope.interface
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/OSXFrameworks/trunk@15423#egg=osxframeworks
</span><del>- #cffi==1.3.0
- # pycparser==2.14
</del><ins>+ #cffi
+ # pycparser
</ins><span class="cx">
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/PySecureTransport/trunk@15554#egg=pysecuretransport
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobsetuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/setup.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/setup.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/setup.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> install_requirements = [
</span><span class="cx"> # Core frameworks
</span><span class="cx"> "zope.interface",
</span><del>- "Twisted==15.4.0",
</del><ins>+ "Twisted==16.3.0",
</ins><span class="cx"> "twextpy",
</span><span class="cx">
</span><span class="cx"> # Security frameworks
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtwistedcaldavdumpconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/dumpconfig.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/dumpconfig.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/dumpconfig.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> import re
</span><span class="cx"> import textwrap
</span><span class="cx">
</span><ins>+DEBUG = False
+
</ins><span class="cx"> COPYRIGHT = """
</span><span class="cx"> <!--
</span><span class="cx"> Copyright (c) 2006-2016 Apple Inc. All rights reserved.
</span><span class="lines">@@ -313,12 +315,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for item in maps.keys():
</span><ins>+ if DEBUG:
+ print(item)
</ins><span class="cx"> lines = parseConfigItem(item)
</span><del>- maps[item] = processConfig(lines, with_comments=True, verbose=False)
</del><ins>+ maps[item] = processConfig(lines, with_comments=True, verbose=DEBUG)
</ins><span class="cx">
</span><span class="cx"> # Generate the plist for the default config, substituting for the *_PARAMS items
</span><span class="cx"> lines = parseConfigItem("DEFAULT_CONFIG")
</span><del>- j = processConfig(lines, with_comments=True, verbose=False, substitutions=maps)
</del><ins>+ j = processConfig(lines, with_comments=True, verbose=DEBUG, substitutions=maps)
</ins><span class="cx"> return writeOrderedPlistToString(j)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/stdconfig.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/stdconfig.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/twistedcaldav/stdconfig.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -195,24 +195,36 @@
</span><span class="cx"> "BindSSLPorts": [], # List of port numbers to bind to for SSL [empty = same as "SSLPort"]
</span><span class="cx"> "InheritFDs": [], # File descriptors to inherit for HTTP requests [empty = don't inherit]
</span><span class="cx"> "InheritSSLFDs": [], # File descriptors to inherit for HTTPS requests [empty = don't inherit]
</span><del>- "MetaFD": 0, # Inherited file descriptor to call recvmsg() on to receive sockets (none = don't inherit)
</del><span class="cx">
</span><span class="cx"> "UseMetaFD": True, # Use a 'meta' FD, i.e. an FD to transmit other FDs to slave processes.
</span><ins>+ "MetaFD": 0, # Inherited file descriptor to call recvmsg() on to receive sockets (none = don't inherit)
</ins><span class="cx">
</span><del>- "UseDatabase": True, # True: database; False: files
</del><ins>+ #
+ # Database configuration information.
+ #
+ # Defines what kind of database to use: file (deprecated) or SQL.
+ # File-based DB is only supported for migration purposes - it
+ # cannot be used for a real service.
+ #
+ # For an SQL-based DB, configuration of connection parameters and various
+ # timeouts is provided.
+ #
</ins><span class="cx">
</span><del>- "TransactionTimeoutSeconds": 300, # Timeout transactions that take longer than
- # the specified number of seconds. Zero means
- # no timeouts. 5 minute default.
- "TransactionHTTPRetrySeconds": 300, # When a transactions times out tell HTTP clients
- # clients to retry after this amount of time
</del><ins>+ "UseDatabase": True, # True: database; False: files (deprecated)
</ins><span class="cx">
</span><del>- "DBType": "", # 2 possible values: empty, meaning 'spawn postgres
- # yourself', or 'postgres', meaning 'connect to a
- # postgres database as specified by the 'DSN'
- # configuration key. Will support more values in
- # the future.
</del><ins>+ "DBType": "", # Possible values: empty, meaning 'spawn postgres
+ # yourself', or 'postgres' or 'oracle', meaning
+ # 'connect to a postgres or Oracle database as
+ # specified by the 'DSN' configuration key.
</ins><span class="cx">
</span><ins>+
+ "DBFeatures": [ # Features supported by the database
+ #
+ # 'skip-locked': SKIP LOCKED available with SELECT (remove if using postgres < v9.5)
+ #
+ "skip-locked",
+ ],
+
</ins><span class="cx"> "SpawnedDBUser": "caldav", # The username to use when DBType is empty
</span><span class="cx">
</span><span class="cx"> "DatabaseConnection": { # Used to connect to an external database if DBType is non-empty
</span><span class="lines">@@ -223,16 +235,16 @@
</span><span class="cx"> "ssl": False, # Set to True to require SSL (pg8000 only).
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ "SharedConnectionPool": False, # Use a shared database connection pool in
+ # the master process, rather than having
+ # each client make its connections directly.
+
</ins><span class="cx"> "DBAMPFD": 0, # Internally used by database to tell slave
</span><span class="cx"> # processes to inherit a file descriptor and use it
</span><span class="cx"> # as an AMP connection over a UNIX socket; see
</span><span class="cx"> # twext.enterprise.adbapi2.ConnectionPoolConnection
</span><span class="cx">
</span><del>- "SharedConnectionPool": False, # Use a shared database connection pool in
- # the master process, rather than having
- # each client make its connections directly.
-
- "FailIfUpgradeNeeded": True, # Set to True to prevent the server or utility
</del><ins>+ "FailIfUpgradeNeeded": True, # Set to True to prevent the server or utility
</ins><span class="cx"> # tools from running if the database needs a schema
</span><span class="cx"> # upgrade.
</span><span class="cx">
</span><span class="lines">@@ -246,6 +258,12 @@
</span><span class="cx"> # need to be run again without this prefix set to complete the overall
</span><span class="cx"> # upgrade.
</span><span class="cx">
</span><ins>+ "TransactionTimeoutSeconds": 300, # Timeout transactions that take longer than
+ # the specified number of seconds. Zero means
+ # no timeouts. 5 minute default.
+ "TransactionHTTPRetrySeconds": 300, # When a transactions times out tell HTTP clients
+ # clients to retry after this amount of time
+
</ins><span class="cx"> #
</span><span class="cx"> # Work queue configuration information
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavbasedatastoredbapiclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/base/datastore/dbapiclient.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> import datetime
</span><span class="cx">
</span><span class="cx"> import pg8000 as postgres
</span><ins>+import six
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> import os
</span><span class="lines">@@ -452,7 +453,7 @@
</span><span class="cx"> return v.encode("utf-8") if isinstance(v, unicode) else str(v)
</span><span class="cx">
</span><span class="cx"> connection.realConnection.py_types[str] = (705, postgres.core.FC_TEXT, my_text_out)
</span><del>- connection.realConnection.py_types[postgres.six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
</del><ins>+ connection.realConnection.py_types[six.text_type] = (705, postgres.core.FC_TEXT, my_text_out)
</ins><span class="cx">
</span><span class="cx"> def my_text_recv(data, offset, length):
</span><span class="cx"> return str(data[offset: offset + length])
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -643,8 +643,7 @@
</span><span class="cx"> directlyProvides(self, *extraInterfaces)
</span><span class="cx">
</span><span class="cx"> self._sqlTxn = sqlTxn
</span><del>- self.paramstyle = sqlTxn.paramstyle
- self.dialect = sqlTxn.dialect
</del><ins>+ self.dbtype = sqlTxn.dbtype
</ins><span class="cx">
</span><span class="cx"> self._stats = (
</span><span class="cx"> TransactionStatsCollector(self._label, self._store.logStatsLogFile)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_dumppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_dump.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_dump.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_dump.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> Generate the L{Schema}.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- if txn.dialect == POSTGRES_DIALECT:
</del><ins>+ if txn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> return dumpSchema_postgres(txn, title, schemaname)
</span><del>- elif txn.dialect == ORACLE_DIALECT:
</del><ins>+ elif txn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> return dumpSchema_oracle(txn, title, schemaname)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoresql_tablespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/sql_tables.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -25,7 +25,8 @@
</span><span class="cx"> from twext.enterprise.dal.model import Sequence, ProcedureCall
</span><span class="cx"> from twext.enterprise.dal.parseschema import schemaFromPath
</span><span class="cx"> from twext.enterprise.dal.syntax import FixedPlaceholder
</span><del>-from twext.enterprise.ienterprise import ORACLE_DIALECT, POSTGRES_DIALECT
</del><ins>+from twext.enterprise.ienterprise import ORACLE_DIALECT, POSTGRES_DIALECT, \
+ DatabaseType
</ins><span class="cx"> from twext.enterprise.dal.syntax import Insert
</span><span class="cx"> from twext.enterprise.ienterprise import ORACLE_TABLE_NAME_MAX
</span><span class="cx"> import hashlib
</span><span class="lines">@@ -314,7 +315,7 @@
</span><span class="cx"> @return: the generated SQL string.
</span><span class="cx"> @rtype: C{str}
</span><span class="cx"> """
</span><del>- qgen = QueryGenerator(ORACLE_DIALECT, FixedPlaceholder('%s'))
</del><ins>+ qgen = QueryGenerator(DatabaseType(ORACLE_DIALECT, "pyformat"), FixedPlaceholder('%s'))
</ins><span class="cx"> if doquote:
</span><span class="cx"> qgen.shouldQuote = lambda name: True
</span><span class="cx"> if hasattr(sql, 'subSQL'):
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretesttest_sql_dumppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_sql_dump.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_sql_dump.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_sql_dump.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def cleanUp(self):
</span><span class="cx"> startTxn = self.store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("set search_path to public")
</span><span class="cx"> yield startTxn.execSQL("drop schema test_dbUpgrades cascade")
</span><span class="cx"> else:
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> in postgres that we can quickly wipe clean afterwards.
</span><span class="cx"> """
</span><span class="cx"> startTxn = self.store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("create schema test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQL("set search_path to test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQLBlock(schema)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretesttest_trashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_trash.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_trash.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/test_trash.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -1814,6 +1814,7 @@
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_trashCalendarRestoreWithFailures(self):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/util.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/util.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/test/util.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> from twext.python.filepath import CachingFilePath as FilePath
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError, POSTGRES_DIALECT, \
</span><del>- ORACLE_DIALECT
</del><ins>+ ORACLE_DIALECT, DatabaseType
</ins><span class="cx"> from twext.enterprise.jobs.jobitem import JobItem
</span><span class="cx"> from twext.enterprise.jobs.queue import ControllerQueue
</span><span class="cx"> from twext.who.directory import DirectoryRecord
</span><span class="lines">@@ -162,8 +162,7 @@
</span><span class="cx"> cp = ConnectionPool(
</span><span class="cx"> stubsvc.produceConnection,
</span><span class="cx"> maxConnections=1,
</span><del>- dialect=DB_TYPE[0],
- paramstyle=DB_TYPE[1],
</del><ins>+ dbtype=DatabaseType(DB_TYPE[0], DB_TYPE[1]),
</ins><span class="cx"> )
</span><span class="cx"> # Attach the service to the running reactor.
</span><span class="cx"> cp.startService()
</span><span class="lines">@@ -251,8 +250,7 @@
</span><span class="cx"> cp = ConnectionPool(
</span><span class="cx"> self.sharedService.produceConnection,
</span><span class="cx"> maxConnections=4,
</span><del>- dialect=DB_TYPE[0],
- paramstyle=DB_TYPE[1],
</del><ins>+ dbtype=DatabaseType(DB_TYPE[0], DB_TYPE[1]),
</ins><span class="cx"> )
</span><span class="cx"> quota = deriveQuota(testCase)
</span><span class="cx"> store = CommonDataStore(
</span><span class="lines">@@ -340,10 +338,10 @@
</span><span class="cx"> # Change the starting values of sequences to random values
</span><span class="cx"> for sequence in schema.model.sequences: #@UndefinedVariable
</span><span class="cx"> try:
</span><del>- if cleanupTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if cleanupTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> curval = (yield cleanupTxn.execSQL("select nextval('{}')".format(sequence.name), []))[0][0]
</span><span class="cx"> yield cleanupTxn.execSQL("select setval('{}', {})".format(sequence.name, curval + randint(1, 10000)), [])
</span><del>- elif cleanupTxn.dialect == ORACLE_DIALECT:
</del><ins>+ elif cleanupTxn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> yield cleanupTxn.execSQL("alter sequence {} increment by {}".format(sequence.name, randint(1, 10000)), [])
</span><span class="cx"> yield cleanupTxn.execSQL("select {}.nextval from dual".format(sequence.name), [])
</span><span class="cx"> yield cleanupTxn.execSQL("alter sequence {} increment by {}".format(sequence.name, 1), [])
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoreupgradesqltesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/test/test_upgrade.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/test/test_upgrade.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/test/test_upgrade.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> in postgres that we can quickly wipe clean afterwards.
</span><span class="cx"> """
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("create schema test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQL("set search_path to test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQLBlock(path.getContent())
</span><span class="lines">@@ -194,20 +194,20 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _unloadOldSchema():
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("set search_path to public")
</span><span class="cx"> yield startTxn.execSQL("drop schema test_dbUpgrades cascade")
</span><del>- elif startTxn.dialect == ORACLE_DIALECT:
</del><ins>+ elif startTxn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> yield cleanDatabase(startTxn)
</span><span class="cx"> yield startTxn.commit()
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _cleanupOldSchema():
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("set search_path to public")
</span><span class="cx"> yield startTxn.execSQL("drop schema if exists test_dbUpgrades cascade")
</span><del>- elif startTxn.dialect == ORACLE_DIALECT:
</del><ins>+ elif startTxn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> yield cleanDatabase(startTxn)
</span><span class="cx"> yield startTxn.commit()
</span><span class="cx">
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> in postgres that we can quickly wipe clean afterwards.
</span><span class="cx"> """
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("create schema test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQL("set search_path to test_dbUpgrades")
</span><span class="cx"> yield startTxn.execSQLBlock(path.getContent())
</span><span class="lines">@@ -303,20 +303,20 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _unloadOldData():
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("set search_path to public")
</span><span class="cx"> yield startTxn.execSQL("drop schema test_dbUpgrades cascade")
</span><del>- elif startTxn.dialect == ORACLE_DIALECT:
</del><ins>+ elif startTxn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> yield cleanDatabase(startTxn)
</span><span class="cx"> yield startTxn.commit()
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _cleanupOldData():
</span><span class="cx"> startTxn = store.newTransaction("test_dbUpgrades")
</span><del>- if startTxn.dialect == POSTGRES_DIALECT:
</del><ins>+ if startTxn.dbtype.dialect == POSTGRES_DIALECT:
</ins><span class="cx"> yield startTxn.execSQL("set search_path to public")
</span><span class="cx"> yield startTxn.execSQL("drop schema if exists test_dbUpgrades cascade")
</span><del>- elif startTxn.dialect == ORACLE_DIALECT:
</del><ins>+ elif startTxn.dbtype.dialect == ORACLE_DIALECT:
</ins><span class="cx"> yield cleanDatabase(startTxn)
</span><span class="cx"> yield startTxn.commit()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboobetternextjobtxdavcommondatastoreupgradesqlupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/upgrade.py (15748 => 15749)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/upgrade.py 2016-07-07 16:12:19 UTC (rev 15748)
+++ CalendarServer/branches/users/cdaboo/better-next-job/txdav/common/datastore/upgrade/sql/upgrade.py 2016-07-07 16:14:45 UTC (rev 15749)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> # Get the schema version in the current database
</span><span class="cx"> sqlTxn = self.sqlStore.newTransaction(label="UpgradeDatabaseCoreStep.getVersions")
</span><del>- dialect = sqlTxn.dialect
</del><ins>+ dialect = sqlTxn.dbtype.dialect
</ins><span class="cx"> try:
</span><span class="cx"> actual_version = yield sqlTxn.calendarserverValue(self.versionKey)
</span><span class="cx"> actual_version = int(actual_version)
</span></span></pre>
</div>
</div>
</body>
</html>