Block creation of transaction for session w/ existing txn. (#3785) · landrito/google-cloud-python@4e864a5 · GitHub

landrito / google-cloud-python Public

forked from googleapis/google-cloud-python

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 4e864a5

Browse filesBrowse the repository at this point in the historyBrowse files

tseaver

authored and

landrito

committed

Block creation of transaction for session w/ existing txn. (googleapis#3785)

Closes googleapis#3476.

1 parent 7324c9e commit 4e864a5
Copy full SHA for 4e864a5

3 files changed

+20-1Lines changed: 20 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• spanner
  • google/cloud/spanner
    • session.py
    • transaction.py
  • tests/unit
    • test_transaction.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎spanner/google/cloud/spanner/session.py‎

Copy file name to clipboardExpand all lines: spanner/google/cloud/spanner/session.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -249,6 +249,7 @@ def transaction(self):
249	249
250	250	if self._transaction is not None:
251	251	self._transaction._rolled_back = True
	252	+ del self._transaction
252	253
253	254	txn = self._transaction = Transaction(self)
254	255	return txn

Collapse file

‎spanner/google/cloud/spanner/transaction.py‎

Copy file name to clipboardExpand all lines: spanner/google/cloud/spanner/transaction.py

+13-1Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -24,12 +24,24 @@
24	24
25	25
26	26	class Transaction(_SnapshotBase, _BatchBase):
27		- """Implement read-write transaction semantics for a session."""
	27	+ """Implement read-write transaction semantics for a session.
	28	+
	29	+ :type session: :class:`~google.cloud.spanner.session.Session`
	30	+ :param session: the session used to perform the commit
	31	+
	32	+ :raises ValueError: if session has an existing transaction
	33	+ """
28	34	committed = None
29	35	"""Timestamp at which the transaction was successfully committed."""
30	36	_rolled_back = False
31	37	_multi_use = True
32	38
	39	+ def __init__(self, session):
	40	+ if session._transaction is not None:
	41	+ raise ValueError("Session has existing transaction.")
	42	+
	43	+ super(Transaction, self).__init__(session)
	44	+
33	45	def _check_state(self):
34	46	"""Helper for :meth:`commit` et al.
35	47

Collapse file

‎spanner/tests/unit/test_transaction.py‎

Copy file name to clipboardExpand all lines: spanner/tests/unit/test_transaction.py

+6Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -47,6 +47,12 @@ def _make_one(self, session, *args, **kwargs):
47	47	session._transaction = transaction
48	48	return transaction
49	49
	50	+ def test_ctor_session_w_existing_txn(self):
	51	+ session = _Session()
	52	+ session._transaction = object()
	53	+ with self.assertRaises(ValueError):
	54	+ transaction = self._make_one(session)
	55	+
50	56	def test_ctor_defaults(self):
51	57	session = _Session()
52	58	transaction = self._make_one(session)

0 commit comments

Comments

0 (0)