[Zope-Checkins] CVS: Zope/lib/python/ZODB - FileStorage.py:1.120

[Jeremy Hylton]

Update of /cvs-repository/Zope/lib/python/ZODB
In directory cvs.zope.org:/tmp/cvs-serv17383/lib/python/ZODB

Modified Files:
	FileStorage.py 
Log Message:
Enable BTrees-based fsIndex.

Oops.  The code for BTrees-based indexing was done on a branch, which
was later merged into another branch, which was later merged to the
trunk.  Somewhere along the way the change that actually enabled the
new index was lost.



=== Zope/lib/python/ZODB/FileStorage.py 1.119 => 1.120 ===
--- Zope/lib/python/ZODB/FileStorage.py:1.119	Tue Dec  3 13:36:29 2002
+++ Zope/lib/python/ZODB/FileStorage.py	Fri Dec  6 14:40:43 2002
@@ -137,12 +137,7 @@
 from ZODB.TimeStamp import TimeStamp
 from ZODB.lock_file import lock_file
 from ZODB.utils import p64, u64, cp, z64
-
-try:
-    from ZODB.fsIndex import fsIndex
-except ImportError:
-    def fsIndex():
-        return {}
+from ZODB.fsIndex import fsIndex
 
 from zLOG import LOG, BLATHER, WARNING, ERROR, PANIC
 
@@ -317,7 +312,7 @@
 
     def _newIndexes(self):
         # hook to use something other than builtin dict
-        return {}, {}, {}, {}
+        return fsIndex(), {}, {}, {}
 
     def _save_index(self):
         """Write the database index to a file to support quick startup."""