Skip to content

FIX: close BigQuery Storage client transport channel after use #295

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

Merged
merged 4 commits into from
Nov 25, 2019
Merged

FIX: close BigQuery Storage client transport channel after use #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34e38bc
FIX: close BigQuery Storage client transport channel after use
tswast Nov 23, 2019
ca2cd67
blacken
tswast Nov 23, 2019
aed4d37
blacken
tswast Nov 25, 2019
862f4d8
Merge remote-tracking branch 'upstream/master' into issue294-bqstorag…
tswast Nov 25, 2019
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
7 changes: 5 additions & 2 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@
supported_pythons = ["3.5", "3.6", "3.7"]
latest_python = "3.7"

# Use a consistent version of black so CI is deterministic.
black_package = "black==19.10b0"


@nox.session
def lint(session, python=latest_python):
session.install("black", "flake8")
session.install(black_package, "flake8")
session.install("-e", ".")
session.run("flake8", "pandas_gbq")
session.run("flake8", "tests")
Expand All @@ -25,7 +28,7 @@ def lint(session, python=latest_python):

@nox.session(python=latest_python)
def blacken(session):
session.install("black")
session.install(black_package)
session.run("black", ".")


Expand Down
36 changes: 20 additions & 16 deletions pandas_gbq/gbq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@ def __init__(
context.project = self.project_id

self.client = self.get_client()
self.bqstorage_client = _make_bqstorage_client(
use_bqstorage_api, self.credentials
)
self.use_bqstorage_api = use_bqstorage_api

# BQ Queries costs $5 per TB. First 1 TB per month is free
# see here for more: https://cloud.google.com/bigquery/pricing
Expand Down Expand Up @@ -541,29 +539,35 @@ def _download_results(
if max_results == 0:
return None

if max_results is None:
# Only use the BigQuery Storage API if the full result set is requested.
bqstorage_client = self.bqstorage_client
else:
try:
bqstorage_client = None
if max_results is None:
# Only use the BigQuery Storage API if the full result set is requested.
bqstorage_client = _make_bqstorage_client(
self.use_bqstorage_api, self.credentials
)

try:
query_job.result()
# Get the table schema, so that we can list rows.
destination = self.client.get_table(query_job.destination)
rows_iter = self.client.list_rows(
destination, max_results=max_results
)

schema_fields = [field.to_api_repr() for field in rows_iter.schema]
nullsafe_dtypes = _bqschema_to_nullsafe_dtypes(schema_fields)
df = rows_iter.to_dataframe(
dtypes=nullsafe_dtypes,
bqstorage_client=bqstorage_client,
progress_bar_type=progress_bar_type,
)
except self.http_error as ex:
self.process_http_error(ex)

schema_fields = [field.to_api_repr() for field in rows_iter.schema]
nullsafe_dtypes = _bqschema_to_nullsafe_dtypes(schema_fields)
df = rows_iter.to_dataframe(
dtypes=nullsafe_dtypes,
bqstorage_client=bqstorage_client,
progress_bar_type=progress_bar_type,
)
finally:
if bqstorage_client:
# Clean up open socket resources. See:
# https://github.com/pydata/pandas-gbq/issues/294
bqstorage_client.transport.channel.close()

if df.empty:
df = _cast_empty_df_dtypes(schema_fields, df)
Expand Down