From 3c62fe438036f58a29597477226e056e936e61af Mon Sep 17 00:00:00 2001 From: Astha Mohta Date: Wed, 9 Aug 2023 14:45:01 +0530 Subject: [PATCH 1/4] change --- google/cloud/spanner_dbapi/connection.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index 6f5a9a4e0c..b80d56abfd 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -508,7 +508,7 @@ def connect( pool=None, user_agent=None, client=None, - route_to_leader_enabled=False, + route_to_leader_enabled=True, ): """Creates a connection to a Google Cloud Spanner database. @@ -557,6 +557,8 @@ def connect( :returns: Connection object associated with the given Google Cloud Spanner resource. """ + import pdb + pdb.set_trace() if client is None: client_info = ClientInfo( user_agent=user_agent or DEFAULT_USER_AGENT, @@ -568,14 +570,14 @@ def connect( credentials, project=project, client_info=client_info, - route_to_leader_enabled=False, + route_to_leader_enabled=route_to_leader_enabled, ) else: client = spanner.Client( project=project, credentials=credentials, client_info=client_info, - route_to_leader_enabled=False, + route_to_leader_enabled=route_to_leader_enabled, ) else: if project is not None and client.project != project: From 3df8ee6ec86bd771d6850edb7b75a23c5a50986a Mon Sep 17 00:00:00 2001 From: Astha Mohta Date: Wed, 9 Aug 2023 14:48:25 +0530 Subject: [PATCH 2/4] changes --- google/cloud/spanner_dbapi/connection.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index 510b298a20..ee0c4abb79 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -556,8 +556,6 @@ def connect( :returns: Connection object associated with the given Google Cloud Spanner resource. """ - import pdb - pdb.set_trace() if client is None: client_info = ClientInfo( user_agent=user_agent or DEFAULT_USER_AGENT, From b3d8dc1dd618c3d0e9979ec35a8534c54972757c Mon Sep 17 00:00:00 2001 From: Astha Mohta Date: Wed, 9 Aug 2023 14:51:24 +0530 Subject: [PATCH 3/4] changes --- google/cloud/spanner_dbapi/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index ee0c4abb79..f72285366a 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -508,7 +508,7 @@ def connect( pool=None, user_agent=None, client=None, - route_to_leader_enabled=True, + route_to_leader_enabled=False, ): """Creates a connection to a Google Cloud Spanner database. From ce40ff780ff12fc304486583ef08f82d0357021f Mon Sep 17 00:00:00 2001 From: Astha Mohta Date: Wed, 9 Aug 2023 15:03:18 +0530 Subject: [PATCH 4/4] change --- google/cloud/spanner_dbapi/connection.py | 4 +++- tests/unit/spanner_dbapi/test_connect.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/google/cloud/spanner_dbapi/connection.py b/google/cloud/spanner_dbapi/connection.py index f72285366a..07f5f6d3f2 100644 --- a/google/cloud/spanner_dbapi/connection.py +++ b/google/cloud/spanner_dbapi/connection.py @@ -547,9 +547,11 @@ def connect( :type route_to_leader_enabled: boolean :param route_to_leader_enabled: - (Optional) Default True. Set route_to_leader_enabled as False to + (Optional) Default False. Set route_to_leader_enabled as False to disable leader aware routing. Disabling leader aware routing would route all requests in RW/PDML transactions to the closest region. + Inline Begin Transaction should be enabled to take advantage of the + the option. :rtype: :class:`google.cloud.spanner_dbapi.connection.Connection` diff --git a/tests/unit/spanner_dbapi/test_connect.py b/tests/unit/spanner_dbapi/test_connect.py index 86dde73159..a5b520bcbf 100644 --- a/tests/unit/spanner_dbapi/test_connect.py +++ b/tests/unit/spanner_dbapi/test_connect.py @@ -86,7 +86,7 @@ def test_w_explicit(self, mock_client): project=PROJECT, credentials=credentials, client_info=mock.ANY, - route_to_leader_enabled=True, + route_to_leader_enabled=False, ) client_info = mock_client.call_args_list[0][1]["client_info"] self.assertEqual(client_info.user_agent, USER_AGENT) @@ -120,7 +120,7 @@ def test_w_credential_file_path(self, mock_client): credentials_path, project=PROJECT, client_info=mock.ANY, - route_to_leader_enabled=True, + route_to_leader_enabled=False, ) client_info = factory.call_args_list[0][1]["client_info"] self.assertEqual(client_info.user_agent, USER_AGENT)