[Zope3-checkins] CVS: Zope3/src/zodb/storage - bdbminimal.py:1.17.2.1

Barry Warsaw barry@zope.com
Mon, 21 Apr 2003 16:11:03 -0400


Update of /cvs-repository/Zope3/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv11587

Modified Files:
      Tag: jeremy-new-pack-branch
	bdbminimal.py 
Log Message:
_init(): Subclasses are now responsible for creating the oidqueue
table.

_sweep(): Minor buglet fix.  Could be a backport candidate.


=== Zope3/src/zodb/storage/bdbminimal.py 1.17 => 1.17.2.1 ===
--- Zope3/src/zodb/storage/bdbminimal.py:1.17	Wed Apr  9 13:58:20 2003
+++ Zope3/src/zodb/storage/bdbminimal.py	Mon Apr 21 16:11:03 2003
@@ -23,6 +23,8 @@
 from zodb.conflict import ResolvedSerial
 from zodb.storage.base import db, BerkeleyBase, PackStop, _WorkThread
 from zodb.storage.base import splitrefs
+# For debugging
+from zodb.interfaces import _fmt_oid as fo
 
 ABORT = 'A'
 COMMIT = 'C'
@@ -101,7 +103,7 @@
         #     It is also used during pack to list objects for which no more
         #     references exist, such that the objects can be completely packed
         #     away.
-        pass
+        self._oidqueue = self._setupDB('oidqueue', 0, db.DB_QUEUE, 8)
 
     def _version_check(self, txn):
         version = self._info.get('version')
@@ -472,6 +474,7 @@
         finally:
             c.close()
         # We're done with the mark table
+        self._packmark.truncate(txn=txn)
 
     def _collect_objs(self, txn):
         orec = self._oidqueue.consume(txn)