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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BigQuery: use _get_sub_prop helper so missing load stats don't raise. #6269

Merged
merged 2 commits into from
Oct 19, 2018
Merged

BigQuery: use _get_sub_prop helper so missing load stats don't raise. #6269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1eceb60
use _get_sub_prop helper so missing load stats don't raise
Oct 18, 2018
18a266d
coerce statistics to ints
Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions bigquery/google/cloud/bigquery/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,9 +1374,9 @@ def input_file_bytes(self):
:returns: the count (None until set from the server).
:raises: ValueError for invalid value types.
"""
statistics = self._properties.get('statistics')
if statistics is not None:
return int(statistics['load']['inputFileBytes'])
return _helpers._int_or_none(_helpers._get_sub_prop(
self._properties, ['statistics', 'load', 'inputFileBytes']
))

@property
def input_files(self):
Expand All @@ -1385,9 +1385,9 @@ def input_files(self):
:rtype: int, or ``NoneType``
:returns: the count (None until set from the server).
"""
statistics = self._properties.get('statistics')
if statistics is not None:
return int(statistics['load']['inputFiles'])
return _helpers._int_or_none(_helpers._get_sub_prop(
self._properties, ['statistics', 'load', 'inputFiles']
))

@property
def output_bytes(self):
Expand All @@ -1396,9 +1396,9 @@ def output_bytes(self):
:rtype: int, or ``NoneType``
:returns: the count (None until set from the server).
"""
statistics = self._properties.get('statistics')
if statistics is not None:
return int(statistics['load']['outputBytes'])
return _helpers._int_or_none(_helpers._get_sub_prop(
self._properties, ['statistics', 'load', 'outputBytes']
))

@property
def output_rows(self):
Expand All @@ -1407,9 +1407,9 @@ def output_rows(self):
:rtype: int, or ``NoneType``
:returns: the count (None until set from the server).
"""
statistics = self._properties.get('statistics')
if statistics is not None:
return int(statistics['load']['outputRows'])
return _helpers._int_or_none(_helpers._get_sub_prop(
self._properties, ['statistics', 'load', 'outputRows']
))

def to_api_repr(self):
"""Generate a resource for :meth:`_begin`."""
Expand Down
14 changes: 9 additions & 5 deletions bigquery/tests/unit/test_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1985,11 +1985,6 @@ def test_props_set_by_server(self):
statistics['creationTime'] = _millis(CREATED)
statistics['startTime'] = _millis(STARTED)
statistics['endTime'] = _millis(ENDED)
load_stats = statistics['load'] = {}
load_stats['inputFileBytes'] = 12345
load_stats['inputFiles'] = 1
load_stats['outputBytes'] = 23456
load_stats['outputRows'] = 345

self.assertEqual(job.etag, 'ETAG')
self.assertEqual(job.self_link, URL)
Expand All @@ -1999,6 +1994,15 @@ def test_props_set_by_server(self):
self.assertEqual(job.started, STARTED)
self.assertEqual(job.ended, ENDED)

# running jobs have no load stats not yet set.
self.assertIsNone(job.output_bytes)

load_stats = statistics['load'] = {}
load_stats['inputFileBytes'] = 12345
load_stats['inputFiles'] = 1
load_stats['outputBytes'] = 23456
load_stats['outputRows'] = 345

self.assertEqual(job.input_file_bytes, 12345)
self.assertEqual(job.input_files, 1)
self.assertEqual(job.output_bytes, 23456)
Expand Down