[CalendarServer-changes] [14492] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 2 09:03:04 PST 2015
Revision: 14492
http://trac.calendarserver.org//changeset/14492
Author: cdaboo at apple.com
Date: 2015-03-02 09:03:04 -0800 (Mon, 02 Mar 2015)
Log Message:
-----------
Fix problem with sync revision deletes after a revision purge has removed the old entry for the item being deleted. Also same problem for rename.
Modified Paths:
--------------
CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
CalendarServer/trunk/txdav/carddav/datastore/sql.py
CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py
CalendarServer/trunk/txdav/common/datastore/sql.py
CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-02 15:22:31 UTC (rev 14491)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-02 17:03:04 UTC (rev 14492)
@@ -2223,7 +2223,37 @@
yield self.commit()
+ @inlineCallbacks
+ def test_removeAfterRevisionCleanup(self):
+ """
+ Make sure L{Calendar}'s can be renamed after revision cleanup
+ removes their revision table entry..
+ """
+ yield self.homeUnderTest(name="user01", create=True)
+ cal = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(cal is not None)
+ yield self.commit()
+ # Remove the revision
+ cal = yield self.calendarUnderTest(home="user01", name="calendar")
+ yield cal.syncToken()
+ yield self.transactionUnderTest().deleteRevisionsBefore(cal._syncTokenRevision + 1)
+ yield self.commit()
+
+ # Rename the calendar
+ cal = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(cal is not None)
+ yield cal.rename("calendar_renamed")
+ yield self.commit()
+
+ cal = yield self.calendarUnderTest(home="user01", name="calendar")
+ self.assertTrue(cal is None)
+ cal = yield self.calendarUnderTest(home="user01", name="calendar_renamed")
+ self.assertTrue(cal is not None)
+ yield self.commit()
+
+
+
class SchedulingTests(CommonCommonTests, unittest.TestCase):
"""
CalendarObject splitting tests
Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2015-03-02 15:22:31 UTC (rev 14491)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2015-03-02 17:03:04 UTC (rev 14492)
@@ -602,6 +602,14 @@
self._txn, resourceID=self._resourceID, name=name, id=id))
if rows:
self._syncTokenRevision = rows[0][0]
+ else:
+ # Nothing was matched on the delete so insert a new row
+ self._syncTokenRevision = (
+ yield self._completelyNewDeletedRevisionQuery.on(
+ self._txn, homeID=self.ownerHome()._resourceID,
+ resourceID=self._resourceID, name=name)
+ )[0][0]
+
elif action == "update":
rows = (
yield self._updateBumpTokenQuery.on(
@@ -609,9 +617,14 @@
if rows:
self._syncTokenRevision = rows[0][0]
else:
- action = "insert"
+ # Nothing was matched on the update so insert a new row
+ self._syncTokenRevision = (
+ yield self._completelyNewRevisionQuery.on(
+ self._txn, homeID=self.ownerHome()._resourceID,
+ resourceID=self._resourceID, name=name)
+ )[0][0]
- if action == "insert":
+ elif action == "insert":
# Note that an "insert" may happen for a resource that previously
# existed and then was deleted. In that case an entry in the
# REVISIONS table still exists so we have to detect that and do db
Modified: CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py 2015-03-02 15:22:31 UTC (rev 14491)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py 2015-03-02 17:03:04 UTC (rev 14492)
@@ -917,3 +917,119 @@
obj = yield self.addressbookObjectUnderTest(name="data1.ics", addressbook_name="addressbook")
self.assertEqual(obj._dataversion, obj._currentDataVersion)
yield self.commit()
+
+
+ @inlineCallbacks
+ def test_updateAfterRevisionCleanup(self):
+ """
+ Make sure L{AddressBookObject}'s can be updated or removed after revision cleanup
+ removes their revision table entry..
+ """
+ person = """BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default1;;;
+FN:Default1 Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson1 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:uid-person
+X-ADDRESSBOOKSERVER-KIND:person
+END:VCARD
+"""
+ group = """BEGIN:VCARD
+VERSION:3.0
+N:Group;Fancy;;;
+FN:Fancy Group
+UID:uid-group
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:uid-person
+END:VCARD
+"""
+ group_update = """BEGIN:VCARD
+VERSION:3.0
+N:Group2;Fancy;;;
+FN:Fancy Group2
+UID:uid-group
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:uid-person
+END:VCARD
+"""
+
+ yield self.homeUnderTest()
+ adbk = yield self.addressbookUnderTest(name="addressbook")
+ yield adbk.createAddressBookObjectWithName("person.vcf", VCard.fromString(person))
+ yield adbk.createAddressBookObjectWithName("group.vcf", VCard.fromString(group))
+ yield self.commit()
+
+ # Remove the revision
+ adbk = yield self.addressbookUnderTest(name="addressbook")
+ yield adbk.syncToken()
+ yield self.transactionUnderTest().deleteRevisionsBefore(adbk._syncTokenRevision + 1)
+ yield self.commit()
+
+ # Update the object
+ obj = yield self.addressbookObjectUnderTest(name="group.vcf", addressbook_name="addressbook")
+ yield obj.setComponent(VCard.fromString(group_update))
+ yield self.commit()
+
+ obj = yield self.addressbookObjectUnderTest(name="group.vcf", addressbook_name="addressbook")
+ self.assertTrue(obj is not None)
+ obj = yield self.addressbookObjectUnderTest(name="person.vcf", addressbook_name="addressbook")
+ self.assertTrue(obj is not None)
+ yield self.commit()
+
+
+ @inlineCallbacks
+ def test_removeAfterRevisionCleanup(self):
+ """
+ Make sure L{AddressBookObject}'s can be updated or removed after revision cleanup
+ removes their revision table entry..
+ """
+ person = """BEGIN:VCARD
+VERSION:3.0
+N:Thompson;Default1;;;
+FN:Default1 Thompson
+EMAIL;type=INTERNET;type=WORK;type=pref:lthompson1 at example.com
+TEL;type=WORK;type=pref:1-555-555-5555
+TEL;type=CELL:1-444-444-4444
+item1.ADR;type=WORK;type=pref:;;1245 Test;Sesame Street;California;11111;USA
+item1.X-ABADR:us
+UID:uid-person
+X-ADDRESSBOOKSERVER-KIND:person
+END:VCARD
+"""
+ group = """BEGIN:VCARD
+VERSION:3.0
+N:Group;Fancy;;;
+FN:Fancy Group
+UID:uid-group
+X-ADDRESSBOOKSERVER-KIND:group
+X-ADDRESSBOOKSERVER-MEMBER:urn:uuid:uid-person
+END:VCARD
+"""
+
+ yield self.homeUnderTest()
+ adbk = yield self.addressbookUnderTest(name="addressbook")
+ yield adbk.createAddressBookObjectWithName("person.vcf", VCard.fromString(person))
+ yield adbk.createAddressBookObjectWithName("group.vcf", VCard.fromString(group))
+ yield self.commit()
+
+ # Remove the revision
+ adbk = yield self.addressbookUnderTest(name="addressbook")
+ yield adbk.syncToken()
+ yield self.transactionUnderTest().deleteRevisionsBefore(adbk._syncTokenRevision + 1)
+ yield self.commit()
+
+ # Remove the object
+ obj = yield self.addressbookObjectUnderTest(name="group.vcf", addressbook_name="addressbook")
+ self.assertTrue(obj is not None)
+ yield obj.remove()
+ yield self.commit()
+
+ obj = yield self.addressbookObjectUnderTest(name="group.vcf", addressbook_name="addressbook")
+ self.assertTrue(obj is None)
+ obj = yield self.addressbookObjectUnderTest(name="person.vcf", addressbook_name="addressbook")
+ self.assertTrue(obj is not None)
+ yield self.commit()
Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-02 15:22:31 UTC (rev 14491)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-02 17:03:04 UTC (rev 14492)
@@ -4259,9 +4259,13 @@
@inlineCallbacks
def _renameSyncToken(self):
- self._syncTokenRevision = (yield self._renameSyncTokenQuery.on(
- self._txn, name=self._name, resourceID=self._resourceID))[0][0]
- self._txn.bumpRevisionForObject(self)
+ rows = yield self._renameSyncTokenQuery.on(
+ self._txn, name=self._name, resourceID=self._resourceID)
+ if rows:
+ self._syncTokenRevision = rows[0][0]
+ self._txn.bumpRevisionForObject(self)
+ else:
+ yield self._initSyncToken()
@classproperty
@@ -4440,6 +4444,21 @@
)
+ @classproperty
+ def _completelyNewDeletedRevisionQuery(cls):
+ rev = cls._revisionsSchema
+ return Insert(
+ {
+ rev.HOME_RESOURCE_ID: Parameter("homeID"),
+ rev.RESOURCE_ID: Parameter("resourceID"),
+ rev.RESOURCE_NAME: Parameter("name"),
+ rev.REVISION: schema.REVISION_SEQ,
+ rev.DELETED: True
+ },
+ Return=rev.REVISION
+ )
+
+
@inlineCallbacks
def _changeRevision(self, action, name):
@@ -4452,6 +4471,13 @@
self._txn, resourceID=self._resourceID, name=name))
if rows:
self._syncTokenRevision = rows[0][0]
+ else:
+ self._syncTokenRevision = (
+ yield self._completelyNewDeletedRevisionQuery.on(
+ self._txn, homeID=self.ownerHome()._resourceID,
+ resourceID=self._resourceID, name=name)
+ )[0][0]
+
elif action == "update":
rows = (
yield self._updateBumpTokenQuery.on(
@@ -4459,9 +4485,13 @@
if rows:
self._syncTokenRevision = rows[0][0]
else:
- action = "insert"
+ self._syncTokenRevision = (
+ yield self._completelyNewRevisionQuery.on(
+ self._txn, homeID=self.ownerHome()._resourceID,
+ resourceID=self._resourceID, name=name)
+ )[0][0]
- if action == "insert":
+ elif action == "insert":
# Note that an "insert" may happen for a resource that previously
# existed and then was deleted. In that case an entry in the
# REVISIONS table still exists so we have to detect that and do db
Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2015-03-02 15:22:31 UTC (rev 14491)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2015-03-02 17:03:04 UTC (rev 14492)
@@ -346,7 +346,7 @@
token = yield homeChild.syncToken()
yield homeChild._changeRevision("delete", "E")
changed = yield homeChild.resourceNamesSinceToken(token)
- self.assertEqual(changed, ([], [], [],))
+ self.assertEqual(changed, ([], ["E"], [],))
yield txn.abort()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150302/24d86e46/attachment-0001.html>
More information about the calendarserver-changes
mailing list