<!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>[11823] CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py</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/11823">11823</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2013-10-18 11:00:10 -0700 (Fri, 18 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>delete old group revisions in owned or fully shared address books</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayasharedgroupfixestxdavcarddavdatastoresqlpy">CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayasharedgroupfixestxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py (11822 => 11823)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py 2013-10-17 14:54:34 UTC (rev 11822)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/carddav/datastore/sql.py 2013-10-18 18:00:10 UTC (rev 11823)
</span><span class="lines">@@ -1667,23 +1667,26 @@
</span><span class="cx"> if partiallyShared:
</span><span class="cx"> groupIDsToRemoveFrom = groupIDs & readWriteObjectIDs
</span><span class="cx"> groupIDs -= readWriteObjectIDs
</span><del>- else:
- groupIDsToRemoveFrom = groupIDs
</del><span class="cx">
</span><del>- # add to member table rows marked removed
- for groupIDToRemoveFrom in groupIDsToRemoveFrom:
- yield self._insertMemberIDQuery.on(self._txn,
- groupID=groupIDToRemoveFrom,
- addressbookID=self._ownerAddressBookResourceID,
- memberID=self._resourceID,
- revision=self._syncTokenRevision,
- removed=True,
- )
- if partiallyShared:
</del><ins>+ # add to member table rows marked removed
+ for groupIDToRemoveFrom in groupIDsToRemoveFrom:
+ yield self._insertMemberIDQuery.on(self._txn,
+ groupID=groupIDToRemoveFrom,
+ addressbookID=self._ownerAddressBookResourceID,
+ memberID=self._resourceID,
+ revision=self._syncTokenRevision,
+ removed=True,
+ )
</ins><span class="cx"> groupObject = yield self.addressbook().objectResourceWithID(groupIDToRemoveFrom)
</span><span class="cx"> yield self.addressbook()._updateRevision(groupObject.name())
</span><span class="cx">
</span><del>- # add to foreign member table row by UID (aboForeignMembers on address books)
</del><ins>+ else:
+ yield Delete(
+ aboMembers,
+ Where=aboMembers.MEMBER_ID == self._resourceID,
+ ).on(self._txn)
+
+ # add to foreign member table row by member address (aboForeignMembers on address books)
</ins><span class="cx"> memberAddress = "urn:uuid:" + self._uid
</span><span class="cx"> aboForeignMembers = schema.ABO_FOREIGN_MEMBERS
</span><span class="cx"> for groupID in groupIDs:
</span><span class="lines">@@ -1694,17 +1697,23 @@
</span><span class="cx"> ).on(self._txn)
</span><span class="cx">
</span><span class="cx"> if self.kind() == _ABO_KIND_GROUP:
</span><del>- # mark members as deleted
- memberIDsToRemove = yield AddressBook.memberIDsWithGroupIDs(self._txn, [self._resourceID])
- for memberIDToRemove in memberIDsToRemove:
- yield self._insertMemberIDQuery.on(
- self._txn,
- groupID=self._resourceID,
- addressbookID=self._ownerAddressBookResourceID,
- memberID=memberIDToRemove,
- revision=self._syncTokenRevision,
- removed=True,
- )
</del><ins>+ if partiallyShared:
+ # mark members as deleted
+ memberIDsToRemove = yield AddressBook.memberIDsWithGroupIDs(self._txn, [self._resourceID])
+ for memberIDToRemove in memberIDsToRemove:
+ yield self._insertMemberIDQuery.on(
+ self._txn,
+ groupID=self._resourceID,
+ addressbookID=self._ownerAddressBookResourceID,
+ memberID=memberIDToRemove,
+ revision=self._syncTokenRevision,
+ removed=True,
+ )
+ else:
+ yield Delete(
+ aboMembers,
+ Where=aboMembers.GROUP_ID == self._resourceID,
+ ).on(self._txn)
</ins><span class="cx">
</span><span class="cx"> yield super(AddressBookObject, self).remove()
</span><span class="cx"> self._kind = None
</span><span class="lines">@@ -2064,6 +2073,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><ins>+ def _deleteMembersWithGroupIDAndMemberIDsQuery(cls, groupID, memberIDs):
+ aboMembers = schema.ABO_MEMBERS
+ return Delete(
+ aboMembers,
+ Where=(aboMembers.GROUP_ID == groupID).And(
+ aboMembers.MEMBER_ID.In(Parameter("memberIDs", len(memberIDs)))))
+
+
+ @classmethod
</ins><span class="cx"> def _deleteForeignMembersWithGroupIDAndMembeAddrsQuery(cls, groupID, memberAddrs):
</span><span class="cx"> aboForeignMembers = schema.ABO_FOREIGN_MEMBERS
</span><span class="cx"> return Delete(
</span><span class="lines">@@ -2108,6 +2126,27 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @classmethod
+ def _deleteMembersIDsThruRevisionQuery(cls, groupIDs, memberIDs):
+ """
+ DAL statement deletes rows with groupsIDs and memberIDs < revision
+
+ Note: Used after adding a member row in an owned address book, where only the last revision is needed.
+ Could be used after adding a member row to a partially shared address book if the
+ minimum valid revision is known.
+ "minimum valid revision" is the max of the bind revisions on a home over all
+ shared address books that have group binds.
+ """
+ aboMembers = schema.ABO_MEMBERS
+ return Delete(
+ aboMembers,
+ Where=(aboMembers.GROUP_ID.In(Parameter("groupIDs", len(groupIDs)))).And(
+ aboMembers.GROUP_ID.In(Parameter("memberIDs", len(memberIDs)))).And(
+ aboMembers.REVISION < Parameter("revision")
+ )
+ )
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def updateDatabase(self, component, expand_until=None, reCreate=False, #@UnusedVariable
</span><span class="cx"> inserting=False):
</span><span class="lines">@@ -2194,6 +2233,7 @@
</span><span class="cx">
</span><span class="cx"> abo = schema.ADDRESSBOOK_OBJECT
</span><span class="cx"> aboForeignMembers = schema.ABO_FOREIGN_MEMBERS
</span><ins>+ partiallyShared = not self.owned() and not self.addressbook().fullyShared()
</ins><span class="cx">
</span><span class="cx"> if inserting:
</span><span class="cx"> self._resourceID, self._created, self._modified = (
</span><span class="lines">@@ -2208,7 +2248,7 @@
</span><span class="cx"> )
</span><span class="cx"> )[0]
</span><span class="cx">
</span><del>- # delete foreign members table rows for this object, keeping revision
</del><ins>+ # delete foreign members table rows for this object
</ins><span class="cx"> groupIDRows = yield Delete(
</span><span class="cx"> aboForeignMembers,
</span><span class="cx"> Where=aboForeignMembers.MEMBER_ADDRESS == "urn:uuid:" + self._uid,
</span><span class="lines">@@ -2217,7 +2257,7 @@
</span><span class="cx"> groupIDs = set([groupIDRow[0] for groupIDRow in groupIDRows])
</span><span class="cx">
</span><span class="cx"> # add this object to shared groups
</span><del>- if not self.owned() and not self.addressbook().fullyShared():
</del><ins>+ if partiallyShared:
</ins><span class="cx"> readWriteGroupIDs = yield self.addressbook().readWriteGroupIDs()
</span><span class="cx"> assert readWriteGroupIDs, "no access"
</span><span class="cx"> groupIDs |= readWriteGroupIDs
</span><span class="lines">@@ -2236,6 +2276,11 @@
</span><span class="cx"> removed=False,
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ # clean old revisions
+ if groupIDs and not partiallyShared:
+ yield self._deleteMembersIDsThruRevisionQuery(groupIDs, [self._resourceID]).on(
+ self._txn, groupIDs=groupIDs, memberIDs=[self._resourceID], revision=self._syncTokenRevision)
+
</ins><span class="cx"> else:
</span><span class="cx"> self._modified = (yield Update(
</span><span class="cx"> {abo.VCARD_TEXT: self._objectText,
</span><span class="lines">@@ -2255,16 +2300,37 @@
</span><span class="cx"> memberIDsToRemove = set(currentMemberIDs) - set(memberIDs)
</span><span class="cx"> memberIDsToAdd = set(memberIDs) - set(currentMemberIDs)
</span><span class="cx">
</span><del>- for memberID in memberIDsToAdd | memberIDsToRemove:
</del><ins>+ for memberID in memberIDsToAdd:
</ins><span class="cx"> yield self._insertMemberIDQuery.on(
</span><span class="cx"> self._txn,
</span><span class="cx"> groupID=self._resourceID,
</span><span class="cx"> addressbookID=self._ownerAddressBookResourceID,
</span><span class="cx"> memberID=memberID,
</span><span class="cx"> revision=self._syncTokenRevision,
</span><del>- removed=memberID in memberIDsToRemove,
</del><ins>+ removed=False,
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+ if partiallyShared:
+ for memberID in memberIDsToRemove:
+ yield self._insertMemberIDQuery.on(
+ self._txn,
+ groupID=self._resourceID,
+ addressbookID=self._ownerAddressBookResourceID,
+ memberID=memberID,
+ revision=self._syncTokenRevision,
+ removed=True,
+ )
+ else:
+ # clean old revisions
+ if memberIDsToAdd:
+ yield self._deleteMembersIDsThruRevisionQuery([self._resourceID], memberIDsToAdd).on(
+ self._txn, groupIDs=[self._resourceID], memberIDs=memberIDsToAdd, revision=self._syncTokenRevision)
+
+ if memberIDsToRemove:
+ yield self._deleteMembersWithGroupIDAndMemberIDsQuery(self._resourceID, memberIDsToRemove).on(
+ self._txn, memberIDs=memberIDsToRemove
+ )
+
</ins><span class="cx"> # get current foreign members
</span><span class="cx"> currentForeignMemberRows = yield Select(
</span><span class="cx"> [aboForeignMembers.MEMBER_ADDRESS],
</span></span></pre>
</div>
</div>
</body>
</html>