You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/07/08 06:36:15 UTC
[1/2] beam git commit: [BEAM-2570] Fix breakage after cloud-bigquery
updated
Repository: beam
Updated Branches:
refs/heads/master dba514079 -> f467d6bbb
[BEAM-2570] Fix breakage after cloud-bigquery updated
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/25d3baae
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/25d3baae
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/25d3baae
Branch: refs/heads/master
Commit: 25d3baae4baf661c8da13465774fc5cf8988291a
Parents: dba5140
Author: Mark Liu <ma...@google.com>
Authored: Fri Jul 7 15:20:12 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Fri Jul 7 23:35:57 2017 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py | 6 +++---
sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py | 2 +-
sdks/python/setup.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/25d3baae/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py
index 844cbc5..d6f0e97 100644
--- a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py
+++ b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py
@@ -92,9 +92,9 @@ class BigqueryMatcher(BaseMatcher):
page_token = None
results = []
while True:
- rows, _, page_token = query.fetch_data(page_token=page_token)
- results.extend(rows)
- if not page_token:
+ for row in query.fetch_data(page_token=page_token):
+ results.append(row)
+ if results:
break
return results
http://git-wip-us.apache.org/repos/asf/beam/blob/25d3baae/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py
----------------------------------------------------------------------
diff --git a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py
index f12293e..5b72285 100644
--- a/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py
+++ b/sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py
@@ -53,7 +53,7 @@ class BigqueryMatcherTest(unittest.TestCase):
matcher = bq_verifier.BigqueryMatcher(
'mock_project',
'mock_query',
- 'da39a3ee5e6b4b0d3255bfef95601890afd80709')
+ '59f9d6bdee30d67ea73b8aded121c3a0280f9cd8')
hc_assert_that(self._mock_result, matcher)
@patch.object(bigquery, 'Client')
http://git-wip-us.apache.org/repos/asf/beam/blob/25d3baae/sdks/python/setup.py
----------------------------------------------------------------------
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 8a0c9ae..da82466 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -122,7 +122,7 @@ GCP_REQUIREMENTS = [
'googledatastore==7.0.1',
'google-cloud-pubsub==0.26.0',
# GCP packages required by tests
- 'google-cloud-bigquery>=0.23.0,<0.26.0',
+ 'google-cloud-bigquery==0.25.0',
]
[2/2] beam git commit: This closes #3523
Posted by al...@apache.org.
This closes #3523
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f467d6bb
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f467d6bb
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f467d6bb
Branch: refs/heads/master
Commit: f467d6bbbe50a5b1fbca9a417c587615ad7943e5
Parents: dba5140 25d3baa
Author: Ahmet Altay <al...@google.com>
Authored: Fri Jul 7 23:36:02 2017 -0700
Committer: Ahmet Altay <al...@google.com>
Committed: Fri Jul 7 23:36:02 2017 -0700
----------------------------------------------------------------------
sdks/python/apache_beam/io/gcp/tests/bigquery_matcher.py | 6 +++---
sdks/python/apache_beam/io/gcp/tests/bigquery_matcher_test.py | 2 +-
sdks/python/setup.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------