Commit aee23a5d authored by Jeremy Hylton's avatar Jeremy Hylton

Minimal edits to track change of BaseStorage._serial to

BaseStorage._tid.
parent 81748109
...@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of ...@@ -17,10 +17,10 @@ MappingStorage. Unlike MappingStorage, it needs not be packed to get rid of
non-cyclic garbage and it does rudimentary conflict resolution. This is a non-cyclic garbage and it does rudimentary conflict resolution. This is a
ripoff of Jim's Packless bsddb3 storage. ripoff of Jim's Packless bsddb3 storage.
$Id: TemporaryStorage.py,v 1.2 2003/11/28 16:46:50 jim Exp $ $Id: TemporaryStorage.py,v 1.3 2003/12/24 16:42:22 jeremy Exp $
""" """
__version__ ='$Revision: 1.2 $'[11:-2] __version__ ='$Revision: 1.3 $'[11:-2]
from zLOG import LOG, BLATHER from zLOG import LOG, BLATHER
from ZODB.referencesf import referencesf from ZODB.referencesf import referencesf
...@@ -137,7 +137,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -137,7 +137,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
data = rdata data = rdata
else: else:
oserial = serial oserial = serial
newserial=self._serial newserial=self._tid
self._tmp.append((oid, data)) self._tmp.append((oid, data))
now = time.time() now = time.time()
self._conflict_cache[(oid, newserial)] = data, now self._conflict_cache[(oid, newserial)] = data, now
...@@ -150,7 +150,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage): ...@@ -150,7 +150,7 @@ class TemporaryStorage(BaseStorage, ConflictResolvingStorage):
referenceCount=self._referenceCount referenceCount=self._referenceCount
referenceCount_get=referenceCount.get referenceCount_get=referenceCount.get
oreferences=self._oreferences oreferences=self._oreferences
serial=self._serial serial=self._tid
index=self._index index=self._index
opickle=self._opickle opickle=self._opickle
......
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