<!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>[12193] CalendarServer/branches/users/gaya/cleanrevisions</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/12193">12193</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-12-23 13:49:21 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Works in simple tests; clean up names</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionscalendarservertapcaldavpy">CalendarServer/branches/users/gaya/cleanrevisions/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy">CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcarddavdatastoresqlpy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemacurrentoracledialectsql">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current-oracle-dialect.sql</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemacurrentsql">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_30_to_31sql">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_30_to_31.sql</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_30_to_31sql">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql</a></li>
<li><a href="#CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayacleanrevisionscalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/calendarserver/tap/caldav.py (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/calendarserver/tap/caldav.py 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/calendarserver/tap/caldav.py 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> yield scheduleNextMailPoll(self.store, int(config.LogID) if config.LogID else 5)
</span><span class="cx"> if self.doGroupCaching:
</span><span class="cx"> yield scheduleNextGroupCachingUpdate(self.store, int(config.LogID) if config.LogID else 5)
</span><del>- yield scheduleFirstFindMinRevision(self.store)
</del><ins>+ yield scheduleFirstFindMinRevision(self.store, int(config.LogID) if config.LogID else 5)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/twistedcaldav/stdconfig.py 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -625,9 +625,8 @@
</span><span class="cx">
</span><span class="cx"> "RemoveDuplicatePrivateComments": False, # Remove duplicate private comments on PUT
</span><span class="cx">
</span><del>- "SyncTokenLifetimeDays" : 16, # Number of days that a client sync report token is valid
</del><ins>+ "SyncTokenLifetimeDays" : 14, # Number of days that a client sync report token is valid
</ins><span class="cx"> "RevisionCleanupPeriodDays" : 2, # Number of days between revision cleanups
</span><del>- "RevisionCleanupPhaseDays" : 0.25, # Number of days between startup and the first revision cleanup
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> # CardDAV Features
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/carddav/datastore/sql.py (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/carddav/datastore/sql.py 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/carddav/datastore/sql.py 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -569,13 +569,13 @@
</span><span class="cx">
</span><span class="cx"> if revision:
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><del>- minRevision = int((yield Select(
</del><ins>+ minValidRevision = int((yield Select(
</ins><span class="cx"> [cs.VALUE],
</span><span class="cx"> From=cs,
</span><del>- Where=(cs.NAME == "MIN-REVISION")
</del><ins>+ Where=(cs.NAME == "MIN-VALID-REVISION")
</ins><span class="cx"> ).on(self._txn))[0][0])
</span><span class="cx">
</span><del>- if revision < minRevision:
</del><ins>+ if revision < 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="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql.py 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -2035,13 +2035,13 @@
</span><span class="cx"> deleted = set()
</span><span class="cx"> if revision:
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><del>- minRevision = int((yield Select(
</del><ins>+ minValidRevision = int((yield Select(
</ins><span class="cx"> [cs.VALUE],
</span><span class="cx"> From=cs,
</span><del>- Where=(cs.NAME == "MIN-REVISION")
</del><ins>+ Where=(cs.NAME == "MIN-VALID-REVISION")
</ins><span class="cx"> ).on(self._txn))[0][0])
</span><span class="cx">
</span><del>- if revision < minRevision:
</del><ins>+ if revision < minValidRevision:
</ins><span class="cx"> raise SyncTokenValidException
</span><span class="cx">
</span><span class="cx"> results = [
</span><span class="lines">@@ -2478,13 +2478,13 @@
</span><span class="cx"> deleted = []
</span><span class="cx"> if revision:
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><del>- minRevision = int((yield Select(
</del><ins>+ minValidRevision = int((yield Select(
</ins><span class="cx"> [cs.VALUE],
</span><span class="cx"> From=cs,
</span><del>- Where=(cs.NAME == "MIN-REVISION")
</del><ins>+ Where=(cs.NAME == "MIN-VALID-REVISION")
</ins><span class="cx"> ).on(self._txn))[0][0])
</span><span class="cx">
</span><del>- if revision < minRevision:
</del><ins>+ if revision < minValidRevision:
</ins><span class="cx"> raise SyncTokenValidException
</span><span class="cx">
</span><span class="cx"> results = [
</span><span class="lines">@@ -6226,15 +6226,19 @@
</span><span class="cx">
</span><span class="cx"> # get groups where this object was once a member and version info
</span><span class="cx"> aboMembers = schema.ABO_MEMBERS
</span><del>- groupRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID, aboMembers.DELETED, aboMembers.REVISION],
</del><ins>+ groupRows = yield Select(
+ [aboMembers.GROUP_ID,
+ aboMembers.MEMBER_ID,
+ aboMembers.REMOVED,
+ aboMembers.REVISION],
</ins><span class="cx"> From=aboMembers,
</span><span class="cx"> ).on(txn)
</span><span class="cx">
</span><span class="cx"> # group results by group, member, and revisionInfo
</span><span class="cx"> groupIDToMemberIDMap = {}
</span><span class="cx"> for groupRow in groupRows:
</span><del>- groupID, memberID, deleted, revision = groupRow
- revisionInfo = [deleted, revision]
</del><ins>+ groupID, memberID, removed, revision = groupRow
+ revisionInfo = [removed, revision]
</ins><span class="cx"> if groupID not in groupIDToMemberIDMap:
</span><span class="cx"> groupIDToMemberIDMap[groupID] = {}
</span><span class="cx"> memberIDToRevisionsMap = groupIDToMemberIDMap[groupID]
</span><span class="lines">@@ -6243,7 +6247,7 @@
</span><span class="cx"> revisionInfoList = memberIDToRevisionsMap[memberID]
</span><span class="cx"> revisionInfoList.append(revisionInfo)
</span><span class="cx">
</span><del>- # go though list an delete old revisions, leaving at least one undeleted member
</del><ins>+ # go though list an delete old revisions, leaving at least one unremoved member
</ins><span class="cx"> for groupID, memberIDToRevisionsMap in groupIDToMemberIDMap.iteritems():
</span><span class="cx"> for memberID, revisionInfoList in memberIDToRevisionsMap.iteritems():
</span><span class="cx">
</span><span class="lines">@@ -6251,7 +6255,7 @@
</span><span class="cx"> maxRevisionInfoToRemove = None
</span><span class="cx"> revisionsToSave = []
</span><span class="cx"> for revisionInfo in revisionInfoList:
</span><del>- deleted, revision = revisionInfo
</del><ins>+ removed, revision = revisionInfo
</ins><span class="cx"> if revision < minRevision:
</span><span class="cx"> revisionsToRemove.append(revision)
</span><span class="cx"> if not maxRevisionInfoToRemove or revision > maxRevisionInfoToRemove[1]:
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -372,6 +372,11 @@
</span><span class="cx"> "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+create table FIND_MIN_VALID_REVISION_WORK (
+ "WORK_ID" integer primary key not null,
+ "NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
</ins><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx"> "WORK_ID" integer primary key not null,
</span><span class="cx"> "NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</span><span class="lines">@@ -386,7 +391,7 @@
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('MIN-REVISION', '1');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</ins><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span><span class="cx"> DEFAULT_EVENTS
</span><span class="cx"> );
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current.sql (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current.sql 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/current.sql 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -710,6 +710,11 @@
</span><span class="cx"> -- Revision Cleaner Work --
</span><span class="cx"> ---------------------------
</span><span class="cx">
</span><ins>+create table FIND_MIN_VALID_REVISION_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
</ins><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx"> WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx"> NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span><span class="lines">@@ -728,4 +733,4 @@
</span><span class="cx"> insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</span><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><del>-insert into CALENDARSERVER values ('MIN-REVISION', '1');
</del><ins>+insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</ins></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_30_to_31sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_30_to_31.sql (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_30_to_31.sql 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_30_to_31.sql 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -29,8 +29,12 @@
</span><span class="cx"> alter table NOTIFICATION_OBJECT_REVISIONS
</span><span class="cx"> add ("MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC');
</span><span class="cx">
</span><del>- -- Add cleanup work table --
</del><ins>+ -- Add cleanup work tables --
</ins><span class="cx">
</span><ins>+create table FIND_MIN_VALID_REVISION_WORK (
+ "WORK_ID" integer primary key not null,
+ "NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
</ins><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx"> "WORK_ID" integer primary key not null,
</span><span class="cx"> "NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_30_to_31sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -29,8 +29,12 @@
</span><span class="cx"> alter table NOTIFICATION_OBJECT_REVISIONS
</span><span class="cx"> add column MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP);
</span><span class="cx">
</span><del>- -- Add cleanup work table --
</del><ins>+ -- Add cleanup work tables --
</ins><span class="cx">
</span><ins>+create table FIND_MIN_VALID_REVISION_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null,
+ NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
</ins><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx"> WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null,
</span><span class="cx"> NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayacleanrevisionstxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py (12192 => 12193)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2013-12-23 21:32:37 UTC (rev 12192)
+++ CalendarServer/branches/users/gaya/cleanrevisions/txdav/common/datastore/work/revision_cleanup.py 2013-12-23 21:49:21 UTC (rev 12193)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><del>-class FindMinRevisionWork(WorkItem,
- fromTable(schema.REVISION_CLEANUP_WORK)):
</del><ins>+class FindMinValidRevisionWork(WorkItem,
+ fromTable(schema.FIND_MIN_VALID_REVISION_WORK)):
</ins><span class="cx">
</span><span class="cx"> group = "find_min_revision"
</span><span class="cx">
</span><span class="lines">@@ -45,16 +45,16 @@
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><del>- minRevision = int((yield Select(
</del><ins>+ minValidRevision = int((yield Select(
</ins><span class="cx"> [cs.VALUE],
</span><span class="cx"> From=cs,
</span><del>- Where=(cs.NAME == "MIN-REVISION")
</del><ins>+ Where=(cs.NAME == "MIN-VALID-REVISION")
</ins><span class="cx"> ).on(self.transaction))[0][0])
</span><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="cx"> datetime.timedelta(days=float(config.SyncTokenLifetimeDays)))
</span><del>- maxRevision = 0
</del><ins>+ maxRevOlderThanDate = 0
</ins><span class="cx">
</span><span class="cx"> # TODO: Use one Select statement
</span><span class="cx"> for table in (
</span><span class="lines">@@ -65,23 +65,21 @@
</span><span class="cx"> ):
</span><span class="cx"> revisionRows = yield Select(
</span><span class="cx"> [Max(table.REVISION)],
</span><del>- From=Select(
- [table.REVISION],
- From=table,
- Where=(table.MODIFIED < dateLimit),
- ).on(self.transaction)
- )
</del><ins>+ From=table,
+ Where=(table.MODIFIED < dateLimit),
+ ).on(self.transaction)
+
</ins><span class="cx"> if revisionRows:
</span><span class="cx"> tableMaxRevision = revisionRows[0][0]
</span><del>- if tableMaxRevision > maxRevision:
- maxRevison = tableMaxRevision
</del><ins>+ if tableMaxRevision > maxRevOlderThanDate:
+ maxRevOlderThanDate = tableMaxRevision
</ins><span class="cx">
</span><del>- if maxRevision > minRevision:
</del><ins>+ if maxRevOlderThanDate > minValidRevision:
</ins><span class="cx"> # save it
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><span class="cx"> yield Update(
</span><del>- {cs.VALUE: minRevision},
- Where=cs.NAME == "MIN-REVISION",
</del><ins>+ {cs.VALUE: maxRevOlderThanDate},
+ Where=cs.NAME == "MIN-VALID-REVISION",
</ins><span class="cx"> ).on(self.transaction)
</span><span class="cx">
</span><span class="cx"> # Schedule revision cleanup
</span><span class="lines">@@ -95,8 +93,8 @@
</span><span class="cx"> # Schedule next update
</span><span class="cx"> notBefore = (datetime.datetime.utcnow() +
</span><span class="cx"> datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
</span><del>- log.debug("Rescheduling find minimum revision work: %s" % (notBefore,))
- yield self.transaction.enqueue(FindMinRevisionWork,
</del><ins>+ log.debug("Rescheduling find minimum valid revision work: %s" % (notBefore,))
+ yield self.transaction.enqueue(FindMinValidRevisionWork,
</ins><span class="cx"> notBefore=notBefore)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -114,30 +112,29 @@
</span><span class="cx">
</span><span class="cx"> # Get the minimum valid revision
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><del>- minRevision = int((yield Select(
</del><ins>+ minValidRevision = int((yield Select(
</ins><span class="cx"> [cs.VALUE],
</span><span class="cx"> From=cs,
</span><del>- Where=(cs.NAME == "MIN-REVISION")
</del><ins>+ Where=(cs.NAME == "MIN-VALID-REVISION")
</ins><span class="cx"> ).on(self.transaction))[0][0])
</span><span class="cx">
</span><span class="cx"> # delete revisions
</span><del>- yield deleteRevisionsBefore(self.transaction, minRevision)
</del><ins>+ yield deleteRevisionsBefore(self.transaction, minValidRevision)
</ins><span class="cx">
</span><span class="cx"> # Schedule next update
</span><span class="cx"> notBefore = (datetime.datetime.utcnow() +
</span><span class="cx"> datetime.timedelta(days=float(config.RevisionCleanupPeriodDays)))
</span><del>- log.debug("Rescheduling find minimum revision work: %s" % (notBefore,))
- yield self.transaction.enqueue(FindMinRevisionWork,
</del><ins>+ log.debug("Rescheduling find minimum valid revision work: %s" % (notBefore,))
+ yield self.transaction.enqueue(FindMinValidRevisionWork,
</ins><span class="cx"> notBefore=notBefore)
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>-def scheduleFirstFindMinRevision(store):
</del><ins>+def scheduleFirstFindMinRevision(store, seconds):
</ins><span class="cx"> txn = store.newTransaction()
</span><del>- notBefore = (datetime.datetime.utcnow() +
- datetime.timedelta(days=float(config.RevisionCleanupPhaseDays)))
- log.debug("Scheduling find minimum revision work: %s" % (notBefore,))
- wp = (yield txn.enqueue(FindMinRevisionWork, notBefore=notBefore))
</del><ins>+ notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=seconds)
+ log.debug("Scheduling first find minimum valid revision work: %s" % (notBefore,))
+ wp = (yield txn.enqueue(FindMinValidRevisionWork, notBefore=notBefore))
</ins><span class="cx"> yield txn.commit()
</span><span class="cx"> returnValue(wp)
</span></span></pre>
</div>
</div>
</body>
</html>