Skip to content

fix: avoid unnecessary call to jobs.get in case of retriable query failure #1797

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

Closed
tswast wants to merge 2 commits into from
Closed

fix: avoid unnecessary call to jobs.get in case of retriable query failure #1797

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55f0a24
fix: avoid unnecessary call to jobs.get in case of retriable query fa…
tswast Jan 24, 2024
d47919c
Merge branch 'main' into getQueryResults-before-jobs-get
kiraksi Jan 24, 2024
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
10 changes: 8 additions & 2 deletions google/cloud/bigquery/job/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,8 @@ def result( # type: ignore # (incompatible with supertype)
)

first = True
if self.state is None:
self._begin(retry=retry, timeout=timeout)

def do_get_result():
nonlocal first
Expand Down Expand Up @@ -1581,14 +1583,18 @@ def do_get_result():
self._retry_do_query = retry_do_query
self._job_retry = job_retry

super(QueryJob, self).result(retry=retry, timeout=timeout)

# Since the job could already be "done" (e.g. got a finished job
# via client.get_job), the superclass call to done() might not
# set the self._query_results cache.
if self._query_results is None or not self._query_results.complete:
self._reload_query_results(retry=retry, timeout=timeout)

# jobs.getQueryResults should be called before jobs.get. The
# jobs.getQueryResults request will raise an exception for
# failed jobs. This means our job retry mechanism can start
# earlier without a wasted call to jobs.get.
super(QueryJob, self).result(retry=retry, timeout=timeout)

if retry_do_query is not None and job_retry is not None:
do_get_result = job_retry(do_get_result)

Expand Down