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

BigQuery: Complete the to_arrow() method feature request #8693

Merged
merged 4 commits into from
Jul 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions bigquery/google/cloud/bigquery/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -2896,7 +2896,9 @@ def result(self, timeout=None, page_size=None, retry=DEFAULT_RETRY):
rows._preserve_order = _contains_order_by(self.query)
return rows

def to_arrow(self, progress_bar_type=None):
# If changing the signature of this method, make sure to apply the same
# changes to table.RowIterator.to_arrow()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note - this and the other similar comments might be redundant now that we have a test for method signatures, but I personally don't mind having them, as it makes the contract between the two classes more explicit.

def to_arrow(self, progress_bar_type=None, bqstorage_client=None):
"""[Beta] Create a class:`pyarrow.Table` by loading all pages of a
table or query.

Expand All @@ -2919,6 +2921,18 @@ def to_arrow(self, progress_bar_type=None):
``'tqdm_gui'``
Use the :func:`tqdm.tqdm_gui` function to display a
progress bar as a graphical dialog box.
bqstorage_client ( \
google.cloud.bigquery_storage_v1beta1.BigQueryStorageClient \
):
**Beta Feature** Optional. A BigQuery Storage API client. If
supplied, use the faster BigQuery Storage API to fetch rows
from BigQuery. This API is a billable API.

This method requires the ``pyarrow`` and
``google-cloud-bigquery-storage`` libraries.

Reading from a specific partition or snapshot is not
currently supported by this method.

Returns:
pyarrow.Table
Expand All @@ -2932,8 +2946,12 @@ def to_arrow(self, progress_bar_type=None):

..versionadded:: 1.17.0
"""
return self.result().to_arrow(progress_bar_type=progress_bar_type)
return self.result().to_arrow(
progress_bar_type=progress_bar_type, bqstorage_client=bqstorage_client
)

# If changing the signature of this method, make sure to apply the same
# changes to table.RowIterator.to_dataframe()
def to_dataframe(self, bqstorage_client=None, dtypes=None, progress_bar_type=None):
"""Return a pandas DataFrame from a QueryJob

Expand Down
4 changes: 4 additions & 0 deletions bigquery/google/cloud/bigquery/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,8 @@ def _to_arrow_iterable(self, bqstorage_client=None):
bqstorage_client=bqstorage_client,
)

# If changing the signature of this method, make sure to apply the same
# changes to job.QueryJob.to_arrow()
def to_arrow(self, progress_bar_type=None, bqstorage_client=None):
"""[Beta] Create a class:`pyarrow.Table` by loading all pages of a
table or query.
Expand Down Expand Up @@ -1552,6 +1554,8 @@ def _to_dataframe_iterable(self, bqstorage_client=None, dtypes=None):
bqstorage_client=bqstorage_client,
)

# If changing the signature of this method, make sure to apply the same
# changes to job.QueryJob.to_dataframe()
def to_dataframe(self, bqstorage_client=None, dtypes=None, progress_bar_type=None):
"""Create a pandas DataFrame by loading all pages of a query.

Expand Down
51 changes: 51 additions & 0 deletions bigquery/tests/unit/test_signature_compatibility.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Copyright 2019 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import inspect

import pytest


@pytest.fixture
def query_job_class():
from google.cloud.bigquery.job import QueryJob

return QueryJob


@pytest.fixture
def row_iterator_class():
from google.cloud.bigquery.table import RowIterator

return RowIterator


@pytest.mark.skipif(
not hasattr(inspect, "signature"),
reason="inspect.signature() is not availalbe in older Python versions",
)
def test_to_arrow_method_signatures_match(query_job_class, row_iterator_class):
sig = inspect.signature(query_job_class.to_arrow)
sig2 = inspect.signature(row_iterator_class.to_arrow)
assert sig == sig2
Copy link
Contributor

Choose a reason for hiding this comment

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

Love this! ❤️ Thanks for the test. I wouldn't have thought to try this.



@pytest.mark.skipif(
not hasattr(inspect, "signature"),
reason="inspect.signature() is not availalbe in older Python versions",
)
def test_to_dataframe_method_signatures_match(query_job_class, row_iterator_class):
sig = inspect.signature(query_job_class.to_dataframe)
sig2 = inspect.signature(row_iterator_class.to_dataframe)
assert sig == sig2