[Zope-Checkins] CVS: ZODB3/ZODB/FileStorage - FileStorage.py:1.1.2.20

Jeremy Hylton jeremy at zope.com
Thu Dec 18 13:34:51 EST 2003


Update of /cvs-repository/ZODB3/ZODB/FileStorage
In directory cvs.zope.org:/tmp/cvs-serv29675

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
Fix assertion error in loadBefore() with versions.

A similar fix needs to be made in BDBStorage.

This repairs the assertion error in checkConcurrentUpdatesInVersions,
but the test still fails with missing keys.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.19 => 1.1.2.20 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.19	Tue Dec  2 02:10:31 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Thu Dec 18 13:34:50 2003
@@ -597,7 +597,8 @@
                     # before data to find.
                     return None
                 pos = h.pnv
-                end_tid = h.tid
+                # The end_tid for the non-version data is not affected
+                # by versioned data records.
                 continue
 
             if h.tid < tid:




More information about the Zope-Checkins mailing list