[Zodb-checkins] SVN: ZODB/trunk/src/transaction/ Merge improvements
to transaction interfaces, from ZODB 3.4 branch.
Tim Peters
tim.one at comcast.net
Wed Apr 13 17:48:16 EDT 2005
Log message for revision 29966:
Merge improvements to transaction interfaces, from ZODB 3.4 branch.
This is revs 29961 and 29965.
Changed:
U ZODB/trunk/src/transaction/_transaction.py
U ZODB/trunk/src/transaction/interfaces.py
D ZODB/trunk/src/transaction/notes.txt
U ZODB/trunk/src/transaction/tests/abstestIDataManager.py
D ZODB/trunk/src/transaction/tests/test_util.py
D ZODB/trunk/src/transaction/util.py
-=-
Modified: ZODB/trunk/src/transaction/_transaction.py
===================================================================
--- ZODB/trunk/src/transaction/_transaction.py 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/_transaction.py 2005-04-13 21:48:16 UTC (rev 29966)
@@ -150,6 +150,9 @@
import traceback
from cStringIO import StringIO
+from zope import interface
+from transaction import interfaces
+
# Sigh. In the maze of __init__.py's, ZODB.__init__.py takes 'get'
# out of transaction.__init__.py, in order to stuff the 'get_transaction'
# alias in __builtin__. So here in _transaction.py, we can't import
@@ -178,6 +181,9 @@
class Transaction(object):
+ interface.implements(interfaces.ITransaction,
+ interfaces.ITransactionDeprecated)
+
def __init__(self, synchronizers=None, manager=None):
self.status = Status.ACTIVE
# List of resource managers, e.g. MultiObjectResourceAdapters.
@@ -248,6 +254,7 @@
# be better to use interfaces. If this is a ZODB4-style
# resource manager, it needs to be adapted, too.
if myhasattr(resource, "prepare"):
+ # TODO: deprecate 3.6
resource = DataManagerAdapter(resource)
self._resources.append(resource)
@@ -602,6 +609,7 @@
oid = oid_repr(oid)
return "%s oid=%s" % (klass, oid)
+# TODO: deprecate for 3.6.
class DataManagerAdapter(object):
"""Adapt zodb 4-style data managers to zodb3 style
Modified: ZODB/trunk/src/transaction/interfaces.py
===================================================================
--- ZODB/trunk/src/transaction/interfaces.py 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/interfaces.py 2005-04-13 21:48:16 UTC (rev 29966)
@@ -18,6 +18,17 @@
import zope.interface
+class ISynchronizer(zope.interface.Interface):
+ """Objects that participate in the transaction-boundary notification API.
+ """
+
+ def beforeCompletion(transaction):
+ """Hook that is called by the transaction at the start of a commit."""
+
+ def afterCompletion(transaction):
+ """Hook that is called by the transaction after completing a commit."""
+
+
class IDataManager(zope.interface.Interface):
"""Objects that manage transactional storage.
@@ -159,12 +170,6 @@
#which is good enough to avoid ZEO deadlocks.
#"""
- def beforeCompletion(transaction):
- """Hook that is called by the transaction before completing a commit"""
-
- def afterCompletion(transaction):
- """Hook that is called by the transaction after completing a commit"""
-
class ITransaction(zope.interface.Interface):
"""Object representing a running transaction.
@@ -174,22 +179,28 @@
"""
user = zope.interface.Attribute(
- "user",
- "The name of the user on whose behalf the transaction is being\n"
- "performed. The format of the user name is defined by the\n"
- "application.")
- # Unsure: required to be a string?
+ """A user name associated with the transaction.
+ The format of the user name is defined by the application. The value
+ is of Python type str. Storages record the user value, as meta-data,
+ when a transaction commits.
+
+ A storage may impose a limit on the size of the value; behavior is
+ undefined if such a limit is exceeded (for example, a storage may
+ raise an exception, or truncate the value).
+ """)
+
description = zope.interface.Attribute(
- "description",
- "Textual description of the transaction.")
+ """A textual description of the transaction.
- def begin(info=None, subtransaction=None):
- """Begin a new transaction.
+ The value is of Python type str. Method note() is the intended
+ way to set the value. Storages record the description, as meta-data,
+ when a transaction commits.
- If the transaction is in progress, it is aborted and a new
- transaction is started using the same transaction object.
- """
+ A storage may impose a limit on the size of the description; behavior
+ is undefined if such a limit is exceeded (for example, a storage may
+ raise an exception, or truncate the value).
+ """)
def commit(subtransaction=None):
"""Finalize the transaction.
@@ -213,9 +224,6 @@
adaptable to ZODB.interfaces.IDataManager.
"""
- def register(object):
- """Register the given object for transaction control."""
-
def note(text):
"""Add text to the transaction description.
@@ -230,7 +238,8 @@
"""Set the user name.
path should be provided if needed to further qualify the
- identified user.
+ identified user. This is a convenience method used by Zope.
+ It sets the .user attribute to str(path) + " " + str(user_name).
"""
def setExtendedInfo(name, value):
@@ -270,18 +279,17 @@
instead.
"""
-class IRollback(zope.interface.Interface):
+class ITransactionDeprecated(zope.interface.Interface):
+ """Deprecated parts of the transaction API."""
- def rollback():
- """Rollback changes since savepoint.
+ # TODO: deprecated36
+ def begin(info=None):
+ """Begin a new transaction.
- IOW, rollback to the last savepoint.
-
- It is an error to rollback to a savepoint if:
-
- - An earlier savepoint within the same transaction has been
- rolled back to, or
-
- - The transaction has ended.
+ If the transaction is in progress, it is aborted and a new
+ transaction is started using the same transaction object.
"""
+ # TODO: deprecate this for 3.6.
+ def register(object):
+ """Register the given object for transaction control."""
Deleted: ZODB/trunk/src/transaction/notes.txt
===================================================================
--- ZODB/trunk/src/transaction/notes.txt 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/notes.txt 2005-04-13 21:48:16 UTC (rev 29966)
@@ -1,269 +0,0 @@
-[more info may (or may not) be added to
-
- http://zope.org/Wikis/ZODB/ReviseTransactionAPI
-]
-
-Notes on a future transaction API
-=================================
-
-I did a brief review of the current transaction APIs from ZODB 3 and
-ZODB 4, considering some of the issues that have come up since last
-winter when most of the initial design and implementation of ZODB 4's
-transaction API was done.
-
-Participants
-------------
-
-There are four participants in the transaction APIs.
-
-1. Application -- Some application code is ultimately in charge of the
-transaction process. It uses transactional resources, decides the
-scope of individual transactions, and commits or aborts transactions.
-
-2. Resource Manager -- Typically library or framework code that provides
-transactional access to some resource -- a ZODB database, a relational
-database, or some other resource. It provides an API for application
-code that isn't defined by the transaction framework. It collaborates
-with the transaction manager to find the current transaction. It
-collaborates with the transaction for registration, notification, and
-for committing changes.
-
-The ZODB Connection is a resource manager. In ZODB 4, it is called a
-data manager. In ZODB 3, it is called a jar. In other literature,
-resource manager seems to be common.
-
-3. Transaction -- coordinates the actions of application and resource
-managers for a particular activity. The transaction usually has a
-short lifetime. The application begins it, resources register with it
-as the application runs, then it finishes with a commit or abort.
-
-4. Transaction Manager -- coordinates the use of transaction. The
-transaction manager provides policies for associating resource
-managers with specific transactions. The question "What is the
-current transaction?" is answered by the transaction manager.
-
-I'm taking as a starting point the transaction API that was defined
-for ZODB 4. I reviewed it again after a lot of time away, and I still
-think it's on the right track.
-
-Current transaction
--------------------
-
-The first question is "What is the current transaction?" This
-question is decided by the transaction manager. An application could
-chose an application manager that suites its need best.
-
-In the current ZODB, the transaction manager is essentially the
-implementation of ZODB.Transaction.get_transaction() and the
-associated thread id -> txn dict. I think we can encapsulate this
-policy an a first-class object and allow applications to decide which
-one they want to use. By default, a thread-based txn manager would be
-provided.
-
-The other responsibility of the transaction manager is to decide when
-to start a new transaction. The current ZODB transaction manager
-starts one whenever a client calls get() and there is no current
-transaction. I think there could be some benefit to an explicit new()
-operation that will always create a new transaction. A particular
-manager could implement the policy that get() called before new()
-returns None or raises an exception.
-
-Basic transaction API
----------------------
-
-A transaction module or package can export a very simple API for
-interacting with transactions. It hides most of the complexity from
-applications that want to use the standard Zope policies. Here's a
-sketch of an implementation:
-
-_mgr = TransactionManager()
-
-def get():
- """Return the current transaction."""
- return _mgr.get()
-
-def new():
- """Return a new transaction."""
- return _mgr.new()
-
-def commit():
- """Commit the current transaction."""
- _mgr.get().commit()
-
-def abort():
- """Abort the current transaction."""
- _mgr.get().abort()
-
-Application code can just import the transaction module to use the
-get(), new(), abort(), and commit() methods.
-
-The individual transaction objects should have a register() method
-that is used by a resource manager to register that it has
-modifications for this transaction. It's part of the basic API, but
-not the basic user API.
-
-Extended transaction API
-------------------------
-
-There are a few other methods that might make sense on a transaction:
-
-status() -- return a code or string indicating what state the
-transaction is in -- begin, aborted, committed, etc.
-
-note() -- add metadata to txn
-
-The transaction module should have a mechanism for installing a new
-transaction manager.
-
-Suspend and resume
-------------------
-
-If the transaction manager's job is to decide what the current
-transaction is, then it would make sense to have suspend() and
-resume() APIs that allow the current activity to be stopped for a
-time. The goal of these APIs is to allow more control over
-coordination.
-
-It seems like user code would call suspend() and resume() on
-individual transaction objects, which would interact with the
-transaction manager.
-
-If suspend() and resume() are supported, then we need to think about
-whether those events need to be communicated to the resource
-managers.
-
-This is a new feature that isn't needed for ZODB 3.3.
-
-Registration and notification
------------------------------
-
-The transaction object coordinates the activities of resource
-managers. When a managed resource is modified, its manager must
-register with the current transaction. (It's an error to modify an
-object when there is no transaction?)
-
-When the transaction commits or aborts, the transaction calls back to
-each registered resource manager. The callbacks form the two-phase
-commit protocol. I like the ZODB 4 names and approach prepare() (does
-tpc_begin through tpc_vote on the storage).
-
-A resource manager does not register with a transaction if none of its
-resources are modified. Some resource managers would like to know
-about transaction boundaries anyway. A ZODB Connection would like to
-process invalidations at every commit, even if none of its objects
-were modified.
-
-It's not clear what the notification interface should look like or
-what events are of interest. In theory, transaction begin, abort, and
-commit are all interesting; perhaps a combined abort-or-commit event
-would be useful. The ZODB use case only needs one event.
-
-The java transaction API has beforeCompletion and afterCompletion,
-where after gets passed a status code to indicate abort or commit.
-I think these should be sufficient.
-
-Nested transactions / savepoints
---------------------------------
-
-ZODB 3 and ZODB 4 each have a limited form of nested transactions.
-They are called subtransactions in ZODB 3 and savepoints in ZODB 4.
-The essential mechanism is the same: At the time of subtransaction is
-committed, all the modifications up to that time are written out to a
-temporary file. The application can later revert to that saved state
-or commit the main transaction, which copies modifications from the
-temporary file to the real storage.
-
-The savepoint mechanism can be used to implement the subtransaction
-model, by creating a savepoint every time a subtransaction starts or
-ends.
-
-If a resource manager joins a transaction after a savepoint, we need
-to create an initial savepoint for the new resource manager that will
-rollback all its changes. If the new resource manager doesn't support
-savepoints, we probably need to mark earlier savepoints as invalid.
-There are some edges cases to work out here.
-
-It's not clear how nested transactions affect the transaction manager
-API. If we just use savepoint(), then there's no issue to sort out.
-A nested transaction API may be more convenient. One possibility is
-to pass a transaction object to new() indicating that the new
-transaction is a child of the current transaction. Example:
-
- transaction.new(transaction.get())
-
-That seems rather wordy. Perhaps:
-
- transaction.child()
-
-where this creates a new nested transaction that is a child of the
-current one, raising an exception if there is no current transaction.
-
-This illustrates that a subtransaction feature could create new
-requirements for the transaction manager API.
-
-The current ZODB 3 API is that calling commit(1) or commit(True) means
-"commit a subtransaction." abort() has the same API. We need to
-support this API for backwards compatibility. A new API would be a
-new feature that isn't necessary for ZODB 3.3.
-
-ZODB Connection and Transactions
---------------------------------
-
-The Connection has three interactions with a transaction manager.
-First, it registers itself with the transaction manager for
-synchronization messages. Second, it registers with the current
-transaction the first time an object is modified in that transaction.
-Third, there is an option to explicitly pass a transaction manager to
-the connection constructor via DB.open(); the connection always uses
-this transaction manager, regardless of the default manager.
-
-Deadlock and recovery
----------------------
-
-ZODB uses a global sort order to prevent deadlock when it commits
-transactions involving multiple resource managers. The resource
-manager must define a sortKey() method that provides a global ordering
-for resource managers. The sort code doesn't exist in ZODB 4, but
-could be added fairly easily.
-
-The transaction managers don't support recovery, where recovery means
-restoring a system to a consistent state after a failure during the
-second phase of two-phase commit. When a failure occurs in the second
-phase, some transaction participations may not know the outcome of the
-transaction. (It would be cool to support recovery, but that's not
-being discussed now.)
-
-In the absence of real recovery manager means that our transaction
-commit implementation needs to play many tricks to avoid the need for
-recovery (pseudo-recovery). For example, if the first resource
-manager fails in the second phase, we attempt to abort all the other
-resource managers. (This isn't strictly correct, because we don't know the
-status of the first resource manager if it fails.) If we used
-something more like the ZODB 4 implementation, we'd need to make sure
-all the pseudo-recovery work is done in the new implementation.
-
-Closing resource managers
--------------------------
-
-The ZODB Connection is explicitly opened and closed by the
-application; other resource managers probably get closed to. The
-relationship between transactions and closed resource managers is
-undefined in the current API. A transaction will probably fail if the
-Connection is closed, or succeed by accident if the Connection is
-re-opened.
-
-The resource manager - transaction API should include some means for
-dealing with close. The likely approach is to raise an error if you
-close a resource manager that is currently registered with a
-transaction.
-
-First steps
------------
-
-I would definitely like to see some things in ZODB 3.3:
-
- - simplified module-level transaction calls
- - notifications for abort-commit event
- - restructured Connection to track modified objects itself
- - explicit transaction manager object
-
Modified: ZODB/trunk/src/transaction/tests/abstestIDataManager.py
===================================================================
--- ZODB/trunk/src/transaction/tests/abstestIDataManager.py 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/tests/abstestIDataManager.py 2005-04-13 21:48:16 UTC (rev 29966)
@@ -31,7 +31,6 @@
"""
from unittest import TestCase
-from transaction.interfaces import IRollback
class IDataManagerTests(TestCase, object):
@@ -56,8 +55,3 @@
tran = self.get_transaction()
self.datamgr.prepare(tran)
self.datamgr.abort(tran)
-
- def testRollback(self):
- tran = self.get_transaction()
- rb = self.datamgr.savepoint(tran)
- self.assert_(IRollback.providedBy(rb))
Deleted: ZODB/trunk/src/transaction/tests/test_util.py
===================================================================
--- ZODB/trunk/src/transaction/tests/test_util.py 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/tests/test_util.py 2005-04-13 21:48:16 UTC (rev 29966)
@@ -1,25 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Test transaction utilities
-
-$Id$
-"""
-import unittest
-from zope.testing.doctest import DocTestSuite
-
-def test_suite():
- return DocTestSuite('transaction.util')
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Deleted: ZODB/trunk/src/transaction/util.py
===================================================================
--- ZODB/trunk/src/transaction/util.py 2005-04-13 21:19:03 UTC (rev 29965)
+++ ZODB/trunk/src/transaction/util.py 2005-04-13 21:48:16 UTC (rev 29966)
@@ -1,51 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Utility classes or functions
-
-$Id$
-"""
-
-from transaction.interfaces import IRollback
-
-try:
- from zope.interface import implements
-except ImportError:
- def implements(*args):
- pass
-
-class NoSavepointSupportRollback:
- """Rollback for data managers that don't support savepoints
-
- >>> class DataManager:
- ... def savepoint(self, txn):
- ... return NoSavepointSupportRollback(self)
- >>> rb = DataManager().savepoint('some transaction')
- >>> rb.rollback()
- Traceback (most recent call last):
- ...
- NotImplementedError: """ \
- """DataManager data managers do not support """ \
- """savepoints (aka subtransactions
-
- """
-
- implements(IRollback)
-
- def __init__(self, dm):
- self.dm = dm.__class__.__name__
-
- def rollback(self):
- raise NotImplementedError(
- "%s data managers do not support savepoints (aka subtransactions"
- % self.dm)
More information about the Zodb-checkins
mailing list