Commit 54be23c3 authored by Barry Warsaw's avatar Barry Warsaw

_docommit(): Backing out the previous refcounting hack. There was no

bug here, there was a deficiency in zodb_pickle() that will be fixed
in StorageTestBase.py
parent d1152bf6
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"""Berkeley storage without undo or versioning. """Berkeley storage without undo or versioning.
""" """
__version__ = '$Revision: 1.26 $'[-2:][0] __version__ = '$Revision: 1.27 $'[-2:][0]
from ZODB import POSException from ZODB import POSException
from ZODB.utils import p64, U64 from ZODB.utils import p64, U64
...@@ -177,13 +177,7 @@ class BDBMinimalStorage(BerkeleyBase, ConflictResolvingStorage): ...@@ -177,13 +177,7 @@ class BDBMinimalStorage(BerkeleyBase, ConflictResolvingStorage):
soid, stid = srec soid, stid = srec
if soid <> oid: if soid <> oid:
break break
if stid == tid: if stid <> tid:
# This is the current revision of the object, so
# increment the refcounts of all referents
data = self._pickles.get(oid+stid, txn=txn)
assert data is not None
self._update(deltas, data, 1)
else:
# This is the previous revision of the object, so # This is the previous revision of the object, so
# decref its referents and clean up its pickles. # decref its referents and clean up its pickles.
cs.delete() cs.delete()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment