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.

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

bug: fixes discrepancy btwn python-api-core & bigquery re object defa… #1541

Merged
merged 29 commits into from
Apr 18, 2023
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
20caba2
bug: fixes discrepancy btwn python-api-core & bigquery re object defa…
chalmerlowe Apr 3, 2023
ff0318c
Fix: loosen ipywidget dependency (#1504)
chalmerlowe Feb 22, 2023
9362716
chore(main): release 3.6.0 (#1490)
release-please[bot] Feb 22, 2023
9b58418
docs: Remove < 3.11 reference from README (#1502)
jumbosushi Feb 27, 2023
0005519
chore(python): upgrade gcp-releasetool in .kokoro [autoapprove] (#1508)
gcf-owl-bot[bot] Feb 27, 2023
81ef7f4
feat: add `connection_properties` and `create_session` to `LoadJobCon…
shobsi Feb 27, 2023
2b423b7
chore(deps): update all dependencies (#1501)
renovate-bot Mar 1, 2023
9622366
chore(deps): update all dependencies (#1513)
renovate-bot Mar 1, 2023
82f2a51
feat: add default_query_job_config property and property setter to BQ…
chelsea-lin Mar 2, 2023
b1e1a44
chore(deps): update all dependencies (#1514)
renovate-bot Mar 4, 2023
df75775
chore(deps): update dependency charset-normalizer to v3.1.0 (#1518)
renovate-bot Mar 6, 2023
8a7cab3
chore(main): release 3.7.0 (#1507)
release-please[bot] Mar 13, 2023
b3600d9
feat: expose configuration property on CopyJob, ExtractJob, LoadJob, …
tswast Mar 14, 2023
0963cc5
chore(deps): Update nox in .kokoro/requirements.in [autoapprove] (#1527)
gcf-owl-bot[bot] Mar 16, 2023
18af7c5
feat: add default LoadJobConfig to Client (#1526)
chelsea-lin Mar 17, 2023
9f5e257
feat: add bool, int, float, string dtype to to_dataframe (#1529)
chelsea-lin Mar 23, 2023
80f1ad2
fix: loosen ipywidgets restrictions further to address ipython compat…
tswast Mar 24, 2023
202b603
chore(main): release 3.8.0 (#1525)
release-please[bot] Mar 27, 2023
1fef2fc
fix: keyerror when the load_table_from_dataframe accesses a unmapped …
chelsea-lin Mar 28, 2023
2165b7b
feat: expose query job on dbapi cursor (#1520)
r1b Mar 28, 2023
5362795
chore(main): release 3.9.0 (#1537)
release-please[bot] Mar 28, 2023
6edf1ef
chore: update tests to be compatible with pandas 2.0 (#1538)
tswast Mar 30, 2023
985bae5
chore(deps): update all dependencies (#1522)
renovate-bot Mar 30, 2023
b7548d6
chore: updates minimum version of bqstorage (#1542)
chalmerlowe Apr 4, 2023
5d2c2d2
updates conditional checks, comments, adds test
chalmerlowe Apr 13, 2023
c3d629f
Merge branch 'main' into correct-timeout-type
chalmerlowe Apr 13, 2023
a9c2c48
Removes test, adds pragma no cover
chalmerlowe Apr 17, 2023
b8033f3
Removes test
chalmerlowe Apr 17, 2023
8409a23
fix linting error
chalmerlowe Apr 18, 2023
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: 9 additions & 1 deletion google/cloud/bigquery/job/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,6 @@ def __init__(self, job_id, query, client, job_config=None):
_helpers._set_sub_prop(
self._properties, ["configuration", "query", "query"], query
)

self._query_results = None
self._done_timeout = None
self._transport_timeout = None
Expand Down Expand Up @@ -1332,6 +1331,15 @@ def _reload_query_results(
# the timeout from the futures API is respected. See:
# https://github.com/GoogleCloudPlatform/google-cloud-python/issues/4135
timeout_ms = None

# Python_API_core, as part of a major rewrite of the deadline, timeout,
# retry process sets the timeout value as a Python object().
# Our system does not natively handle that and instead expects
# either none or a numeric value. If passed a Python object, convert to
# None.
if type(self._done_timeout) == object: # pragma: NO COVER
self._done_timeout = None

if self._done_timeout is not None:
# Subtract a buffer for context switching, network latency, etc.
api_timeout = self._done_timeout - _TIMEOUT_BUFFER_SECS
Expand Down