GitLab

XXX Not sure if berkeley still works.

XXX This creates a new requirement: If a store implements restore(),
it's iterator() implementation must support the data_txn option.

says it should be cPickle.dumps(), so do that.

The effect of this change will be to cause transactions to fail
immediately, rather than the first time they call store() or
abortVersion() or some other write-method.  Since the Connection now
treats empty transactions as a special case, this change will not
change the class of transactions that fail.

tpc_begin(): Get rid of the apply() call since I believe we can now
rely on extended-call syntax being available.

public API.

Highlights:

BaseStorage.py:

Fix copyTransactionsFrom() when commitVersion(), abortVersion() or
transactionalUndo() is used.

FileStorage.py:

Add restore() method, which can store data records corresponding to
undo or version manipulations; add close() method to FileIterator
class; raise POSKeyError instead of KeyError for bad keys, to ensure
safe formatting of transaction ids (binary strings) in tracebacks.

POSException.py:

Add POSKeyError.

fsdump.py:

Deal with records indicating the undo or abort of a version doing
object creation.

tests/IteratorStorage.py:

New unittests for the iterator() method and interface of the
storage API; new unit tests for extended file iterators; new class,
IteratorDeepCompare; test of the iterator .close() method.

tests/testFileStorage.py:

Add class FileStorageRecoveryTest, which adds two simple tests for
copyTransactionsFrom().  This indirectly tests the new restore()
method.

The Standby-branch was branched from the StandaloneZODB-1_0-branch,
which includes the BTrees-fsIndex code.  I didn't include that change
in the merge, but everything else.  Terse summary follows:

BaseStorage.py:
    Add read-only storage feature.
    Add TransactionRecord and DataRecord marker classes for iteration.
    Reformat some lines.

FileStorage.py:
    Add read-only storage feature.
    Greg Ward's ConflictError patch
    Reformat some lines.
    Add lastTransaction(), lastSerialno().
    Add bounds support to iterator().
    Use TransactionRecord and DataRecord.

Connection.py:
DemoStorage.py:
MappingStorage.py:
    Greg Ward's ConflictError patch

POSException.py:
    Greg Ward's ConflictError patch
    Add ReadOnlyError.

BaseStorage implements this in terms of modifiedInVersion() and
load().  Other storages may (perhaps even should) implement it more
efficiently.

tpc_finish(); i.e. it acquires the lock, checks the argument, and then
calls self._vote().  Note that the transaction passed to tpc_vote()
isn't passed to self._vote(), since I don't what would be useful.

BaseStorage._vote(): current no-op.

Unfortutely, tpc_finish didn't handle this case correctly.

Minimal BSDDB storage which does not override abortVersion() and
commitVersion()).

commitVersion() can't be an alias for abortVersion() because it takes
a different number of arguments.  Provide a simple implementation.

Changed "from POSException import UndoError" to "import POSException"
and use POSException.UndoError in undo().  This is because
abortVersion() and commitVersion() also reference exceptions in the
POSException module.

Aside: fix __version__ extraction from $Revision$ to be portable in
the face of "cvs co -kv".

_abort.

(e.g. when moving data between a DCOracleStorage and a FileStorage),
especially the method copyTransactionsFrom, as in:

  import ZODB.FileStorage, DCOracle, DCOracleStorage

  # Copy data.fs to oracle
  DCOracleStorage.Full(
    lambda : DCOracle.Connect('user/pw@sid')
    ).copyTransactionsFrom(
      ZODB.FileStorage.FileStorage('Data.fs', read_only=1)
    )

a transaction id to be spacified, rather than being defined
by the storage. This should *only* be used when copying data
from one type of storage to another.

Failures in _finish could cause the storage to hang because the
commit lock was not released.