fix: Pass the "retry" when calling read_rows. (#759) · googleapis/google-cloud-python@459e852 · GitHub

googleapis / google-cloud-python Public

• Notifications You must be signed in to change notification settings
• Fork 1.8k
• Star 5.4k

• Code
• Issues 442
• Pull requests 97
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 459e852

Browse filesBrowse the repository at this point in the historyBrowse files

Mariatta

authored

fix: Pass the "retry" when calling read_rows. (#759)

1 parent 5e35b12 commit 459e852
Copy full SHA for 459e852

3 files changed

+15-5Lines changed: 15 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• packages/google-cloud-bigtable
  • google/cloud/bigtable
    • row_data.py
  • tests/unit
    • test_row_data.py
    • test_table.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎packages/google-cloud-bigtable/google/cloud/bigtable/row_data.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-bigtable/google/cloud/bigtable/row_data.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -157,7 +157,9 @@ def __init__(self, read_method, request, retry=DEFAULT_RETRY_READ_ROWS):
157	157	# Otherwise there is a risk of entering an infinite loop that resets
158	158	# the timeout counter just before it being triggered. The increment
159	159	# by 1 second here is customary but should not be much less than that.
160		- self.response_iterator = read_method(request, timeout=self.retry._deadline + 1)
	160	+ self.response_iterator = read_method(
	161	+ request, timeout=self.retry._deadline + 1, retry=self.retry
	162	+ )
161	163
162	164	self.rows = {}
163	165

Collapse file

‎packages/google-cloud-bigtable/tests/unit/test_row_data.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-bigtable/tests/unit/test_row_data.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -446,7 +446,9 @@ def test_partial_rows_data_constructor_with_retry():
446	446	client._data_stub.ReadRows, request, retry
447	447	)
448	448	partial_rows_data.read_method.assert_called_once_with(
449		- request, timeout=DEFAULT_RETRY_READ_ROWS.deadline + 1
	449	+ request,
	450	+ timeout=DEFAULT_RETRY_READ_ROWS.deadline + 1,
	451	+ retry=DEFAULT_RETRY_READ_ROWS,
450	452	)
451	453	assert partial_rows_data.request is request
452	454	assert partial_rows_data.rows == {}

Collapse file

‎packages/google-cloud-bigtable/tests/unit/test_table.py‎

Copy file name to clipboardExpand all lines: packages/google-cloud-bigtable/tests/unit/test_table.py

+9-3Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -643,6 +643,7 @@ def _table_read_row_helper(chunks, expected_result, app_profile_id=None):
643	643	from google.cloud.bigtable import table as MUT
644	644	from google.cloud.bigtable.row_set import RowSet
645	645	from google.cloud.bigtable.row_filters import RowSampleFilter
	646	+ from google.cloud.bigtable.row_data import DEFAULT_RETRY_READ_ROWS
646	647
647	648	credentials = _make_credentials()
648	649	client = _make_client(project="project-id", credentials=credentials, admin=True)
@@ -691,7 +692,9 @@ def mock_create_row_request(table_name, **kwargs):
691	692	assert result == expected_result
692	693	assert mock_created == expected_request
693	694
694		- data_api.read_rows.assert_called_once_with(request_pb, timeout=61.0)
	695	+ data_api.read_rows.assert_called_once_with(
	696	+ request_pb, timeout=61.0, retry=DEFAULT_RETRY_READ_ROWS
	697	+ )
695	698
696	699
697	700	def test_table_read_row_miss_no__responses():
@@ -906,7 +909,7 @@ def mock_create_row_request(table_name, **kwargs):
906	909	}
907	910	assert mock_created == [(table.name, created_kwargs)]
908	911
909		- data_api.read_rows.assert_called_once_with(request_pb, timeout=61.0)
	912	+ data_api.read_rows.assert_called_once_with(request_pb, timeout=61.0, retry=retry)
910	913
911	914
912	915	def test_table_read_retry_rows():
@@ -1082,6 +1085,7 @@ def test_table_yield_rows_with_row_set():
1082	1085	from google.cloud.bigtable.row_set import RowSet
1083	1086	from google.cloud.bigtable.row_set import RowRange
1084	1087	from google.cloud.bigtable.table import _create_row_request
	1088	+ from google.cloud.bigtable.row_data import DEFAULT_RETRY_READ_ROWS
1085	1089
1086	1090	credentials = _make_credentials()
1087	1091	client = _make_client(project="project-id", credentials=credentials, admin=True)
@@ -1149,7 +1153,9 @@ def test_table_yield_rows_with_row_set():
1149	1153	end_key=ROW_KEY_2,
1150	1154	)
1151	1155	expected_request.rows.row_keys.append(ROW_KEY_3)
1152		- data_api.read_rows.assert_called_once_with(expected_request, timeout=61.0)
	1156	+ data_api.read_rows.assert_called_once_with(
	1157	+ expected_request, timeout=61.0, retry=DEFAULT_RETRY_READ_ROWS
	1158	+ )
1153	1159
1154	1160
1155	1161	def test_table_sample_row_keys():

0 commit comments

Comments

0 (0)