Reduce unnecessary changes

Author: odeke-em

google/cloud/spanner_v1/__init__.py

@@ -75,7 +75,6 @@
 from google.cloud.spanner_v1.pool import FixedSizePool
 from google.cloud.spanner_v1.pool import PingingPool
 from google.cloud.spanner_v1.pool import TransactionPingingPool
-from google.cloud.spanner_v1._helpers import monkey_patch
 
 
 COMMIT_TIMESTAMP = "spanner.commit_timestamp()"
@@ -84,8 +83,6 @@
 ``(allow_commit_timestamp=true)`` in the schema.
 """
 
-monkey_patch(Transaction)
-
 
 __all__ = (
     # google.cloud.spanner_v1

google/cloud/spanner_v1/pool.py

@@ -246,10 +246,8 @@ def bind(self, database):
             observability_options=observability_options,
             metadata=metadata,
         ) as span, MetricsCapture():
-            attempt = 1
             returned_session_count = 0
             while not self._sessions.full():
-                print("fixedPool.batchCreateSessions")
                 request.session_count = requested_session_count - self._sessions.qsize()
                 add_span_event(
                     span,
@@ -563,7 +561,6 @@ def bind(self, database):
         ) as span, MetricsCapture():
             returned_session_count = 0
             while returned_session_count < self.size:
-                print("pingingPool.batchCreateSessions")
                 resp = api.batch_create_sessions(
                     request=request,
                     metadata=database.metadata_with_request_id(

google/cloud/spanner_v1/snapshot.py

@@ -82,8 +82,6 @@ def _restart_on_unavailable(
 
     resume_token = b""
     item_buffer = []
-    next_nth_request = lambda: getattr(request_id_manager, "_next_nth_request", 0)
-    nth_request = next_nth_request()
 
     if transaction is not None:
         transaction_selector = transaction._make_txn_selector()

google/cloud/spanner_v1/testing/mock_spanner.py

@@ -53,7 +53,6 @@ def pop_error(self, context):
         name = inspect.currentframe().f_back.f_code.co_name
         error: _Status | None = self.errors.pop(name, None)
         if error:
-            print("context.abort_with_status", error)
             context.abort_with_status(error)
 
     def get_result_as_partial_result_sets(

tests/unit/test_atomic_counter.py

@@ -15,7 +15,6 @@
 import random
 import threading
 import unittest
-
 from google.cloud.spanner_v1._helpers import AtomicCounter
 
 

tests/unit/test_database.py

@@ -3449,31 +3449,6 @@ def metadata_with_request_id(self, nth_request, nth_attempt, prior_metadata=[]):
     def _channel_id(self):
         return 1
 
-    @property
-    def _next_nth_request(self):
-        if self._instance and self._instance._client:
-            return self._instance._client._next_nth_request
-        return 1
-
-    @property
-    def _nth_client_id(self):
-        if self._instance and self._instance._client:
-            return self._instance._client._nth_client_id
-        return 1
-
-    def metadata_with_request_id(self, nth_request, nth_attempt, prior_metadata=[]):
-        return _metadata_with_request_id(
-            self._nth_client_id,
-            self._channel_id,
-            nth_request,
-            nth_attempt,
-            prior_metadata,
-        )
-
-    @property
-    def _channel_id(self):
-        return 1
-
 
 class _Pool(object):
     _bound = None

tests/unit/test_session.py

@@ -1560,7 +1560,6 @@ def _time(_results=[1, 2, 4, 8]):
             self.assertEqual(kw, {})
 
         expected_options = TransactionOptions(read_write=TransactionOptions.ReadWrite())
-        print("gax_api", gax_api.begin_transaction.call_args_list[2])
         self.assertEqual(
             gax_api.begin_transaction.call_args_list,
             [

tests/unit/test_spanner.py

@@ -13,8 +13,6 @@
 # limitations under the License.
 
 
-import sys
-import traceback
 import threading
 from google.protobuf.struct_pb2 import Struct
 from google.cloud.spanner_v1 import (
@@ -45,10 +43,6 @@
     _merge_query_options,
     _metadata_with_request_id,
 )
-from google.cloud.spanner_v1._helpers import (
-    AtomicCounter,
-    _metadata_with_request_id,
-)
 from google.cloud.spanner_v1.request_id_header import REQ_RAND_PROCESS_ID
 import mock