Skip to content

Commit d3a6dff

Browse files
dhermesdhermes
committed
Rebase fixes.
1 parent 0e7b01f commit d3a6dff

File tree

7 files changed

+50
-35
lines changed

7 files changed

+50
-35
lines changed

‎bigquery/google/cloud/bigquery/dataset.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from google.cloud._helpers import _datetime_from_microseconds
1919
from google.cloud.exceptions import NotFound
2020
from google.cloud.bigquery.table import Table
21-
from google.cloud.iterator import Iterator
21+
from google.cloud.iterator import HTTPIterator
2222

2323

2424
class AccessGrant(object):
@@ -556,9 +556,9 @@ def list_tables(self, max_results=None, page_token=None):
556556
contained within the current dataset.
557557
"""
558558
path = '/projects/%s/datasets/%s/tables' % (self.project, self.name)
559-
result = Iterator(client=self._client, path=path,
560-
item_to_value=_item_to_table, items_key='tables',
561-
page_token=page_token, max_results=max_results)
559+
result = HTTPIterator(client=self._client, path=path,
560+
item_to_value=_item_to_table, items_key='tables',
561+
page_token=page_token, max_results=max_results)
562562
result.dataset = self
563563
return result
564564

‎bigquery/google/cloud/bigquery/table.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from google.cloud.streaming.transfer import Upload
3434
from google.cloud.bigquery.schema import SchemaField
3535
from google.cloud.bigquery._helpers import _row_from_json
36-
from google.cloud.iterator import Iterator
36+
from google.cloud.iterator import HTTPIterator
3737

3838

3939
_TABLE_HAS_NO_SCHEMA = "Table has no schema: call 'table.reload()'"
@@ -676,10 +676,10 @@ def fetch_data(self, max_results=None, page_token=None, client=None):
676676
"""
677677
client = self._require_client(client)
678678
path = '%s/data' % (self.path,)
679-
iterator = Iterator(client=client, path=path,
680-
item_to_value=_item_to_row, items_key='rows',
681-
page_token=page_token, max_results=max_results,
682-
page_start=_rows_page_start)
679+
iterator = HTTPIterator(client=client, path=path,
680+
item_to_value=_item_to_row, items_key='rows',
681+
page_token=page_token, max_results=max_results,
682+
page_start=_rows_page_start)
683683
iterator.schema = self._schema
684684
# Over-ride the key used to retrieve the next page token.
685685
iterator._NEXT_TOKEN = 'pageToken'

‎bigquery/unit_tests/test_dataset.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,14 +636,16 @@ def test_delete_w_alternate_client(self):
636636
self.assertEqual(req['path'], '/%s' % PATH)
637637

638638
def test_list_tables_empty(self):
639+
import six
640+
639641
conn = _Connection({})
640642
client = _Client(project=self.PROJECT, connection=conn)
641643
dataset = self._makeOne(self.DS_NAME, client=client)
642644

643645
iterator = dataset.list_tables()
644646
self.assertIs(iterator.dataset, dataset)
645-
iterator.update_page()
646-
tables = list(iterator.page)
647+
page = six.next(iterator.pages)
648+
tables = list(page)
647649
token = iterator.next_page_token
648650

649651
self.assertEqual(tables, [])
@@ -655,6 +657,7 @@ def test_list_tables_empty(self):
655657
self.assertEqual(req['path'], '/%s' % PATH)
656658

657659
def test_list_tables_defaults(self):
660+
import six
658661
from google.cloud.bigquery.table import Table
659662

660663
TABLE_1 = 'table_one'
@@ -685,8 +688,8 @@ def test_list_tables_defaults(self):
685688

686689
iterator = dataset.list_tables()
687690
self.assertIs(iterator.dataset, dataset)
688-
iterator.update_page()
689-
tables = list(iterator.page)
691+
page = six.next(iterator.pages)
692+
tables = list(page)
690693
token = iterator.next_page_token
691694

692695
self.assertEqual(len(tables), len(DATA['tables']))
@@ -702,6 +705,7 @@ def test_list_tables_defaults(self):
702705
self.assertEqual(req['path'], '/%s' % PATH)
703706

704707
def test_list_tables_explicit(self):
708+
import six
705709
from google.cloud.bigquery.table import Table
706710

707711
TABLE_1 = 'table_one'
@@ -731,8 +735,8 @@ def test_list_tables_explicit(self):
731735

732736
iterator = dataset.list_tables(max_results=3, page_token=TOKEN)
733737
self.assertIs(iterator.dataset, dataset)
734-
iterator.update_page()
735-
tables = list(iterator.page)
738+
page = six.next(iterator.pages)
739+
tables = list(page)
736740
token = iterator.next_page_token
737741

738742
self.assertEqual(len(tables), len(DATA['tables']))

‎bigquery/unit_tests/test_table.py‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,7 @@ def test_delete_w_alternate_client(self):
10151015

10161016
def test_fetch_data_w_bound_client(self):
10171017
import datetime
1018+
import six
10181019
from google.cloud._helpers import UTC
10191020
from google.cloud.bigquery.table import SchemaField
10201021

@@ -1069,9 +1070,9 @@ def _bigquery_timestamp_float_repr(ts_float):
10691070
schema=[full_name, age, joined])
10701071

10711072
iterator = table.fetch_data()
1072-
iterator.update_page()
1073-
rows = list(iterator.page)
1074-
total_rows = iterator.page.total_rows
1073+
page = six.next(iterator.pages)
1074+
rows = list(page)
1075+
total_rows = page.total_rows
10751076
page_token = iterator.next_page_token
10761077

10771078
self.assertEqual(len(rows), 4)
@@ -1088,7 +1089,9 @@ def _bigquery_timestamp_float_repr(ts_float):
10881089
self.assertEqual(req['path'], '/%s' % PATH)
10891090

10901091
def test_fetch_data_w_alternate_client(self):
1092+
import six
10911093
from google.cloud.bigquery.table import SchemaField
1094+
10921095
PATH = 'projects/%s/datasets/%s/tables/%s/data' % (
10931096
self.PROJECT, self.DS_NAME, self.TABLE_NAME)
10941097
MAX = 10
@@ -1135,9 +1138,9 @@ def test_fetch_data_w_alternate_client(self):
11351138

11361139
iterator = table.fetch_data(
11371140
client=client2, max_results=MAX, page_token=TOKEN)
1138-
iterator.update_page()
1139-
rows = list(iterator.page)
1140-
total_rows = getattr(iterator.page, 'total_rows', None)
1141+
page = six.next(iterator.pages)
1142+
rows = list(page)
1143+
total_rows = getattr(page, 'total_rows', None)
11411144
page_token = iterator.next_page_token
11421145

11431146
self.assertEqual(len(rows), 4)
@@ -1157,7 +1160,9 @@ def test_fetch_data_w_alternate_client(self):
11571160
{'maxResults': MAX, 'pageToken': TOKEN})
11581161

11591162
def test_fetch_data_w_repeated_fields(self):
1163+
import six
11601164
from google.cloud.bigquery.table import SchemaField
1165+
11611166
PATH = 'projects/%s/datasets/%s/tables/%s/data' % (
11621167
self.PROJECT, self.DS_NAME, self.TABLE_NAME)
11631168
ROWS = 1234
@@ -1185,9 +1190,9 @@ def test_fetch_data_w_repeated_fields(self):
11851190
schema=[full_name, struct])
11861191

11871192
iterator = table.fetch_data()
1188-
iterator.update_page()
1189-
rows = list(iterator.page)
1190-
total_rows = iterator.page.total_rows
1193+
page = six.next(iterator.pages)
1194+
rows = list(page)
1195+
total_rows = page.total_rows
11911196
page_token = iterator.next_page_token
11921197

11931198
self.assertEqual(len(rows), 1)
@@ -1203,7 +1208,9 @@ def test_fetch_data_w_repeated_fields(self):
12031208
self.assertEqual(req['path'], '/%s' % PATH)
12041209

12051210
def test_fetch_data_w_record_schema(self):
1211+
import six
12061212
from google.cloud.bigquery.table import SchemaField
1213+
12071214
PATH = 'projects/%s/datasets/%s/tables/%s/data' % (
12081215
self.PROJECT, self.DS_NAME, self.TABLE_NAME)
12091216
ROWS = 1234
@@ -1239,9 +1246,9 @@ def test_fetch_data_w_record_schema(self):
12391246
schema=[full_name, phone])
12401247

12411248
iterator = table.fetch_data()
1242-
iterator.update_page()
1243-
rows = list(iterator.page)
1244-
total_rows = iterator.page.total_rows
1249+
page = six.next(iterator.pages)
1250+
rows = list(page)
1251+
total_rows = page.total_rows
12451252
page_token = iterator.next_page_token
12461253

12471254
self.assertEqual(len(rows), 3)

‎core/google/cloud/iterator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ def _next_page(self):
340340
items = response.get(self._items_key, ())
341341
page = Page(self, items, self._item_to_value)
342342
self._page_start(self, page, response)
343-
self.next_page_token = response.get('nextPageToken')
343+
self.next_page_token = response.get(self._NEXT_TOKEN)
344344
return page
345345
else:
346346
return None

‎docs/bigquery_snippets.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import operator
2727
import time
2828

29+
import six
30+
2931
from google.cloud.bigquery import SchemaField
3032
from google.cloud.bigquery.client import Client
3133

@@ -342,8 +344,8 @@ def _warm_up_inserted_table_data(table):
342344
while len(rows) == 0 and counter > 0:
343345
counter -= 1
344346
iterator = table.fetch_data()
345-
iterator.update_page()
346-
rows = list(iterator.page)
347+
page = six.next(iterator.pages)
348+
rows = list(page)
347349
if len(rows) == 0:
348350
time.sleep(5)
349351

@@ -422,9 +424,9 @@ def table_upload_from_file(client, to_delete):
422424
_warm_up_inserted_table_data(table)
423425

424426
iterator = table.fetch_data()
425-
iterator.update_page()
426-
rows = list(iterator.page)
427-
total = iterator.page.total_rows
427+
page = six.next(iterator.pages)
428+
rows = list(page)
429+
total = page.total_rows
428430
token = iterator.next_page_token
429431

430432
assert len(rows) == total == 2

‎system_tests/bigquery.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,11 @@ def test_update_table(self):
265265

266266
@staticmethod
267267
def _fetch_single_page(table):
268+
import six
269+
268270
iterator = table.fetch_data()
269-
iterator.update_page()
270-
return list(iterator.page)
271+
page = six.next(iterator.pages)
272+
return list(page)
271273

272274
def test_insert_data_then_dump_table(self):
273275
import datetime

0 commit comments

Comments
 (0)