Merge branch 'main' into propagate-x_goog_spanner_request_id-to-OTEL-span

Author: odeke-em

docs/transaction-usage.rst

@@ -5,7 +5,8 @@ A :class:`~google.cloud.spanner_v1.transaction.Transaction` represents a
 transaction:  when the transaction commits, it will send any accumulated
 mutations to the server.
 
-To understand more about how transactions work, visit [Transaction](https://cloud.google.com/spanner/docs/reference/rest/v1/Transaction).
+To understand more about how transactions work, visit
+`Transaction <https://cloud.google.com/spanner/docs/reference/rest/v1/Transaction>`_.
 To learn more about how to use them in the Python client, continue reading.
 
 
@@ -90,8 +91,8 @@ any of the records already exists.
 Update records using a Transaction
 ----------------------------------
 
-:meth:`Transaction.update` updates one or more existing records in a table.  Fails
-if any of the records does not already exist.
+:meth:`Transaction.update` updates one or more existing records in a table.
+Fails if any of the records does not already exist.
 
 .. code:: python
 
@@ -178,35 +179,40 @@ Using :meth:`~Database.run_in_transaction`
 
 Rather than calling :meth:`~Transaction.commit` or :meth:`~Transaction.rollback`
 manually, you should use :meth:`~Database.run_in_transaction` to run the
-function that you need.  The transaction's :meth:`~Transaction.commit` method
+function that you need. The transaction's :meth:`~Transaction.commit` method
 will be called automatically if the ``with`` block exits without raising an
-exception.  The function will automatically be retried for
+exception. The function will automatically be retried for
 :class:`~google.api_core.exceptions.Aborted` errors, but will raise on
 :class:`~google.api_core.exceptions.GoogleAPICallError` and
 :meth:`~Transaction.rollback` will be called on all others.
 
 .. code:: python
 
     def _unit_of_work(transaction):
-
         transaction.insert(
-            'citizens', columns=['email', 'first_name', 'last_name', 'age'],
+            'citizens',
+            columns=['email', 'first_name', 'last_name', 'age'],
             values=[
                 ['phred@exammple.com', 'Phred', 'Phlyntstone', 32],
                 ['bharney@example.com', 'Bharney', 'Rhubble', 31],
-            ])
+            ]
+        )
 
         transaction.update(
-            'citizens', columns=['email', 'age'],
+            'citizens',
+            columns=['email', 'age'],
             values=[
                 ['phred@exammple.com', 33],
                 ['bharney@example.com', 32],
-            ])
+            ]
+        )
 
         ...
 
-        transaction.delete('citizens',
-            keyset['bharney@example.com', 'nonesuch@example.com'])
+        transaction.delete(
+            'citizens',
+            keyset=['bharney@example.com', 'nonesuch@example.com']
+        )
 
     db.run_in_transaction(_unit_of_work)
 
@@ -242,7 +248,7 @@ If an exception is raised inside the ``with`` block, the transaction's
         ...
 
         transaction.delete('citizens',
-            keyset['bharney@example.com', 'nonesuch@example.com'])
+            keyset=['bharney@example.com', 'nonesuch@example.com'])
 
 
 Begin a Transaction

tests/mockserver_tests/test_basics.py

@@ -93,6 +93,23 @@ def test_dbapi_partitioned_dml(self):
             TransactionOptions(dict(partitioned_dml={})), begin_request.options
         )
 
+    def test_batch_create_sessions_unavailable(self):
+        add_select1_result()
+        add_error(SpannerServicer.BatchCreateSessions.__name__, unavailable_status())
+        with self.database.snapshot() as snapshot:
+            results = snapshot.execute_sql("select 1")
+            result_list = []
+            for row in results:
+                result_list.append(row)
+                self.assertEqual(1, row[0])
+            self.assertEqual(1, len(result_list))
+        requests = self.spanner_service.requests
+        self.assertEqual(3, len(requests), msg=requests)
+        # The BatchCreateSessions call should be retried.
+        self.assertTrue(isinstance(requests[0], BatchCreateSessionsRequest))
+        self.assertTrue(isinstance(requests[1], BatchCreateSessionsRequest))
+        self.assertTrue(isinstance(requests[2], ExecuteSqlRequest))
+
     def test_execute_streaming_sql_unavailable(self):
         add_select1_result()
         # Add an UNAVAILABLE error that is returned the first time the