google-cloud-spanner 3.56.0__tar.gz → 3.57.0__tar.gz

{google_cloud_spanner-3.56.0/google_cloud_spanner.egg-info → google_cloud_spanner-3.57.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-spanner
-Version: 3.56.0
+Version: 3.57.0
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_admin_database_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.56.0"  # {x-release-please-version}
+__version__ = "3.57.0"  # {x-release-please-version}

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_admin_instance_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.56.0"  # {x-release-please-version}
+__version__ = "3.57.0"  # {x-release-please-version}

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_dbapi/connection.py

@@ -819,8 +819,9 @@ def connect(
     instance = client.instance(instance_id)
     database = None
     if database_id:
+        logger = kwargs.get("logger")
         database = instance.database(
-            database_id, pool=pool, database_role=database_role
+            database_id, pool=pool, database_role=database_role, logger=logger
         )
     conn = Connection(instance, database, **kwargs)
     if pool is not None:

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "3.56.0"  # {x-release-please-version}
+__version__ = "3.57.0"  # {x-release-please-version}

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_v1/snapshot.py

@@ -133,7 +133,11 @@ def _restart_on_unavailable(
                 # Update the transaction from the response.
                 if transaction is not None:
                     transaction._update_for_result_set_pb(item)
-                if item.precommit_token is not None and transaction is not None:
+                if (
+                    item._pb is not None
+                    and item._pb.HasField("precommit_token")
+                    and transaction is not None
+                ):
                     transaction._update_for_precommit_token_pb(item.precommit_token)
 
                 if item.resume_token:
@@ -1029,7 +1033,7 @@ class _SnapshotBase(_SessionWrapper):
         if self._transaction_id is None and transaction_pb.id:
             self._transaction_id = transaction_pb.id
 
-        if transaction_pb.precommit_token:
+        if transaction_pb._pb.HasField("precommit_token"):
             self._update_for_precommit_token_pb_unsafe(transaction_pb.precommit_token)
 
     def _update_for_precommit_token_pb(

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/google/cloud/spanner_v1/transaction.py

@@ -328,14 +328,20 @@ class Transaction(_SnapshotBase, _BatchBase):
             # successfully commit, and must be retried with the new precommit token.
             # The mutations should not be included in the new request, and no further
             # retries or exception handling should be performed.
-            if commit_response_pb.precommit_token:
+            if commit_response_pb._pb.HasField("precommit_token"):
                 add_span_event(span, commit_retry_event_name)
+                nth_request = database._next_nth_request
                 commit_response_pb = api.commit(
                     request=CommitRequest(
                         precommit_token=commit_response_pb.precommit_token,
                         **common_commit_request_args,
                     ),
-                    metadata=metadata,
+                    metadata=database.metadata_with_request_id(
+                        nth_request,
+                        1,
+                        metadata,
+                        span,
+                    ),
                 )
 
             add_span_event(span, "Commit Done")
@@ -521,7 +527,7 @@ class Transaction(_SnapshotBase, _BatchBase):
         if is_inline_begin:
             self._lock.release()
 
-        if result_set_pb.precommit_token is not None:
+        if result_set_pb._pb.HasField("precommit_token"):
             self._update_for_precommit_token_pb(result_set_pb.precommit_token)
 
         return result_set_pb.stats.row_count_exact

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0/google_cloud_spanner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-cloud-spanner
-Version: 3.56.0
+Version: 3.57.0
 Summary: Google Cloud Spanner API client library
 Home-page: https://github.com/googleapis/python-spanner
 Author: Google LLC

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/mockserver_tests/mock_server_test_base.py

@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import logging
 import unittest
 
 import grpc
@@ -170,12 +170,15 @@ class MockServerTestBase(unittest.TestCase):
     spanner_service: SpannerServicer = None
     database_admin_service: DatabaseAdminServicer = None
     port: int = None
+    logger: logging.Logger = None
 
     def __init__(self, *args, **kwargs):
         super(MockServerTestBase, self).__init__(*args, **kwargs)
         self._client = None
         self._instance = None
         self._database = None
+        self.logger = logging.getLogger("MockServerTestBase")
+        self.logger.setLevel(logging.WARN)
 
     @classmethod
     def setup_class(cls):
@@ -227,6 +230,7 @@ class MockServerTestBase(unittest.TestCase):
                 "test-database",
                 pool=FixedSizePool(size=10),
                 enable_interceptors_in_tests=True,
+                logger=self.logger,
             )
         return self._database
 

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/mockserver_tests/test_request_id_header.py

@@ -227,10 +227,6 @@ class TestRequestIDHeader(MockServerTestBase):
                 (1, REQ_RAND_PROCESS_ID, NTH_CLIENT, CHANNEL_ID, exec_sql_seq, 1),
             )
         ]
-        print(f"Filtered unary segments: {filtered_unary_segments}")
-        print(f"Want unary segments: {want_unary_segments}")
-        print(f"Got stream segments: {got_stream_segments}")
-        print(f"Want stream segments: {want_stream_segments}")
         assert all(seg in filtered_unary_segments for seg in want_unary_segments)
         assert got_stream_segments == want_stream_segments
 
@@ -269,8 +265,6 @@ class TestRequestIDHeader(MockServerTestBase):
                 (1, REQ_RAND_PROCESS_ID, NTH_CLIENT, CHANNEL_ID, exec_sql_seq, 1),
             )
         ]
-        print(f"Got stream segments: {got_stream_segments}")
-        print(f"Want stream segments: {want_stream_segments}")
         assert got_stream_segments == want_stream_segments
 
     def test_streaming_retryable_error(self):

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/system/test_database_api.py

@@ -569,7 +569,10 @@ def test_db_run_in_transaction_then_snapshot_execute_sql(shared_database):
         batch.delete(sd.TABLE, sd.ALL)
 
     def _unit_of_work(transaction, test):
-        rows = list(transaction.read(test.TABLE, test.COLUMNS, sd.ALL))
+        # TODO: Remove query and execute a read instead when the Emulator has been fixed
+        #       and returns pre-commit tokens for streaming read results.
+        rows = list(transaction.execute_sql(sd.SQL))
+        # rows = list(transaction.read(test.TABLE, test.COLUMNS, sd.ALL))
         assert rows == []
 
         transaction.insert_or_update(test.TABLE, test.COLUMNS, test.ROW_DATA)
@@ -882,7 +885,10 @@ def test_db_run_in_transaction_w_max_commit_delay(shared_database):
         batch.delete(sd.TABLE, sd.ALL)
 
     def _unit_of_work(transaction, test):
-        rows = list(transaction.read(test.TABLE, test.COLUMNS, sd.ALL))
+        # TODO: Remove query and execute a read instead when the Emulator has been fixed
+        #       and returns pre-commit tokens for streaming read results.
+        rows = list(transaction.execute_sql(sd.SQL))
+        # rows = list(transaction.read(test.TABLE, test.COLUMNS, sd.ALL))
         assert rows == []
 
         transaction.insert_or_update(test.TABLE, test.COLUMNS, test.ROW_DATA)

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/system/test_session_api.py

@@ -932,6 +932,8 @@ def test_transaction_read_and_insert_then_exception(sessions_database):
 def test_transaction_read_and_insert_or_update_then_commit(
     sessions_database,
     sessions_to_delete,
+    # TODO: Re-enable when the emulator returns pre-commit tokens for reads.
+    not_emulator,
 ):
     # [START spanner_test_dml_read_your_writes]
     sd = _sample_data
@@ -1586,7 +1588,11 @@ def _read_w_concurrent_update(transaction, pkey):
     transaction.update(COUNTERS_TABLE, COUNTERS_COLUMNS, [[pkey, value + 1]])
 
 
-def test_transaction_read_w_concurrent_updates(sessions_database):
+def test_transaction_read_w_concurrent_updates(
+    sessions_database,
+    # TODO: Re-enable when the Emulator returns pre-commit tokens for streaming reads.
+    not_emulator,
+):
     pkey = "read_w_concurrent_updates"
     _transaction_concurrency_helper(sessions_database, _read_w_concurrent_update, pkey)
 

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/unit/spanner_dbapi/test_connect.py

@@ -59,7 +59,7 @@ class Test_connect(unittest.TestCase):
 
         self.assertIs(connection.database, database)
         instance.database.assert_called_once_with(
-            DATABASE, pool=None, database_role=None
+            DATABASE, pool=None, database_role=None, logger=None
         )
         # Database constructs its own pool
         self.assertIsNotNone(connection.database._pool)
@@ -107,7 +107,7 @@ class Test_connect(unittest.TestCase):
 
         self.assertIs(connection.database, database)
         instance.database.assert_called_once_with(
-            DATABASE, pool=pool, database_role=role
+            DATABASE, pool=pool, database_role=role, logger=None
         )
 
     def test_w_credential_file_path(self, mock_client):

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/unit/spanner_dbapi/test_connection.py

@@ -888,8 +888,9 @@ class _Instance(object):
         pool=None,
         database_dialect=DatabaseDialect.GOOGLE_STANDARD_SQL,
         database_role=None,
+        logger=None,
     ):
-        return _Database(database_id, pool, database_dialect, database_role)
+        return _Database(database_id, pool, database_dialect, database_role, logger)
 
 
 class _Database(object):
@@ -899,8 +900,10 @@ class _Database(object):
         pool=None,
         database_dialect=DatabaseDialect.GOOGLE_STANDARD_SQL,
         database_role=None,
+        logger=None,
     ):
         self.name = database_id
         self.pool = pool
         self.database_dialect = database_dialect
         self.database_role = database_role
+        self.logger = logger

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/unit/test_snapshot.py

@@ -158,6 +158,7 @@ class Test_restart_on_unavailable(OpenTelemetryBase):
             resume_token=resume_token,
             metadata=metadata,
             precommit_token=None,
+            _pb=None,
             spec=["value", "resume_token", "metadata", "precommit_token"],
         )
 

{google_cloud_spanner-3.56.0 → google_cloud_spanner-3.57.0}/tests/unit/test_transaction.py

@@ -533,7 +533,7 @@ class TestTransaction(OpenTelemetryBase):
             )
             commit.assert_any_call(
                 request=expected_retry_request,
-                metadata=base_metadata,
+                metadata=expected_retry_metadata,
             )
 
         if not HAS_OPENTELEMETRY_INSTALLED: