<!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>[11895] CalendarServer/branches/users/sagen/groupcacher</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/11895">11895</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2013-11-06 14:20:51 -0800 (Wed, 06 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint -- groupByGUID will handle adding the row</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhodelegatespy">CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhogroupspy">CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertwextwhotesttest_groupspy">CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py</a></li>
<li><a href="#CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhodelegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py (11894 => 11895)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py 2013-11-06 22:19:12 UTC (rev 11894)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/delegates.py 2013-11-06 22:20:51 UTC (rev 11895)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> else:
</span><span class="cx"> yield txn.addDelegate(delegator.guid, delegate.guid,
</span><span class="cx"> 1 if readWrite else 0, False)
</span><ins>+
</ins><span class="cx">
</span><span class="cx"> def removeDelegate(txn, delegator, delegate, readWrite):
</span><span class="cx"> """
</span><span class="lines">@@ -55,6 +56,7 @@
</span><span class="cx"> return txn.removeDelegate(delegator.guid, delegate.guid,
</span><span class="cx"> 1 if readWrite else 0, delegate.recordType==RecordType.group)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def delegatesOf(txn, delegator, readWrite):
</span><span class="cx"> """
</span><span class="lines">@@ -70,6 +72,7 @@
</span><span class="cx"> records.append(record)
</span><span class="cx"> returnValue(records)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def delegateFor(txn, delegate, readWrite):
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py (11894 => 11895)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-11-06 22:19:12 UTC (rev 11894)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py 2013-11-06 22:20:51 UTC (rev 11895)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def doWork(self):
</span><span class="cx">
</span><del>- # Delete all other work items
- yield Delete(From=self.table, Where=None).on(self.transaction)
</del><ins>+ # Delete all other work items for this group
+ yield Delete(From=self.table, Where=(self.table.GROUP_GUID == self.groupGUID)).on(self.transaction)
</ins><span class="cx">
</span><span class="cx"> groupCacher = getattr(self.transaction, "_groupCacher", None)
</span><span class="cx"> if groupCacher is not None:
</span><span class="lines">@@ -182,15 +182,8 @@
</span><span class="cx"> for member in members:
</span><span class="cx"> membershipHashContent.update(member.guid)
</span><span class="cx"> membershipHash = membershipHashContent.hexdigest()
</span><del>- results = (yield txn.groupByGUID(groupGUID))
- if not results:
- # Group is not yet in the DB
- cachedName = ""
- cachedMembershipHash = ""
- addGroup = True
- else:
- groupID, cachedName, cachedMembershipHash = results[0]
- addGroup = False
</del><ins>+ groupID, cachedName, cachedMembershipHash = (yield
+ txn.groupByGUID(groupGUID))
</ins><span class="cx">
</span><span class="cx"> if cachedMembershipHash != membershipHash:
</span><span class="cx"> membershipChanged = True
</span><span class="lines">@@ -198,11 +191,7 @@
</span><span class="cx"> else:
</span><span class="cx"> membershipChanged = False
</span><span class="cx">
</span><del>- if addGroup:
- yield txn.addGroup(groupGUID, record.fullNames[0], membershipHash)
- else:
- yield txn.updateGroup(groupGUID, record.fullNames[0],
- membershipHash)
</del><ins>+ yield txn.updateGroup(groupGUID, record.fullNames[0], membershipHash)
</ins><span class="cx">
</span><span class="cx"> results = (yield txn.groupByGUID(groupGUID))
</span><span class="cx"> if len(results) == 1:
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertwextwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py (11894 => 11895)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-11-06 22:19:12 UTC (rev 11894)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/test/test_groups.py 2013-11-06 22:20:51 UTC (rev 11895)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> from twext.who.idirectory import RecordType
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><ins>+from txdav.common.icommondatastore import NotFoundError
</ins><span class="cx">
</span><span class="cx"> class GroupCacherTest(StoreTestCase):
</span><span class="cx">
</span><span class="lines">@@ -65,10 +66,10 @@
</span><span class="cx"> guid = "49b350c69611477b94d95516b13856ab"
</span><span class="cx"> yield self.groupCacher.refreshGroup(txn, guid)
</span><span class="cx">
</span><del>- groupID, name, membershipHash = (yield txn.groupByGUID(guid))[0]
</del><ins>+ groupID, name, membershipHash = (yield txn.groupByGUID(guid))
</ins><span class="cx"> self.assertEquals(membershipHash, "e90052eb63d47f32d5b03df0073f7854")
</span><span class="cx">
</span><del>- groupGUID, name, membershipHash = (yield txn.groupByID(groupID))[0]
</del><ins>+ groupGUID, name, membershipHash = (yield txn.groupByID(groupID))
</ins><span class="cx"> self.assertEquals(groupGUID, guid)
</span><span class="cx"> self.assertEquals(name, "Top Group 1")
</span><span class="cx"> self.assertEquals(membershipHash, "e90052eb63d47f32d5b03df0073f7854")
</span><span class="lines">@@ -99,7 +100,7 @@
</span><span class="cx"> # Refresh the group so it's assigned a group_id
</span><span class="cx"> guid = "49b350c69611477b94d95516b13856ab"
</span><span class="cx"> yield self.groupCacher.refreshGroup(txn, guid)
</span><del>- groupID, name, membershipHash = (yield txn.groupByGUID(guid))[0]
</del><ins>+ groupID, name, membershipHash = (yield txn.groupByGUID(guid))
</ins><span class="cx">
</span><span class="cx"> # Remove two members, and add one member
</span><span class="cx"> newSet = set()
</span><span class="lines">@@ -126,6 +127,23 @@
</span><span class="cx"> self.assertEquals(len(records), 0)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_groupByID(self):
+
+ store = self.storeUnderTest()
+ txn = store.newTransaction()
+
+ # Non-existent groupID
+ self.failUnlessFailure(txn.groupByID(42), NotFoundError)
+
+ guid = "49b350c69611477b94d95516b13856ab"
+ hash = "e90052eb63d47f32d5b03df0073f7854"
+ yield self.groupCacher.refreshGroup(txn, guid)
+ groupID, name, membershipHash = (yield txn.groupByGUID(guid))
+ results = (yield txn.groupByID(groupID))
+ self.assertEquals([guid, "Top Group 1", hash], results)
+
+
</ins><span class="cx"> testXMLConfig = """<?xml version="1.0" encoding="utf-8"?>
</span><span class="cx">
</span><span class="cx"> <directory realm="xyzzy">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagengroupcachertxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py (11894 => 11895)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-06 22:19:12 UTC (rev 11894)
+++ CalendarServer/branches/users/sagen/groupcacher/txdav/common/datastore/sql.py 2013-11-06 22:20:51 UTC (rev 11895)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> HomeChildNameAlreadyExistsError, NoSuchHomeChildError, \
</span><span class="cx"> ObjectResourceNameNotAllowedError, ObjectResourceNameAlreadyExistsError, \
</span><span class="cx"> NoSuchObjectResourceError, AllRetriesFailed, InvalidSubscriptionValues, \
</span><del>- InvalidIMIPTokenValues, TooManyObjectResourcesError
</del><ins>+ InvalidIMIPTokenValues, TooManyObjectResourcesError, NotFoundError
</ins><span class="cx"> from txdav.common.idirectoryservice import IStoreDirectoryService
</span><span class="cx"> from txdav.common.inotifications import INotificationCollection, \
</span><span class="cx"> INotificationObject
</span><span class="lines">@@ -876,7 +876,8 @@
</span><span class="cx"> gr = schema.GROUPS
</span><span class="cx"> return Insert({gr.NAME: Parameter("name"),
</span><span class="cx"> gr.GROUP_GUID: Parameter("groupGUID"),
</span><del>- gr.MEMBERSHIP_HASH: Parameter("membershipHash")})
</del><ins>+ gr.MEMBERSHIP_HASH: Parameter("membershipHash")},
+ Return=gr.GROUP_ID)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @classproperty
</span><span class="lines">@@ -926,12 +927,41 @@
</span><span class="cx"> membershipHash=membershipHash)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def groupByGUID(self, groupGUID):
</span><del>- return self._groupByGUID.on(self, groupGUID=groupGUID)
</del><ins>+ results = (yield self._groupByGUID.on(self, groupGUID=groupGUID))
+ if results:
+ returnValue(results[0])
+ else:
+ savepoint = SavepointAction("groupByGUID")
+ yield savepoint.acquire(self)
+ try:
+ groupID = (yield self.addGroup(groupGUID, "", ""))[0][0]
+ except Exception:
+ yield savepoint.rollback(self)
+ results = (yield self._groupByGUID.on(self,
+ groupGUID=groupGUID))
+ if results:
+ returnValue(results[0])
+ else:
+ raise
+ else:
+ yield savepoint.release(self)
+ results = (yield self._groupByGUID.on(self,
+ groupGUID=groupGUID))
+ if results:
+ returnValue(results[0])
+ else:
+ raise
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def groupByID(self, groupID):
</span><del>- return self._groupByID.on(self, groupID=groupID)
</del><ins>+ try:
+ results = (yield self._groupByID.on(self, groupID=groupID))[0]
+ returnValue(results)
+ except IndexError:
+ raise NotFoundError
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def deleteGroup(self, groupID):
</span></span></pre>
</div>
</div>
</body>
</html>