[Checkins] SVN: relstorage/trunk/relstorage/adapters/poller.py clarified comments

Shane Hathaway shane at hathawaymix.org
Sat Oct 17 06:23:08 EDT 2009


Log message for revision 105116:
  clarified comments
  

Changed:
  U   relstorage/trunk/relstorage/adapters/poller.py

-=-
Modified: relstorage/trunk/relstorage/adapters/poller.py
===================================================================
--- relstorage/trunk/relstorage/adapters/poller.py	2009-10-17 10:22:08 UTC (rev 105115)
+++ relstorage/trunk/relstorage/adapters/poller.py	2009-10-17 10:23:08 UTC (rev 105116)
@@ -54,8 +54,8 @@
             # the cache is too old and needs to be cleared.
             # XXX Do we actually need to detect this condition? I think
             # if we delete this block of code, all the unreachable
-            # objects will be invalidated anyway. So, as a test, I have
-            # not written the equivalent of this block of code for
+            # objects will be garbage collected anyway. So, as a test,
+            # there is no equivalent of this block of code for
             # history-free storage. If something goes wrong, then we'll
             # know there's some other edge condition we have to account
             # for.
@@ -88,6 +88,11 @@
                 params['self_tid'] = ignore_tid
             stmt = intern(stmt % self.runner.script_vars)
 
+            cursor.execute(stmt, params)
+            oids = [oid for (oid,) in cursor]
+
+            return oids, new_polled_tid
+
         else:
             # We moved backward in time. This can happen after failover
             # to an asynchronous slave that is not fully up to date. If
@@ -101,12 +106,7 @@
                 "indicate a problem.",
                 prev_polled_tid, new_polled_tid)
             # Although we could handle this situation by looking at the
-            # whole cache and invalidating only certain objects,
+            # whole cPickleCache and invalidating only certain objects,
             # invalidating the whole cache is simpler.
             return None, new_polled_tid
 
-        cursor.execute(stmt, params)
-        oids = [oid for (oid,) in cursor]
-
-        return oids, new_polled_tid
-



More information about the checkins mailing list