[Zope3-checkins] CVS: ZODB4/src/zodb/storage - base.py:1.13.4.5 bdbfull.py:1.12.4.7 bdbminimal.py:1.11.4.6 file.py:1.8.4.17 interfaces.py:1.5.4.6 mapping.py:1.3.4.5
Barry Warsaw
barry@wooz.org
Thu, 13 Mar 2003 14:40:13 -0500
Update of /cvs-repository/ZODB4/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv9877/storage
Modified Files:
Tag: opaque-pickles-branch
base.py bdbfull.py bdbminimal.py file.py interfaces.py
mapping.py
Log Message:
> Next step: get rid of the tuple in the argument list.
Completed.
Also, reorder the arguments to restore() so that data and refs are
buddies again, just like in the store() call.
I believe we're ready to merge back to the head.
=== ZODB4/src/zodb/storage/base.py 1.13.4.4 => 1.13.4.5 ===
--- ZODB4/src/zodb/storage/base.py:1.13.4.4 Wed Mar 12 16:40:15 2003
+++ ZODB4/src/zodb/storage/base.py Thu Mar 13 14:39:42 2003
@@ -333,8 +333,8 @@
for r in transaction:
if verbose:
print `r.oid`, r.version, len(r.data)
- self.restore(r.oid, r.serial, r.data, r.version,
- r.data_txn, r.refs, transaction)
+ self.restore(r.oid, r.serial, r.data, r.refs, r.version,
+ r.data_txn, transaction)
self.tpcVote(transaction)
self.tpcFinish(transaction)
=== ZODB4/src/zodb/storage/bdbfull.py 1.12.4.6 => 1.12.4.7 ===
--- ZODB4/src/zodb/storage/bdbfull.py:1.12.4.6 Thu Mar 13 11:31:51 2003
+++ ZODB4/src/zodb/storage/bdbfull.py Thu Mar 13 14:39:42 2003
@@ -556,7 +556,7 @@
return ResolvedSerial
return newserial
- def store(self, oid, serial, (data, refs), version, transaction):
+ def store(self, oid, serial, data, refs, version, transaction):
# Lock and transaction wrapper
if transaction is not self._transaction:
raise StorageTransactionError(self, transaction)
@@ -567,7 +567,7 @@
finally:
self._lock_release()
- def _dorestore(self, txn, oid, serial, data, version, prev_txn, refs):
+ def _dorestore(self, txn, oid, serial, data, refs, version, prev_txn):
tid = self._serial
vid = nvrevid = ovid = ZERO
prevrevid = prev_txn
@@ -639,7 +639,7 @@
if not version or ovid <> ZERO:
self._objrevs.put(tid+oid, prevrevid, txn=txn)
- def restore(self, oid, serial, data, version, prev_txn, refs, transaction):
+ def restore(self, oid, serial, data, refs, version, prev_txn, transaction):
# A lot like store() but without all the consistency checks. This
# should only be used when we /know/ the data is good, hence the
# method name. While the signature looks like store() there are some
@@ -667,7 +667,7 @@
self._lock_acquire()
try:
self._withtxn(
- self._dorestore, oid, serial, data, version, prev_txn, refs)
+ self._dorestore, oid, serial, data, refs, version, prev_txn)
finally:
self._lock_release()
=== ZODB4/src/zodb/storage/bdbminimal.py 1.11.4.5 => 1.11.4.6 ===
--- ZODB4/src/zodb/storage/bdbminimal.py:1.11.4.5 Thu Mar 13 11:31:51 2003
+++ ZODB4/src/zodb/storage/bdbminimal.py Thu Mar 13 14:39:42 2003
@@ -294,7 +294,7 @@
return ResolvedSerial
return newserial
- def store(self, oid, serial, (data, refs), version, transaction):
+ def store(self, oid, serial, data, refs, version, transaction):
if transaction is not self._transaction:
raise StorageTransactionError(self, transaction)
# We don't support versions
=== ZODB4/src/zodb/storage/file.py 1.8.4.16 => 1.8.4.17 ===
--- ZODB4/src/zodb/storage/file.py:1.8.4.16 Thu Mar 13 11:31:51 2003
+++ ZODB4/src/zodb/storage/file.py Thu Mar 13 14:39:42 2003
@@ -835,7 +835,7 @@
finally:
self._lock_release()
- def store(self, oid, serial, (data, refs), version, transaction):
+ def store(self, oid, serial, data, refs, version, transaction):
if self._is_read_only:
raise ReadOnlyError()
if transaction is not self._transaction:
@@ -915,7 +915,7 @@
pos += h.recordlen()
return 0
- def restore(self, oid, serial, data, version, prev_txn, refs, transaction):
+ def restore(self, oid, serial, data, refs, version, prev_txn, transaction):
# A lot like store() but without all the consistency checks. This
# should only be used when we /know/ the data is good, hence the
# method name. While the signature looks like store() there are some
=== ZODB4/src/zodb/storage/interfaces.py 1.5.4.5 => 1.5.4.6 ===
--- ZODB4/src/zodb/storage/interfaces.py:1.5.4.5 Thu Mar 13 11:31:51 2003
+++ ZODB4/src/zodb/storage/interfaces.py Thu Mar 13 14:39:42 2003
@@ -109,7 +109,7 @@
def getSerial(oid):
"""Return the current serial number for oid."""
- def store(oid, serial, (data, refs), version, txn):
+ def store(oid, serial, data, refs, version, txn):
"""Store an object and returns a new serial number.
Arguments:
@@ -137,11 +137,11 @@
protocol that complicates the return value. Maybe we can fix that.
"""
- def restore(oid, serial, data, version, prev_txn, txn, refs):
+ def restore(oid, serial, data, refs, version, prev_txn, txn):
"""Store an object with performing consistency checks.
The arguments are the same as store() except for prev_txn.
- If prev_txn is not None, then prev_txn is the ...?
+ If prev_txn is not None, then prev_txn is the XXX ...?
"""
pass
=== ZODB4/src/zodb/storage/mapping.py 1.3.4.4 => 1.3.4.5 ===
--- ZODB4/src/zodb/storage/mapping.py:1.3.4.4 Thu Mar 13 11:31:51 2003
+++ ZODB4/src/zodb/storage/mapping.py Thu Mar 13 14:39:42 2003
@@ -54,7 +54,7 @@
finally:
self._lock_release()
- def store(self, oid, serial, (data, refs), version, transaction):
+ def store(self, oid, serial, data, refs, version, transaction):
if transaction is not self._transaction:
raise StorageTransactionError(self, transaction)