<!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>[12666] 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/12666">12666</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-11 19:22:49 -0800 (Tue, 11 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure a missing home child revision does not cause an exception.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (12665 => 12666)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-02-12 02:17:03 UTC (rev 12665)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2014-02-12 03:22:49 UTC (rev 12666)
</span><span class="lines">@@ -1898,7 +1898,39 @@
</span><span class="cx"> self.assertNotEqual(caldata4, None)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_calendarMissingRevision(self):
+ """
+ Test that two concurrent attempts to add resources in two separate
+ calendar homes does not deadlock on the revision table update.
+ """
</ins><span class="cx">
</span><ins>+ # Get details
+ home = yield self.homeUnderTest(name="user01", create=True)
+ self.assertNotEqual(home, None)
+ calendar = yield home.childWithName("calendar")
+ self.assertNotEqual(calendar, None)
+
+ rev = calendar._revisionsSchema
+ yield Delete(
+ From=rev,
+ Where=(rev.HOME_RESOURCE_ID == Parameter("homeID")).And(
+ rev.COLLECTION_NAME == Parameter("collectionName"))
+ ).on(self.transactionUnderTest(), homeID=home.id(), collectionName="calendar")
+
+ yield self.commit()
+
+ home = yield self.homeUnderTest(name="user01")
+ children = yield home.loadChildren()
+ self.assertEqual(len(children), 3)
+ yield self.commit()
+
+ calendar = yield self.calendarUnderTest(home="user01", name="calendar")
+ token = yield calendar.syncToken()
+ self.assertTrue(token is not None)
+
+
+
</ins><span class="cx"> class SchedulingTests(CommonCommonTests, unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> CalendarObject splitting tests
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12665 => 12666)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-02-12 02:17:03 UTC (rev 12665)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-02-12 03:22:49 UTC (rev 12666)
</span><span class="lines">@@ -1417,7 +1417,6 @@
</span><span class="cx"> """
</span><span class="cx"> delegates = set()
</span><span class="cx">
</span><del>-
</del><span class="cx"> # First get the direct delegates
</span><span class="cx"> results = (
</span><span class="cx"> yield self._selectDelegatesQuery.on(
</span><span class="lines">@@ -2213,15 +2212,15 @@
</span><span class="cx">
</span><span class="cx"> class _EmptyCacher(object):
</span><span class="cx">
</span><del>- def set(self, key, value): #@UnusedVariable
</del><ins>+ def set(self, key, value):
</ins><span class="cx"> return succeed(True)
</span><span class="cx">
</span><span class="cx">
</span><del>- def get(self, key, withIdentifier=False): #@UnusedVariable
</del><ins>+ def get(self, key, withIdentifier=False):
</ins><span class="cx"> return succeed(None)
</span><span class="cx">
</span><span class="cx">
</span><del>- def delete(self, key): #@UnusedVariable
</del><ins>+ def delete(self, key):
</ins><span class="cx"> return succeed(True)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3579,7 +3578,8 @@
</span><span class="cx"> @classproperty
</span><span class="cx"> def _deleteSyncTokenQuery(cls):
</span><span class="cx"> """
</span><del>- DAL query to update a sync revision to be a tombstone instead.
</del><ins>+ DAL query to remove all child revision information. The revision for the collection
+ itself is not touched.
</ins><span class="cx"> """
</span><span class="cx"> rev = cls._revisionsSchema
</span><span class="cx"> return Delete(
</span><span class="lines">@@ -3593,7 +3593,7 @@
</span><span class="cx"> @classproperty
</span><span class="cx"> def _sharedRemovalQuery(cls):
</span><span class="cx"> """
</span><del>- DAL query to update the sync token for a shared collection.
</del><ins>+ DAL query to indicate a shared collection has been deleted.
</ins><span class="cx"> """
</span><span class="cx"> rev = cls._revisionsSchema
</span><span class="cx"> return Update({rev.RESOURCE_ID: None,
</span><span class="lines">@@ -3608,7 +3608,7 @@
</span><span class="cx"> @classproperty
</span><span class="cx"> def _unsharedRemovalQuery(cls):
</span><span class="cx"> """
</span><del>- DAL query to update the sync token for an owned collection.
</del><ins>+ DAL query to indicate an owned collection has been deleted.
</ins><span class="cx"> """
</span><span class="cx"> rev = cls._revisionsSchema
</span><span class="cx"> return Update({rev.RESOURCE_ID: None,
</span><span class="lines">@@ -3621,6 +3621,14 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _deletedSyncToken(self, sharedRemoval=False):
</span><ins>+ """
+ When a collection is deleted we remove all the revision information for its child resources.
+ We update the collection's sync token to indicate it has been deleted - that way a sync on
+ the home collection can report the deletion of the collection.
+
+ @param sharedRemoval: indicates whether the collection being removed is shared
+ @type sharedRemoval: L{bool}
+ """
</ins><span class="cx"> # Remove all child entries
</span><span class="cx"> yield self._deleteSyncTokenQuery.on(self._txn,
</span><span class="cx"> homeID=self._home._resourceID,
</span><span class="lines">@@ -4431,7 +4439,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> result = []
</span><del>- for homeUID, homeRID, resourceID, resourceName, bindMode, bindStatus, bindMessage in acceptedRows: #@UnusedVariable
</del><ins>+ for homeUID, homeRID, _ignore_resourceID, resourceName, bindMode, bindStatus, bindMessage in acceptedRows:
</ins><span class="cx"> invite = SharingInvitation(
</span><span class="cx"> resourceName,
</span><span class="cx"> self.ownerHome().name(),
</span><span class="lines">@@ -4914,7 +4922,7 @@
</span><span class="cx"> self._notifiers = None
</span><span class="cx">
</span><span class="cx">
</span><del>- def memoMe(self, key, memo): #@UnusedVariable
</del><ins>+ def memoMe(self, key, memo):
</ins><span class="cx"> """
</span><span class="cx"> Add this object to the memo dictionary in whatever fashion is appropriate.
</span><span class="cx">
</span><span class="lines">@@ -4972,14 +4980,14 @@
</span><span class="cx">
</span><span class="cx"> # Create the actual objects merging in properties
</span><span class="cx"> for dataRow in dataRows:
</span><del>- bindData = dataRow[:cls.bindColumnCount] #@UnusedVariable
</del><ins>+ bindData = dataRow[:cls.bindColumnCount]
</ins><span class="cx"> resourceID = bindData[cls.bindColumns().index(cls._bindSchema.RESOURCE_ID)]
</span><span class="cx"> additionalBindData = dataRow[cls.bindColumnCount:cls.bindColumnCount + len(cls.additionalBindColumns())]
</span><span class="cx"> metadataData = dataRow[cls.bindColumnCount + len(cls.additionalBindColumns()):]
</span><span class="cx"> propstore = propertyStores.get(resourceID, None)
</span><span class="cx">
</span><span class="cx"> child = yield cls.makeClass(home, bindData, additionalBindData, metadataData, propstore)
</span><del>- child._syncTokenRevision = revisions.get(resourceID)
</del><ins>+ child._syncTokenRevision = revisions.get(resourceID, 0)
</ins><span class="cx"> results.append(child)
</span><span class="cx">
</span><span class="cx"> returnValue(results)
</span><span class="lines">@@ -5480,7 +5488,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def _movedObjectResource(self, child, newparent): #@UnusedVariable
</del><ins>+ def _movedObjectResource(self, child, newparent):
</ins><span class="cx"> """
</span><span class="cx"> Method that subclasses can override to do an extra DB adjustments when a resource
</span><span class="cx"> is moved.
</span><span class="lines">@@ -6014,7 +6022,7 @@
</span><span class="cx"> returnValue(rows[0] if rows else None)
</span><span class="cx">
</span><span class="cx">
</span><del>- def __init__(self, parent, name, uid, resourceID=None, options=None): #@UnusedVariable
</del><ins>+ def __init__(self, parent, name, uid, resourceID=None, options=None):
</ins><span class="cx"> self._parentCollection = parent
</span><span class="cx"> self._resourceID = resourceID
</span><span class="cx"> self._name = name
</span><span class="lines">@@ -7096,7 +7104,7 @@
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><span class="cx">
</span><del>- def _loadPropertyStore(self, props=None, created=False): #@UnusedVariable
</del><ins>+ def _loadPropertyStore(self, props=None, created=False):
</ins><span class="cx"> if props is None:
</span><span class="cx"> props = NonePropertyStore(self._home.uid())
</span><span class="cx"> self._propertyStore = props
</span></span></pre>
</div>
</div>
</body>
</html>