[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [2358]
From: source_changes () macosforge ! org
Date: 2008-04-28 17:35:24
Message-ID: 20080428173524.6A8901608ABC () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 2358
http://trac.macosforge.org/projects/calendarserver/changeset/2358
Author: dreid@apple.com
Date: 2008-04-28 10:35:23 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
Add an object for watching if cache tokens have changed.
Modified Paths:
--------------
CalendarServer/branches/propfind-cache/twistedcaldav/cache.py
CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py
Modified: CalendarServer/branches/propfind-cache/twistedcaldav/cache.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/cache.py 2008-04-26 02:44:34 \
UTC (rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/cache.py 2008-04-28 17:35:23 \
UTC (rev 2358) @@ -26,17 +26,10 @@
name = "cacheTokens"
-class CacheChangeNotifier(object):
- def __init__(self, propertyStore):
- self._propertyStore = propertyStore
- self._propToken = None
- self._dataToken = None
+class CacheChangeLoaderMixin(object):
+ _propToken = None
+ _dataToken = None
- def _newDataToken(self):
- return uuid.uuid4()
-
- _newPropertyToken = _newDataToken
-
def _loadTokens(self):
try:
tokens = self._propertyStore.get(CacheTokensProperty.qname())
@@ -46,6 +39,19 @@
except HTTPError, e:
pass
+
+
+class CacheChangeNotifier(CacheChangeLoaderMixin):
+ def __init__(self, propertyStore):
+ self._propertyStore = propertyStore
+
+
+ def _newDataToken(self):
+ return uuid.uuid4()
+
+ _newPropertyToken = _newDataToken
+
+
def _writeTokens(self):
if self._propToken is None:
self._propToken = self._newPropertyToken()
@@ -57,12 +63,42 @@
self._dataToken))
self._propertyStore.set(property)
+
def propertiesChanged(self):
self._loadTokens()
self._propToken = self._newPropertyToken()
self._writeTokens()
+
def dataChanged(self):
self._loadTokens()
self._dataToken = self._newDataToken()
self._writeTokens()
+
+
+
+class CacheChangeObserver(CacheChangeLoaderMixin):
+ def __init__(self, propertyStore):
+ self._propertyStore = propertyStore
+ self._oldPropToken = None
+ self._oldDataToken = None
+
+
+ def propertiesHaveChanged(self):
+ self._loadTokens()
+
+ if self._propToken != self._oldPropToken:
+ self._oldPropToken = self._propToken
+ return True
+
+ return False
+
+
+ def dataHasChanged(self):
+ self._loadTokens()
+
+ if self._dataToken != self._oldDataToken:
+ self._oldDataToken = self._dataToken
+ return True
+
+ return False
Modified: CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py 2008-04-26 \
02:44:34 UTC (rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py 2008-04-28 \
17:35:23 UTC (rev 2358) @@ -18,7 +18,9 @@
from twisted.trial.unittest import TestCase
-from twistedcaldav.cache import CacheChangeNotifier, CacheTokensProperty
+from twistedcaldav.cache import CacheChangeNotifier
+from twistedcaldav.cache import CacheTokensProperty
+from twistedcaldav.cache import CacheChangeObserver
from twistedcaldav.test.util import InMemoryPropertyStore
@@ -45,6 +47,7 @@
self.ccn,
CacheChangeNotifier)
+
def test_unsetPropertiesAreProvisioned(self):
self.ccn.propertiesChanged()
tokens = self.props._properties[CacheTokensProperty.qname()
@@ -53,6 +56,7 @@
tokens,
'propToken0:dataToken0')
+
def test_changedPropertiesChangesPropToken(self):
self.ccn.propertiesChanged()
self.ccn.propertiesChanged()
@@ -71,3 +75,75 @@
self.assertEquals(
tokens,
'propToken0:dataToken1')
+
+
+
+class CacheChangeObserverTests(TestCase):
+ def setUp(self):
+ self.props = InMemoryPropertyStore()
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken0')
+ self.observer = CacheChangeObserver(self.props)
+
+
+ def test_propertiesHaveChangedNewObserver(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+ def test_propertiesHaveChanged(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken1:dataToken0')
+
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+ def test_propertiesHaveNotChanged(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), False)
+
+
+ def test_propertiesDoNotChangeData(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken1:dataToken0')
+
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+ def test_dataHasChanged(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken1')
+
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+ def test_dataHasChangedNewObserver(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+ def test_dataHasNotChanged(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+ def test_dataDoesNotChangeProperties(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken1')
+
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), False)
[Attachment #5 (text/html)]
<!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" /><style \
type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: \
6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; \
padding: 6px; } #msg ul { overflow: auto; }
#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>
<title>[2358] CalendarServer/branches/propfind-cache/twistedcaldav</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/calendarserver/changeset/2358">2358</a></dd>
<dt>Author</dt> <dd>dreid@apple.com</dd>
<dt>Date</dt> <dd>2008-04-28 10:35:23 -0700 (Mon, 28 Apr 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add an object for watching if cache tokens have changed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchespropfindcachetwistedcaldavcachepy">CalendarServer/branches/propfind-cache/twistedcaldav/cache.py</a></li>
<li><a href="#CalendarServerbranchespropfindcachetwistedcaldavtesttest_cachepy">CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchespropfindcachetwistedcaldavcachepy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/propfind-cache/twistedcaldav/cache.py (2357 => 2358)</h4> \
<pre class="diff"><span> <span class="info">--- \
CalendarServer/branches/propfind-cache/twistedcaldav/cache.py 2008-04-26 02:44:34 UTC \
(rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/cache.py 2008-04-28 17:35:23 \
UTC (rev 2358) </span><span class="lines">@@ -26,17 +26,10 @@
</span><span class="cx"> name = "cacheTokens"
</span><span class="cx">
</span><span class="cx">
</span><del>-class CacheChangeNotifier(object):
- def __init__(self, propertyStore):
- self._propertyStore = propertyStore
- self._propToken = None
- self._dataToken = None
</del><ins>+class CacheChangeLoaderMixin(object):
+ _propToken = None
+ _dataToken = None
</ins><span class="cx">
</span><del>- def _newDataToken(self):
- return uuid.uuid4()
-
- _newPropertyToken = _newDataToken
-
</del><span class="cx"> def _loadTokens(self):
</span><span class="cx"> try:
</span><span class="cx"> tokens = \
self._propertyStore.get(CacheTokensProperty.qname()) </span><span class="lines">@@ \
-46,6 +39,19 @@ </span><span class="cx"> except HTTPError, e:
</span><span class="cx"> pass
</span><span class="cx">
</span><ins>+
+
+class CacheChangeNotifier(CacheChangeLoaderMixin):
+ def __init__(self, propertyStore):
+ self._propertyStore = propertyStore
+
+
+ def _newDataToken(self):
+ return uuid.uuid4()
+
+ _newPropertyToken = _newDataToken
+
+
</ins><span class="cx"> def _writeTokens(self):
</span><span class="cx"> if self._propToken is None:
</span><span class="cx"> self._propToken = self._newPropertyToken()
</span><span class="lines">@@ -57,12 +63,42 @@
</span><span class="cx"> \
self._dataToken)) </span><span class="cx"> self._propertyStore.set(property)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def propertiesChanged(self):
</span><span class="cx"> self._loadTokens()
</span><span class="cx"> self._propToken = self._newPropertyToken()
</span><span class="cx"> self._writeTokens()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def dataChanged(self):
</span><span class="cx"> self._loadTokens()
</span><span class="cx"> self._dataToken = self._newDataToken()
</span><span class="cx"> self._writeTokens()
</span><ins>+
+
+
+class CacheChangeObserver(CacheChangeLoaderMixin):
+ def __init__(self, propertyStore):
+ self._propertyStore = propertyStore
+ self._oldPropToken = None
+ self._oldDataToken = None
+
+
+ def propertiesHaveChanged(self):
+ self._loadTokens()
+
+ if self._propToken != self._oldPropToken:
+ self._oldPropToken = self._propToken
+ return True
+
+ return False
+
+
+ def dataHasChanged(self):
+ self._loadTokens()
+
+ if self._dataToken != self._oldDataToken:
+ self._oldDataToken = self._dataToken
+ return True
+
+ return False
</ins></span></pre></div>
<a id="CalendarServerbranchespropfindcachetwistedcaldavtesttest_cachepy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py (2357 => \
2358)</h4> <pre class="diff"><span>
<span class="info">--- \
CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py 2008-04-26 \
02:44:34 UTC (rev 2357)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/test_cache.py 2008-04-28 \
17:35:23 UTC (rev 2358) </span><span class="lines">@@ -18,7 +18,9 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx">
</span><del>-from twistedcaldav.cache import CacheChangeNotifier, CacheTokensProperty
</del><ins>+from twistedcaldav.cache import CacheChangeNotifier
+from twistedcaldav.cache import CacheTokensProperty
+from twistedcaldav.cache import CacheChangeObserver
</ins><span class="cx">
</span><span class="cx"> from twistedcaldav.test.util import InMemoryPropertyStore
</span><span class="cx">
</span><span class="lines">@@ -45,6 +47,7 @@
</span><span class="cx"> self.ccn,
</span><span class="cx"> \
CacheChangeNotifier) </span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_unsetPropertiesAreProvisioned(self):
</span><span class="cx"> self.ccn.propertiesChanged()
</span><span class="cx"> tokens = \
self.props._properties[CacheTokensProperty.qname() </span><span class="lines">@@ \
-53,6 +56,7 @@ </span><span class="cx"> tokens,
</span><span class="cx"> 'propToken0:dataToken0')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_changedPropertiesChangesPropToken(self):
</span><span class="cx"> self.ccn.propertiesChanged()
</span><span class="cx"> self.ccn.propertiesChanged()
</span><span class="lines">@@ -71,3 +75,75 @@
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> tokens,
</span><span class="cx"> 'propToken0:dataToken1')
</span><ins>+
+
+
+class CacheChangeObserverTests(TestCase):
+ def setUp(self):
+ self.props = InMemoryPropertyStore()
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken0')
+ self.observer = CacheChangeObserver(self.props)
+
+
+ def test_propertiesHaveChangedNewObserver(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+ def test_propertiesHaveChanged(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken1:dataToken0')
+
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+
+ def test_propertiesHaveNotChanged(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), False)
+
+
+ def test_propertiesDoNotChangeData(self):
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken1:dataToken0')
+
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+ def test_dataHasChanged(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken1')
+
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+ def test_dataHasChangedNewObserver(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+
+
+ def test_dataHasNotChanged(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.dataHasChanged(), False)
+
+
+ def test_dataDoesNotChangeProperties(self):
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), True)
+
+ self.props._properties[CacheTokensProperty.qname()
+ ] = CacheTokensProperty.fromString(
+ 'propToken0:dataToken1')
+
+ self.assertEquals(self.observer.dataHasChanged(), True)
+ self.assertEquals(self.observer.propertiesHaveChanged(), False)
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic