<!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>[12365] CalendarServer/trunk/txdav</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/12365">12365</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-01-16 15:39:26 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>use CommonStoreTransaction.calendarserverValue() & CommonStoreTransaction.updateCalendarserverValue() instead of direct ops on CALENDARSERVER table; move deleteRevisionsBefore() to CommonStoreTransaction</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcarddavdatastoresqlpy">CalendarServer/trunk/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py (12364 => 12365)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/sql.py        2014-01-16 22:22:25 UTC (rev 12364)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py        2014-01-16 23:39:26 UTC (rev 12365)
</span><span class="lines">@@ -645,14 +645,8 @@
</span><span class="cx"> returnValue((yield super(AddressBook, self).resourceNamesSinceRevision(revision)))
</span><span class="cx">
</span><span class="cx"> if revision:
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
-
- if revision < minValidRevision:
</del><ins>+ minValidRevision = yield self._txn.calendarserverValue("MIN-VALID-REVISION")
+ if revision < int(minValidRevision):
</ins><span class="cx"> raise SyncTokenValidException
</span><span class="cx">
</span><span class="cx"> # call sharedChildResourceNamesSinceRevision() and filter results
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12364 => 12365)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2014-01-16 22:22:25 UTC (rev 12364)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2014-01-16 23:39:26 UTC (rev 12365)
</span><span class="lines">@@ -1441,7 +1441,78 @@
</span><span class="cx"> return DatabaseUnlock().on(self)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def deleteRevisionsBefore(self, minRevision):
+ """
+ Delete revisions before minRevision
+ """
+ # Delete old revisions
+ for table in (
+ schema.CALENDAR_OBJECT_REVISIONS,
+ schema.NOTIFICATION_OBJECT_REVISIONS,
+ schema.ADDRESSBOOK_OBJECT_REVISIONS,
+ ):
+ yield Delete(
+ From=table,
+ Where=(table.REVISION < minRevision)
+ ).on(self)
</ins><span class="cx">
</span><ins>+ # get groups where this object was once a member and version info
+ aboMembers = schema.ABO_MEMBERS
+ groupRows = yield Select(
+ [aboMembers.GROUP_ID,
+ aboMembers.MEMBER_ID,
+ aboMembers.REMOVED,
+ aboMembers.REVISION],
+ From=aboMembers,
+ ).on(self)
+
+ # group results by group, member, and revisionInfo
+ groupIDToMemberIDMap = {}
+ for groupRow in groupRows:
+ groupID, memberID, removed, revision = groupRow
+ revisionInfo = [removed, revision]
+ if groupID not in groupIDToMemberIDMap:
+ groupIDToMemberIDMap[groupID] = {}
+ memberIDToRevisionsMap = groupIDToMemberIDMap[groupID]
+ if memberID not in memberIDToRevisionsMap:
+ memberIDToRevisionsMap[memberID] = []
+ revisionInfoList = memberIDToRevisionsMap[memberID]
+ revisionInfoList.append(revisionInfo)
+
+ # go though list an delete old revisions, leaving at least one unremoved member
+ for groupID, memberIDToRevisionsMap in groupIDToMemberIDMap.iteritems():
+ for memberID, revisionInfoList in memberIDToRevisionsMap.iteritems():
+ revisionInfosToRemove = []
+ revisionInfosToSave = []
+ for revisionInfo in revisionInfoList:
+ if revisionInfo[1] < minRevision:
+ revisionInfosToRemove.append(revisionInfo)
+ else:
+ revisionInfosToSave.append(revisionInfo)
+
+ # save at least one revision
+ if revisionInfosToRemove and len(revisionInfosToRemove) == len(revisionInfoList):
+ maxRevisionInfoToRemove = max(revisionInfosToRemove, key=lambda info: info[1])
+ revisionInfosToSave.append(maxRevisionInfoToRemove)
+ revisionInfosToRemove.remove(maxRevisionInfoToRemove)
+
+ # get rid of extra removed member revisions
+ if revisionInfosToSave and max(revisionInfosToSave, key=lambda info: not info[0])[0]:
+ revisionInfosToRemove += revisionInfosToSave
+
+ if revisionInfosToRemove:
+ revisionsToRemove = [revisionInfoToRemove[1] for revisionInfoToRemove in revisionInfosToRemove]
+ yield Delete(
+ aboMembers,
+ Where=(aboMembers.GROUP_ID == groupID).And(
+ aboMembers.MEMBER_ID == memberID).And(
+ aboMembers.REVISION.In(Parameter("revisionsToRemove", len(revisionsToRemove)))
+ )
+ ).on(self, revisionsToRemove=revisionsToRemove)
+
+
+
</ins><span class="cx"> class _EmptyCacher(object):
</span><span class="cx">
</span><span class="cx"> def set(self, key, value): #@UnusedVariable
</span><span class="lines">@@ -2136,11 +2207,7 @@
</span><span class="cx"> self._syncTokenRevision = (yield self._syncTokenQuery.on(
</span><span class="cx"> self._txn, resourceID=self._resourceID))[0][0]
</span><span class="cx"> if self._syncTokenRevision is None:
</span><del>- cs = schema.CALENDARSERVER
- self._syncTokenRevision = int((yield Select(
- [cs.VALUE], From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
</del><ins>+ self._syncTokenRevision = int((yield self._txn.calendarserverValue("MIN-VALID-REVISION")))
</ins><span class="cx"> returnValue("%s_%s" % (self._resourceID, self._syncTokenRevision))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2220,14 +2287,8 @@
</span><span class="cx"> deleted = set()
</span><span class="cx"> invalid = set()
</span><span class="cx"> if revision:
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
-
- if revision < minValidRevision:
</del><ins>+ minValidRevision = yield self._txn.calendarserverValue("MIN-VALID-REVISION")
+ if revision < int(minValidRevision):
</ins><span class="cx"> raise SyncTokenValidException
</span><span class="cx">
</span><span class="cx"> results = [
</span><span class="lines">@@ -2622,11 +2683,7 @@
</span><span class="cx"> self._syncTokenRevision = (yield self._childSyncTokenQuery.on(
</span><span class="cx"> self._txn, resourceID=self._resourceID))[0][0]
</span><span class="cx"> if self._syncTokenRevision is None:
</span><del>- cs = schema.CALENDARSERVER
- self._syncTokenRevision = int((yield Select(
- [cs.VALUE], From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
</del><ins>+ self._syncTokenRevision = int((yield self._txn.calendarserverValue("MIN-VALID-REVISION")))
</ins><span class="cx"> returnValue(("%s_%s" % (self._resourceID, self._syncTokenRevision,)))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -2674,14 +2731,8 @@
</span><span class="cx"> deleted = []
</span><span class="cx"> invalid = []
</span><span class="cx"> if revision:
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
-
- if revision < minValidRevision:
</del><ins>+ minValidRevision = yield self._txn.calendarserverValue("MIN-VALID-REVISION")
+ if revision < int(minValidRevision):
</ins><span class="cx"> raise SyncTokenValidException
</span><span class="cx">
</span><span class="cx"> results = [
</span><span class="lines">@@ -6053,11 +6104,7 @@
</span><span class="cx"> self._txn, resourceID=self._resourceID)
</span><span class="cx"> )[0][0]
</span><span class="cx"> if self._syncTokenRevision is None:
</span><del>- cs = schema.CALENDARSERVER
- self._syncTokenRevision = int((yield Select(
- [cs.VALUE], From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self._txn))[0][0])
</del><ins>+ self._syncTokenRevision = int((yield self._txn.calendarserverValue("MIN-VALID-REVISION")))
</ins><span class="cx"> returnValue("%s_%s" % (self._resourceID, self._syncTokenRevision))
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -6789,75 +6836,3 @@
</span><span class="cx"> # obscure bug.
</span><span class="cx"> else:
</span><span class="cx"> yield t.commit()
</span><del>-
-
-
-@inlineCallbacks
-def deleteRevisionsBefore(txn, minRevision):
- """
- Delete revisions before minRevision
- """
- # Delete old revisions
- for table in (
- schema.CALENDAR_OBJECT_REVISIONS,
- schema.NOTIFICATION_OBJECT_REVISIONS,
- schema.ADDRESSBOOK_OBJECT_REVISIONS,
- ):
- yield Delete(
- From=table,
- Where=(table.REVISION < minRevision)
- ).on(txn)
-
- # get groups where this object was once a member and version info
- aboMembers = schema.ABO_MEMBERS
- groupRows = yield Select(
- [aboMembers.GROUP_ID,
- aboMembers.MEMBER_ID,
- aboMembers.REMOVED,
- aboMembers.REVISION],
- From=aboMembers,
- ).on(txn)
-
- # group results by group, member, and revisionInfo
- groupIDToMemberIDMap = {}
- for groupRow in groupRows:
- groupID, memberID, removed, revision = groupRow
- revisionInfo = [removed, revision]
- if groupID not in groupIDToMemberIDMap:
- groupIDToMemberIDMap[groupID] = {}
- memberIDToRevisionsMap = groupIDToMemberIDMap[groupID]
- if memberID not in memberIDToRevisionsMap:
- memberIDToRevisionsMap[memberID] = []
- revisionInfoList = memberIDToRevisionsMap[memberID]
- revisionInfoList.append(revisionInfo)
-
- # go though list an delete old revisions, leaving at least one unremoved member
- for groupID, memberIDToRevisionsMap in groupIDToMemberIDMap.iteritems():
- for memberID, revisionInfoList in memberIDToRevisionsMap.iteritems():
- revisionInfosToRemove = []
- revisionInfosToSave = []
- for revisionInfo in revisionInfoList:
- if revisionInfo[1] < minRevision:
- revisionInfosToRemove.append(revisionInfo)
- else:
- revisionInfosToSave.append(revisionInfo)
-
- # save at least one revision
- if revisionInfosToRemove and len(revisionInfosToRemove) == len(revisionInfoList):
- maxRevisionInfoToRemove = max(revisionInfosToRemove, key=lambda info: info[1])
- revisionInfosToSave.append(maxRevisionInfoToRemove)
- revisionInfosToRemove.remove(maxRevisionInfoToRemove)
-
- # get rid of extra removed member revisions
- if revisionInfosToSave and max(revisionInfosToSave, key=lambda info: not info[0])[0]:
- revisionInfosToRemove += revisionInfosToSave
-
- if revisionInfosToRemove:
- revisionsToRemove = [revisionInfoToRemove[1] for revisionInfoToRemove in revisionInfosToRemove]
- yield Delete(
- aboMembers,
- Where=(aboMembers.GROUP_ID == groupID).And(
- aboMembers.MEMBER_ID == memberID).And(
- aboMembers.REVISION.In(Parameter("revisionsToRemove", len(revisionsToRemove)))
- )
- ).on(txn, revisionsToRemove=revisionsToRemove)
</del></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py (12364 => 12365)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-01-16 22:22:25 UTC (rev 12364)
+++ CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-01-16 23:39:26 UTC (rev 12365)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twistedcaldav.config import config
</span><del>-from txdav.common.datastore.sql import deleteRevisionsBefore
</del><span class="cx"> from txdav.common.datastore.sql_tables import schema
</span><span class="cx"> import datetime
</span><span class="cx">
</span><span class="lines">@@ -53,12 +52,7 @@
</span><span class="cx"> yield Delete(From=self.table, Where=None).on(self.transaction)
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transaction))[0][0])
</del><ins>+ minValidRevision = int((yield self.transaction.calendarserverValue("MIN-VALID-REVISION")))
</ins><span class="cx">
</span><span class="cx"> # get max revision on table rows before dateLimit
</span><span class="cx"> dateLimit = (datetime.datetime.utcnow() -
</span><span class="lines">@@ -84,12 +78,8 @@
</span><span class="cx"> maxRevOlderThanDate = tableMaxRevision
</span><span class="cx">
</span><span class="cx"> if maxRevOlderThanDate > minValidRevision:
</span><del>- # save it
- cs = schema.CALENDARSERVER
- yield Update(
- {cs.VALUE: maxRevOlderThanDate},
- Where=cs.NAME == "MIN-VALID-REVISION",
- ).on(self.transaction)
</del><ins>+ # save new min valid revision
+ yield self.transaction.updateCalendarserverValue("MIN-VALID-REVISION", maxRevOlderThanDate)
</ins><span class="cx">
</span><span class="cx"> # Schedule revision cleanup
</span><span class="cx"> yield RevisionCleanupWork._schedule(self.transaction, seconds=0)
</span><span class="lines">@@ -124,15 +114,10 @@
</span><span class="cx"> yield Delete(From=self.table, Where=None).on(self.transaction)
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transaction))[0][0])
</del><ins>+ minValidRevision = int((yield self.transaction.calendarserverValue("MIN-VALID-REVISION")))
</ins><span class="cx">
</span><span class="cx"> # delete revisions
</span><del>- yield deleteRevisionsBefore(self.transaction, minValidRevision)
</del><ins>+ yield self.transaction.deleteRevisionsBefore(minValidRevision)
</ins><span class="cx">
</span><span class="cx"> # Schedule next update
</span><span class="cx"> yield FindMinValidRevisionWork._schedule(
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py (12364 => 12365)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-16 22:22:25 UTC (rev 12364)
+++ CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-01-16 23:39:26 UTC (rev 12365)
</span><span class="lines">@@ -293,13 +293,8 @@
</span><span class="cx"> yield wp.whenExecuted()
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision and check it
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transactionUnderTest()))[0][0])
- self.assertEqual(minValidRevision, max([row[0] for row in revisionRows]))
</del><ins>+ minValidRevision = yield self.transactionUnderTest().calendarserverValue("MIN-VALID-REVISION")
+ self.assertEqual(int(minValidRevision), max([row[0] for row in revisionRows]))
</ins><span class="cx">
</span><span class="cx"> # do RevisionCleanupWork
</span><span class="cx"> wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</span><span class="lines">@@ -346,13 +341,8 @@
</span><span class="cx"> yield wp.whenExecuted()
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision and check it
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transactionUnderTest()))[0][0])
- self.assertEqual(minValidRevision, max([row[0] for row in revisionRows]))
</del><ins>+ minValidRevision = yield self.transactionUnderTest().calendarserverValue("MIN-VALID-REVISION")
+ self.assertEqual(int(minValidRevision), max([row[0] for row in revisionRows]))
</ins><span class="cx">
</span><span class="cx"> # do RevisionCleanupWork
</span><span class="cx"> wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</span><span class="lines">@@ -403,13 +393,8 @@
</span><span class="cx"> yield wp.whenExecuted()
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision and check it
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transactionUnderTest()))[0][0])
- self.assertEqual(minValidRevision, max([row[0] for row in revisionRows]))
</del><ins>+ minValidRevision = yield self.transactionUnderTest().calendarserverValue("MIN-VALID-REVISION")
+ self.assertEqual(int(minValidRevision), max([row[0] for row in revisionRows]))
</ins><span class="cx">
</span><span class="cx"> # do RevisionCleanupWork
</span><span class="cx"> wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</span><span class="lines">@@ -481,13 +466,8 @@
</span><span class="cx"> yield wp.whenExecuted()
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision and check it
</span><del>- cs = schema.CALENDARSERVER
- minValidRevision = int((yield Select(
- [cs.VALUE],
- From=cs,
- Where=(cs.NAME == "MIN-VALID-REVISION")
- ).on(self.transactionUnderTest()))[0][0])
- self.assertEqual(minValidRevision, max([row[3] for row in group1Rows + group2Rows]))
</del><ins>+ minValidRevision = yield self.transactionUnderTest().calendarserverValue("MIN-VALID-REVISION")
+ self.assertEqual(int(minValidRevision), max([row[3] for row in group1Rows + group2Rows]))
</ins><span class="cx">
</span><span class="cx"> # do RevisionCleanupWork
</span><span class="cx"> wp = yield self.transactionUnderTest().enqueue(RevisionCleanupWork, notBefore=datetime.datetime.utcnow())
</span></span></pre>
</div>
</div>
</body>
</html>