[CalendarServer-changes] [12347] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 12347
          http://trac.calendarserver.org//changeset/12347
Author:   gaya at apple.com
Date:     2014-01-14 19:16:17 -0800 (Tue, 14 Jan 2014)
Log Message:
-----------
fix syncToken() to return the min valid revision when the are no revision rows.  Turn revision cleaning back on.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2014-01-15 01:16:42 UTC (rev 12346)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2014-01-15 03:16:17 UTC (rev 12347)
@@ -551,7 +551,7 @@
             yield scheduleNextMailPoll(self.store, int(config.LogID) if config.LogID else 5)
         if self.doGroupCaching:
             yield scheduleNextGroupCachingUpdate(self.store, int(config.LogID) if config.LogID else 5)
-        #yield scheduleFirstFindMinRevision(self.store, int(config.LogID) if config.LogID else 5)
+        yield scheduleFirstFindMinRevision(self.store, int(config.LogID) if config.LogID else 5)
 
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2014-01-15 01:16:42 UTC (rev 12346)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2014-01-15 03:16:17 UTC (rev 12347)
@@ -2135,6 +2135,12 @@
         if self._syncTokenRevision is None:
             self._syncTokenRevision = (yield self._syncTokenQuery.on(
                 self._txn, resourceID=self._resourceID))[0][0]
+            if self._syncTokenRevision is None:
+                cs = schema.CALENDARSERVER
+                self._syncTokenRevision = int((yield Select(
+                    [cs.VALUE], From=cs,
+                    Where=(cs.NAME == "MIN-VALID-REVISION")
+                ).on(self._txn))[0][0])
         returnValue("%s_%s" % (self._resourceID, self._syncTokenRevision))
 
 
@@ -2615,6 +2621,12 @@
         if self._syncTokenRevision is None:
             self._syncTokenRevision = (yield self._childSyncTokenQuery.on(
                 self._txn, resourceID=self._resourceID))[0][0]
+            if self._syncTokenRevision is None:
+                cs = schema.CALENDARSERVER
+                self._syncTokenRevision = int((yield Select(
+                    [cs.VALUE], From=cs,
+                    Where=(cs.NAME == "MIN-VALID-REVISION")
+                ).on(self._txn))[0][0])
         returnValue(("%s_%s" % (self._resourceID, self._syncTokenRevision,)))
 
 
@@ -4179,7 +4191,7 @@
             propstore = propertyStores.get(resourceID, None)
 
             child = yield cls.makeClass(home, bindData, additionalBindData, metadataData, propstore)
-            child._syncTokenRevision = revisions[resourceID]
+            child._syncTokenRevision = revisions.get(resourceID)
             results.append(child)
 
         returnValue(results)
@@ -6040,6 +6052,12 @@
                 yield self._syncTokenQuery.on(
                     self._txn, resourceID=self._resourceID)
             )[0][0]
+            if self._syncTokenRevision is None:
+                cs = schema.CALENDARSERVER
+                self._syncTokenRevision = int((yield Select(
+                    [cs.VALUE], From=cs,
+                    Where=(cs.NAME == "MIN-VALID-REVISION")
+                ).on(self._txn))[0][0])
         returnValue("%s_%s" % (self._resourceID, self._syncTokenRevision))
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/fb05e5ec/attachment.html>