Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: pass timeout to 'PartialRowsData.response_iterator' #16

Merged
merged 8 commits into from Sep 2, 2020
Merged

fix: pass timeout to 'PartialRowsData.response_iterator' #16

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a692884
fix: cbt-6 [added timeout value to PartialRowsData.response_iterator]
mf2199 Mar 31, 2020
2f69b38
Reverting to using the existing Retry._deadline member
mf2199 Apr 1, 2020
9bd6386
Merge branch 'master' into #6---Bigtable-read_rows-no-deadline
mf2199 May 28, 2020
1f938a5
fix: added test for `retry.timeout value`
mf2199 Jun 2, 2020
1ad1f35
Merge branch 'master' into #6---Bigtable-read_rows-no-deadline
mf2199 Jun 9, 2020
a132409
Merge branch 'master' into #6---Bigtable-read_rows-no-deadline
mf2199 Jul 2, 2020
56884c0
test: adding relevant test following dependency release
mf2199 Aug 17, 2020
7270400
docs: added comment
mf2199 Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/cloud/bigtable/row_data.py
View file
Open in desktop
Expand Up @@ -400,7 +400,7 @@ def __init__(self, read_method, request, retry=DEFAULT_RETRY_READ_ROWS):
self.read_method = read_method
self.request = request
self.retry = retry
self.response_iterator = read_method(request)
self.response_iterator = read_method(request, timeout=self.retry._deadline + 1)
kolea2 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this + 1? Can you add a comment explaining?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kolea2 Sure, copied from the PR description.


self.rows = {}
self._state = self.STATE_NEW_ROW
Expand Down
7 changes: 6 additions & 1 deletion tests/unit/test_row_data.py
View file
Open in desktop
Expand Up @@ -385,10 +385,14 @@ def test_constructor(self):
self.assertEqual(partial_rows_data.retry, DEFAULT_RETRY_READ_ROWS)

def test_constructor_with_retry(self):
from google.cloud.bigtable.row_data import DEFAULT_RETRY_READ_ROWS

client = _Client()
client._data_stub = mock.MagicMock()
request = retry = object()
request = object()
retry = DEFAULT_RETRY_READ_ROWS
partial_rows_data = self._make_one(client._data_stub.ReadRows, request, retry)
# self.assertEqual(partial_rows_data.response_iterator.timeout, 60.0)
tseaver marked this conversation as resolved.
Show resolved Hide resolved
self.assertIs(partial_rows_data.request, request)
self.assertEqual(partial_rows_data.rows, {})
self.assertEqual(partial_rows_data.retry, retry)
Expand Down Expand Up @@ -471,6 +475,7 @@ def test_state_new_row_w_row(self):
request = object()

yrd = self._make_one(client._table_data_client.transport.read_rows, request)
self.assertEqual(yrd.retry._deadline, 60.0)

yrd._response_iterator = iterator
rows = [row for row in yrd]
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/test_table.py
View file
Open in desktop
Expand Up @@ -650,6 +650,7 @@ def test_read_rows(self):
from google.cloud.bigtable import table as MUT
from google.cloud.bigtable_v2.gapic import bigtable_client
from google.cloud.bigtable_admin_v2.gapic import bigtable_table_admin_client
from google.cloud.bigtable.row_data import DEFAULT_RETRY_READ_ROWS

data_api = bigtable_client.BigtableClient(mock.Mock())
table_api = mock.create_autospec(
Expand All @@ -666,7 +667,8 @@ def test_read_rows(self):
table = self._make_one(self.TABLE_ID, instance, app_profile_id=app_profile_id)

# Create request_pb
request = retry = object() # Returned by our mock.
request = object() # Returned by our mock.
retry = DEFAULT_RETRY_READ_ROWS
mock_created = []

def mock_create_row_request(table_name, **kwargs):
Expand Down