Commit 8014adfe authored by Vincent Pelletier's avatar Vincent Pelletier

Update btree's deleteTransaction implementation to current API.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2459 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent cde203ff
...@@ -383,23 +383,28 @@ class BTreeDatabaseManager(DatabaseManager): ...@@ -383,23 +383,28 @@ class BTreeDatabaseManager(DatabaseManager):
else: else:
break break
def deleteTransaction(self, tid, all=False): def deleteTransaction(self, tid, oid_list=()):
tid = util.u64(tid) tid = util.u64(tid)
self._popTransactionFromObj(self._tobj, tid) self._popTransactionFromObj(self._tobj, tid)
try: try:
del self._ttrans[tid] del self._ttrans[tid]
except KeyError: except KeyError:
pass pass
if all: for oid in oid_list:
self._popTransactionFromObj(self._obj, tid) self._deleteObject(oid, serial=tid)
try: try:
del self._trans[tid] del self._trans[tid]
except KeyError: except KeyError:
pass pass
def deleteObject(self, oid, serial=None): def deleteObject(self, oid, serial=None):
u64 = util.u64 u64 = util.u64
oid = u64(oid) oid = u64(oid)
if serial is not None:
serial = u64(serial)
self._deleteObject(oid, serial=serial)
def _deleteObject(self, oid, serial=None):
obj = self._obj obj = self._obj
try: try:
tserial = obj[oid] tserial = obj[oid]
...@@ -409,7 +414,6 @@ class BTreeDatabaseManager(DatabaseManager): ...@@ -409,7 +414,6 @@ class BTreeDatabaseManager(DatabaseManager):
if serial is None: if serial is None:
del obj[oid] del obj[oid]
else: else:
serial = u64(serial)
try: try:
del tserial[serial] del tserial[serial]
except KeyError: except KeyError:
......
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