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

[Jeremy Hylton]

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

Modified Files:
      Tag: ZODB3-mvcc-2-branch
	FileStorage.py 
Log Message:
Return the backpointer's serialno from loadNonCurrent().

It looks like serial numbers don't make much difference in the MVCC
world.  All the File tests pass with the old code or the new.  The new
way is the only thing that really makes sense for Berkeley storage.


=== ZODB3/ZODB/FileStorage/FileStorage.py 1.1.2.15 => 1.1.2.16 ===
--- ZODB3/ZODB/FileStorage/FileStorage.py:1.1.2.15	Mon Nov 24 17:38:59 2003
+++ ZODB3/ZODB/FileStorage/FileStorage.py	Tue Nov 25 00:44:07 2003
@@ -636,8 +636,8 @@
             # pointed to, which is wrong.  Only use it for the data.
             th = self._read_txn_header(h.tloc)
             assert th.tid < tid
-            data = self._loadBack_impl(oid, h.back)[0]
-            return data, h.serial, th.tid, end_tid
+            data, serial, _, _ = self._loadBack_impl(oid, h.back)
+            return data, serial, th.tid, end_tid
         else:
             # If the transaction wrote new data, then it must have been
             # written by a regular store() and its tid will be the same