chore: clean up merge conflict issues

Author: chalmerlowe

packages/google-cloud-spanner/google/cloud/spanner_v1/client.py

@@ -45,6 +45,9 @@
 from google.cloud.spanner_admin_database_v1.services.database_admin.transports.grpc import (
     DatabaseAdminGrpcTransport,
 )
+from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
+    InstanceAdminGrpcTransport,
+)
 from google.cloud.spanner_admin_instance_v1 import (
     InstanceAdminClient as InstanceAdminClient,
 )

packages/google-cloud-spanner/google/cloud/spanner_v1/instance.py

@@ -36,6 +36,8 @@
 )
 from google.cloud.spanner_admin_database_v1.types import backup, spanner_database_admin
 from google.cloud.spanner_admin_instance_v1 import Instance as InstancePB
+from google.cloud.spanner_v1._helpers import _metadata_with_prefix
+from google.cloud.spanner_v1.backup import Backup
 from google.cloud.spanner_v1.database import Database
 
 _INSTANCE_NAME_RE = re.compile(

packages/google-cloud-spanner/google/cloud/spanner_v1/session.py

@@ -24,6 +24,7 @@
 
 from google.api_core.exceptions import Aborted, GoogleAPICallError, NotFound
 from google.api_core.gapic_v1 import method
+from google.cloud.aio._cross_sync import CrossSync
 
 from google.cloud.spanner_v1._helpers import (
     _get_retry_delay,
@@ -36,6 +37,7 @@
     trace_call,
 )
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
+from google.cloud.spanner_v1.batch import Batch
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.transaction import Transaction
 from google.cloud.spanner_v1.types.spanner import (

packages/google-cloud-spanner/google/cloud/spanner_v1/snapshot.py

@@ -18,6 +18,7 @@
 """Model a set of read-only queries to a database as a snapshot."""
 
 import functools
+import threading
 from typing import List, Optional, Union
 
 from google.api_core import gapic_v1
@@ -204,10 +205,6 @@ def __init__(self, session, client_context=None):
         self._precommit_token: Optional[MultiplexedSessionPrecommitToken] = None
         self._lock: CrossSync._Sync_Impl.Lock = CrossSync._Sync_Impl.Lock()
 
-        # Operation within a transaction can be performed using multiple
-        # threads, so we need to use a lock when updating the transaction.
-        self._lock: threading.Lock = threading.Lock()
-
         # Event to coordinate concurrent requests beginning the transaction.
         # This is used to prevent the "Transaction has not begun" race condition.
         self._transaction_begin_event = threading.Event()