[Checkins] SVN: zc.FileStorage/dev/ Use an external for 3.8 so we can run the ZEO tests.

[Jim Fulton]

Log message for revision 82118:
  Use an external for 3.8 so we can run the ZEO tests. 
  (A file is missing from the 3.8 release.)
  
  :(
  

Changed:
  _U  zc.FileStorage/dev/
  U   zc.FileStorage/dev/buildout.cfg
  U   zc.FileStorage/dev/src/zc/FileStorage/__init__.py

-=-

Property changes on: zc.FileStorage/dev
___________________________________________________________________
Name: svn:externals
   + 3.8 svn+ssh://svn.zope.org/repos/main/ZODB/branches/3.8


Modified: zc.FileStorage/dev/buildout.cfg
===================================================================
--- zc.FileStorage/dev/buildout.cfg	2007-12-04 15:22:52 UTC (rev 82117)
+++ zc.FileStorage/dev/buildout.cfg	2007-12-04 15:32:02 UTC (rev 82118)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . 3.8
 parts = py test
 
 [py]
@@ -11,4 +11,15 @@
 recipe = zc.recipe.testrunner
 eggs = ZODB3 <3.9dev
        zc.FileStorage
-initialization = import zc.FileStorage
+initialization =
+  import zc.FileStorage
+  import ZODB.tests.VersionStorage, ZODB.tests.TransactionalUndoVersionStorage
+  class C: pass
+  ZODB.tests.VersionStorage.VersionStorage = C
+  class C: pass
+  ZODB.tests.TransactionalUndoVersionStorage.TransactionalUndoVersionStorage = C
+  import ZODB.tests.testDB
+  del ZODB.tests.testDB.DBTests.test_removeVersionPool
+  del ZODB.tests.testDB.DBTests.test_removeVersionPool_while_connection_open
+  import ZODB.tests.testZODB
+  del ZODB.tests.testZODB.ZODBTests.checkVersionOnly

Modified: zc.FileStorage/dev/src/zc/FileStorage/__init__.py
===================================================================
--- zc.FileStorage/dev/src/zc/FileStorage/__init__.py	2007-12-04 15:22:52 UTC (rev 82117)
+++ zc.FileStorage/dev/src/zc/FileStorage/__init__.py	2007-12-04 15:32:02 UTC (rev 82118)
@@ -12,11 +12,12 @@
 #
 ##############################################################################
 
-import sys
+import os, sys
 
 from ZODB.FileStorage.format import FileStorageFormatter, CorruptedDataError
 from ZODB.serialize import referencesf
 from ZODB.utils import p64, u64, z64
+from ZODB.FileStorage.format import TRANS_HDR_LEN
 
 import BTrees.LLBTree, BTrees.LOBTree
 import ZODB.FileStorage
@@ -134,6 +135,12 @@
         return packed, index, references, pos
 
     def updateReferences(self, references, pos, file_end):
+
+        # Note that we don't update an index in this step.  This is
+        # because we don't care about objects created after the pack
+        # time.  We'll add those in a later phase. We only care about
+        # references to existing objects.
+        
         while pos < file_end:
             th = self._read_txn_header(pos)
             self.checkTxn(th, pos)
@@ -192,7 +199,15 @@
             if oid in reachable:
                 continue
 
-            reachable[oid] = index[oid]
+            try:
+                reachable[oid] = index[oid]
+            except KeyError:
+                # Note that the references include references made
+                # after the pack time.  These include references to
+                # objects created after the pack time, which won't be
+                # in the index.
+                pass
+
             to_do.extend(references.pop(ioid, ()))
         references.clear()
         return reachable
@@ -303,9 +318,7 @@
     def _copyNewTrans(self, input_pos, output, index,
                       acquire=None, release=None):
         tindex = {}
-        copier = ZODB.FileStorage.fspack.PackCopier(
-            output, index, {}, tindex, {},
-            )
+        copier = PackCopier(output, index, {}, tindex, {})
         th = self._read_txn_header(input_pos)
         if release is not None:
             release()
@@ -363,3 +376,23 @@
 
 sys.modules['ZODB.FileStorage.FileStorage'
             ].FileStoragePacker = FileStoragePacker
+ZODB.FileStorage.FileStorage.supportsVersions = lambda self: False
+
+class PackCopier(ZODB.FileStorage.fspack.PackCopier):
+
+    def _txn_find(self, tid, stop_at_pack):
+        # _pos always points just past the last transaction
+        pos = self._pos
+        while pos > 4:
+            self._file.seek(pos - 8)
+            pos = pos - u64(self._file.read(8)) - 8
+            self._file.seek(pos)
+            h = self._file.read(TRANS_HDR_LEN)
+            _tid = h[:8]
+            if _tid == tid:
+                return pos
+            if stop_at_pack:
+                if h[16] == 'p':
+                    break
+
+        return None