<!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>[13199] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13199">13199</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 12:42:44 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Automatically create a txn label from previous caller's frame rather than raise an assertion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushapplepushpy">CalendarServer/trunk/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgrademigratepy">CalendarServer/trunk/txdav/common/datastore/upgrade/migrate.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradepy">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradesaddressbook_upgrade_from_1_to_2py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/addressbook_upgrade_from_1_to_2.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_1_to_2py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_1_to_2.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_3_to_4py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_4_to_5py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_5_to_6py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/applepush.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/applepush.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> @type purgeSeconds: C{int}
</span><span class="cx"> """
</span><span class="cx"> self.log.debug("ApplePushNotifierService purgeOldSubscriptions")
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="ApplePushNotifierService.purgeOldSubscriptions")
</ins><span class="cx"> yield txn.purgeOldAPNSubscriptions(int(time.time()) - purgeSeconds)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> if token is not None:
</span><span class="cx"> self.log.debug("Removing subscriptions for bad token: %s" %
</span><span class="cx"> (token,))
</span><del>- txn = self.factory.store.newTransaction()
</del><ins>+ txn = self.factory.store.newTransaction(label="APNProviderProtocol.processError")
</ins><span class="cx"> subscriptions = (yield txn.apnSubscriptionsByToken(token))
</span><span class="cx"> for key, _ignore_modified, _ignore_uid in subscriptions:
</span><span class="cx"> self.log.debug("Removing subscription: %s %s" %
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx">
</span><span class="cx"> self.log.debug("FeedbackProtocol processFeedback time=%d token=%s" %
</span><span class="cx"> (timestamp, token))
</span><del>- txn = self.factory.store.newTransaction()
</del><ins>+ txn = self.factory.store.newTransaction(label="APNFeedbackProtocol.processFeedback")
</ins><span class="cx"> subscriptions = (yield txn.apnSubscriptionsByToken(token))
</span><span class="cx">
</span><span class="cx"> for key, modified, _ignore_uid in subscriptions:
</span><span class="lines">@@ -947,7 +947,7 @@
</span><span class="cx"> @type key: C{str}
</span><span class="cx"> """
</span><span class="cx"> now = int(time.time()) # epoch seconds
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="APNSubscriptionResource.addSubscription")
</ins><span class="cx"> yield txn.addAPNSubscription(token, key, now, uid, userAgent, host)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def scheduleNextMailPoll(store, seconds):
</span><del>- txn = store.newTransaction()
</del><ins>+ txn = store.newTransaction(label="scheduleNextMailPoll")
</ins><span class="cx"> notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
</span><span class="cx"> log.debug("Scheduling next mail poll: %s" % (notBefore,))
</span><span class="cx"> yield txn.enqueue(IMIPPollingWork, notBefore=notBefore)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> log.error("Mail gateway can't find token in DSN %s" % (msgId,))
</span><span class="cx"> return
</span><span class="cx">
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="MailReceiver.processDSN")
</ins><span class="cx"> result = (yield txn.imipLookupByToken(token))
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> try:
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> log.warn("Mail gateway processing DSN %s" % (msgId,))
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="MailReceiver.processDSN")
</ins><span class="cx"> yield txn.enqueue(IMIPReplyWork, organizer=organizer, attendee=attendee,
</span><span class="cx"> icalendarText=str(calendar))
</span><span class="cx"> yield txn.commit()
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> "message %s" % (msg['To'], msg['Message-ID']))
</span><span class="cx"> returnValue(self.MALFORMED_TO_ADDRESS)
</span><span class="cx">
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="MailReceiver.processReply")
</ins><span class="cx"> result = (yield txn.imipLookupByToken(token))
</span><span class="cx"> yield txn.commit()
</span><span class="cx"> try:
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> # the appropriate ATTENDEE. This will require a new localizable
</span><span class="cx"> # email template for the message.
</span><span class="cx">
</span><del>- txn = self.store.newTransaction()
</del><ins>+ txn = self.store.newTransaction(label="MailReceiver.processReply")
</ins><span class="cx"> yield txn.enqueue(IMIPReplyWork, organizer=organizer, attendee=attendee,
</span><span class="cx"> icalendarText=str(calendar))
</span><span class="cx"> yield txn.commit()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -1523,7 +1523,7 @@
</span><span class="cx"> # Use a new transaction to do this update quickly without locking the row for too long. However, the original
</span><span class="cx"> # transaction may have the row locked, so use wait=False and if that fails, fall back to using the original txn.
</span><span class="cx">
</span><del>- newTxn = obj.transaction().store().newTransaction()
</del><ins>+ newTxn = obj.transaction().store().newTransaction(label="Calendar.reExpandResource")
</ins><span class="cx"> try:
</span><span class="cx"> yield obj.lock(wait=False, txn=newTxn)
</span><span class="cx"> except NoSuchObjectResourceError:
</span><span class="lines">@@ -3739,7 +3739,7 @@
</span><span class="cx">
</span><span class="cx"> # Can only do if cached data exists
</span><span class="cx"> if self._cachedComponent:
</span><del>- txn = self.transaction().store().newTransaction("Timeout checkSplit")
</del><ins>+ txn = self.transaction().store().newTransaction(label="Timeout checkSplit")
</ins><span class="cx"> yield self.checkSplit(txn=txn)
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx">
</span><span class="cx"> from collections import namedtuple
</span><span class="cx"> import datetime
</span><ins>+import inspect
</ins><span class="cx"> import itertools
</span><span class="cx"> import json
</span><span class="cx"> import sys
</span><span class="lines">@@ -505,7 +506,8 @@
</span><span class="cx"> authz_uid=None,
</span><span class="cx"> ):
</span><span class="cx"> if label == "unlabeled" or not label:
</span><del>- raise AssertionError("Please make sure your transactions have a proper label")
</del><ins>+ tr = inspect.getframeinfo(inspect.currentframe().f_back.f_back)
+ label = "{}#{}${}".format(tr.filename, tr.lineno, tr.function)
</ins><span class="cx">
</span><span class="cx"> self._store = store
</span><span class="cx"> self._calendarHomes = {}
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgrademigratepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/migrate.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/migrate.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/migrate.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> Upgrade one calendar home.
</span><span class="cx"> """
</span><span class="cx"> _ignore_migrateFunc, destFunc = homeTypeLookup[homeType]
</span><del>- fileTxn = self.upgrader.fileStore.newTransaction()
</del><ins>+ fileTxn = self.upgrader.fileStore.newTransaction(label="UpgradeHelperProcess.oneUpgrade")
</ins><span class="cx"> return (
</span><span class="cx"> maybeDeferred(destFunc(fileTxn), uid)
</span><span class="cx"> .addCallback(
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> uid = normalizeUUIDOrNot(fileHome.uid())
</span><span class="cx"> self.log.warn("Starting migration transaction %s UID %r" %
</span><span class="cx"> (homeType, uid))
</span><del>- sqlTxn = self.sqlStore.newTransaction()
</del><ins>+ sqlTxn = self.sqlStore.newTransaction(label="UpgradeToDatabaseStep.migrateOneHome")
</ins><span class="cx"> homeGetter = destFunc(sqlTxn)
</span><span class="cx"> sqlHome = yield homeGetter(uid, create=False)
</span><span class="cx"> if sqlHome is not None and not self.merge:
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx">
</span><span class="cx"> # First force each home to v1 data format so the upgrades will be triggered
</span><span class="cx"> self.log.warn("Migration extra steps.")
</span><del>- txn = self.sqlStore.newTransaction()
</del><ins>+ txn = self.sqlStore.newTransaction(label="UpgradeToDatabaseStep.doDataUpgradeSteps")
</ins><span class="cx"> for storeType in (ECALENDARTYPE, EADDRESSBOOKTYPE):
</span><span class="cx"> schema = txn._homeClass[storeType]._homeSchema
</span><span class="cx"> yield Update(
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> Apply the schema upgrade .sql file to the database.
</span><span class="cx"> """
</span><span class="cx"> self.log.warn("Applying schema upgrade: %s" % (fp.basename(),))
</span><del>- sqlTxn = self.sqlStore.newTransaction()
</del><ins>+ sqlTxn = self.sqlStore.newTransaction(label="UpgradeDatabaseSchemaStep.applyUpgrade")
</ins><span class="cx"> try:
</span><span class="cx"> sql = fp.getContent()
</span><span class="cx"> yield sqlTxn.execSQLBlock(sql)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradesaddressbook_upgrade_from_1_to_2py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/addressbook_upgrade_from_1_to_2.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/addressbook_upgrade_from_1_to_2.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/addressbook_upgrade_from_1_to_2.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> def removeResourceType(sqlStore):
</span><span class="cx"> logUpgradeStatus("Starting Addressbook Remove Resource Type")
</span><span class="cx">
</span><del>- sqlTxn = sqlStore.newTransaction()
</del><ins>+ sqlTxn = sqlStore.newTransaction(label="addressbook_upgrade_from_1_to_2.removeResourceType")
</ins><span class="cx"> yield removeProperty(sqlTxn, PropertyName.fromElement(element.ResourceType))
</span><span class="cx"> yield sqlTxn.commit()
</span><span class="cx"> yield cleanPropertyStore()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_1_to_2py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_1_to_2.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_1_to_2.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_1_to_2.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> logUpgradeStatus("Starting Move supported-component-set")
</span><span class="cx">
</span><del>- sqlTxn = sqlStore.newTransaction()
</del><ins>+ sqlTxn = sqlStore.newTransaction(label="calendar_upgrade_from_1_to_2.moveSupportedComponentSetProperties")
</ins><span class="cx"> try:
</span><span class="cx"> # Do not move the properties if migrating, as migration will do a split and set supported-components,
</span><span class="cx"> # however we still need to remove the old properties.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_3_to_4py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_3_to_4.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> def removeResourceType(sqlStore):
</span><span class="cx"> logUpgradeStatus("Starting Calendar Remove Resource Type")
</span><span class="cx">
</span><del>- sqlTxn = sqlStore.newTransaction()
</del><ins>+ sqlTxn = sqlStore.newTransaction(label="calendar_upgrade_from_3_to_4.removeResourceType")
</ins><span class="cx"> yield removeProperty(sqlTxn, PropertyName.fromElement(element.ResourceType))
</span><span class="cx"> yield sqlTxn.commit()
</span><span class="cx"> yield cleanPropertyStore()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_4_to_5py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_4_to_5.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> """
</span><span class="cx"> logUpgradeStatus("Starting Calendar Remove Other Properties")
</span><span class="cx">
</span><del>- sqlTxn = sqlStore.newTransaction()
</del><ins>+ sqlTxn = sqlStore.newTransaction(label="calendar_upgrade_from_4_to_5.removeOtherProperties")
</ins><span class="cx">
</span><span class="cx"> yield removeProperty(sqlTxn, PropertyName.fromElement(element.ACL))
</span><span class="cx"> yield removeProperty(sqlTxn, PropertyName.fromElement(element.GETContentType))
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_5_to_6py"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py (13198 => 13199)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py 2014-04-08 18:01:59 UTC (rev 13198)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py 2014-04-08 19:42:44 UTC (rev 13199)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> Do the required upgrade steps.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- sqlTxn = sqlStore.newTransaction()
</del><ins>+ sqlTxn = sqlStore.newTransaction(label="calendar_upgrade_from_5_to_6.doUpgrade")
</ins><span class="cx"> cb = schema.CALENDAR_BIND
</span><span class="cx">
</span><span class="cx"> # Fix shared calendar alarms which should default to "empty"
</span></span></pre>
</div>
</div>
</body>
</html>