10000 Spanner: Changed _rows to list (#4583) · googleapis/google-cloud-python@0e4fc30 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0e4fc30

Browse files
chemelnucfinchemelnucfin
authored
Spanner: Changed _rows to list (#4583)
1 parent 89c4415 commit 0e4fc30

File tree

2 files changed

+19
-21
lines changed

2 files changed

+19
-21
lines changed

‎spanner/tests/system/test_system.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,9 +1169,7 @@ def test_execute_sql_w_manual_consume(self):
11691169
streamed = snapshot.execute_sql(self.SQL)
11701170
keyset = KeySet(all_=True)
11711171
rows = list(session.read(self.TABLE, self.COLUMNS, keyset))
1172-
items = [item for item in iter(streamed)]
1173-
1174-
self.assertEqual(items, rows)
1172+
self.assertEqual(list(streamed), rows)
11751173
self.assertEqual(streamed._current_row, [])
11761174
self.assertEqual(streamed._pending_chunk, None)
11771175

‎spanner/tests/unit/test_streamed.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_ctor_defaults(self):
3333
streamed = self._make_one(iterator)
3434
self.assertIs(streamed._response_iterator, iterator)
3535
self.assertIsNone(streamed._source)
36-
self.assertEqual(streamed._rows, [])
36+
self.assertEqual(list(streamed), [])
3737
self.assertIsNone(streamed.metadata)
3838
self.assertIsNone(streamed.stats)
3939

@@ -43,7 +43,7 @@ def test_ctor_w_source(self):
4343
streamed = self._make_one(iterator, source=source)
4444
self.assertIs(streamed._response_iterator, iterator)
4545
self.assertIs(streamed._source, source)
46-
self.assertEqual(streamed._rows, [])
46+
self.assertEqual(list(streamed), [])
4747
self.assertIsNone(streamed.metadata)
4848
self.assertIsNone(streamed.stats)
4949

@@ -484,7 +484,7 @@ def test_merge_values_empty_and_empty(self):
484484
streamed._metadata = self._make_result_set_metadata(FIELDS)
485485
streamed._current_row = []
486486
streamed._merge_values([])
487-
self.assertEqual(streamed._rows, [])
487+
self.assertEqual(list(streamed), [])
488488
self.assertEqual(streamed._current_row, [])
489489

490490
def test_merge_values_empty_and_partial(self):
@@ -500,7 +500,7 @@ def test_merge_values_empty_and_partial(self):
500500
VALUES = [self._make_value(bare) for bare in BARE]
501501
streamed._current_row = []
502502
streamed._merge_values(VALUES)
503-
self.assertEqual(streamed._rows, [])
503+
self.assertEqual(list(streamed), [])
504504
self.assertEqual(streamed._current_row, BARE)
505505

506506
def test_merge_values_empty_and_filled(self):
@@ -516,7 +516,7 @@ def test_merge_values_empty_and_filled(self):
516516
VALUES = [self._make_value(bare) for bare in BARE]
517517
streamed._current_row = []
518518
streamed._merge_values(VALUES)
519-
self.assertEqual(streamed._rows, [BARE])
519+
self.assertEqual(list(streamed), [BARE])
520520
self.assertEqual(streamed._current_row, [])
521521

522522
def test_merge_values_empty_and_filled_plus(self):
@@ -536,7 +536,7 @@ def test_merge_values_empty_and_filled_plus(self):
536536
VALUES = [self._make_value(bare) for bare in BARE]
537537
streamed._current_row = []
538538
streamed._merge_values(VALUES)
539-
self.assertEqual(streamed._rows, [BARE[0:3], BARE[3:6]])
539+
self.assertEqual(list(streamed), [BARE[0:3], BARE[3:6]])
540540
self.assertEqual(streamed._current_row, BARE[6:])
541541

542542
def test_merge_values_partial_and_empty(self):
@@ -553,7 +553,7 @@ def test_merge_values_partial_and_empty(self):
553553
]
554554
streamed._current_row[:] = BEFORE
555555
streamed._merge_values([])
556-
self.assertEqual(streamed._rows, [])
556+
self.assertEqual(list(streamed), [])
557557
self.assertEqual(streamed._current_row, BEFORE)
558558

559559
def test_merge_values_partial_and_partial(self):
@@ -570,7 +570,7 @@ def test_merge_values_partial_and_partial(self):
570570
MERGED = [42]
571571
TO_MERGE = [self._make_value(item) for item in MERGED]
572572
streamed._merge_values(TO_MERGE)
573-
self.assertEqual(streamed._rows, [])
573+
self.assertEqual(list(streamed), [])
574574
self.assertEqual(streamed._current_row, BEFORE + MERGED)
575575

576576
def test_merge_values_partial_and_filled(self):
@@ -589,7 +589,7 @@ def test_merge_values_partial_and_filled(self):
589589
MERGED = [42, True]
590590
TO_MERGE = [self._make_value(item) for item in MERGED]
591591
streamed._merge_values(TO_MERGE)
592-
self.assertEqual(streamed._rows, [BEFORE + MERGED])
592+
self.assertEqual(list(streamed), [BEFORE + MERGED])
593593
self.assertEqual(streamed._current_row, [])
594594

595595
def test_merge_values_partial_and_filled_plus(self):
@@ -613,7 +613,7 @@ def test_merge_values_partial_and_filled_plus(self):
613613
TO_MERGE = [self._make_value(item) for item in MERGED]
614614
VALUES = BEFORE + MERGED
615615
streamed._merge_values(TO_MERGE)
616-
self.assertEqual(streamed._rows, [VALUES[0:3], VALUES[3:6]])
616+
self.assertEqual(list(streamed), [VALUES[0:3], VALUES[3:6]])
617617
self.assertEqual(streamed._current_row, VALUES[6:])
618618

619619
def test_one_or_none_no_value(self):
@@ -680,7 +680,7 @@ def test_consume_next_first_set_partial(self):
680680
source = mock.Mock(_transaction_id=None, spec=['_transaction_id'])
681681
streamed = self._make_one(iterator, source=source)
682682
streamed._consume_next()
683-
self.assertEqual(streamed._rows, [])
683+
self.assertEqual(list(streamed), [])
684684
self.assertEqual(streamed._current_row, BARE)
685685
self.assertEqual(streamed.metadata, metadata)
686686
self.assertEqual(source._transaction_id, TXN_ID)
@@ -701,7 +701,7 @@ def test_consume_next_first_set_partial_existing_txn_id(self):
701701
source = mock.Mock(_transaction_id=TXN_ID, spec=['_transaction_id'])
702702
streamed = self._make_one(iterator, source=source)
703703
streamed._consume_next()
704-
self.assertEqual(streamed._rows, [])
704+
self.assertEqual(list(streamed), [])
705705
self.assertEqual(streamed._current_row, BARE)
706706
self.assertEqual(streamed.metadata, metadata)
707707
self.assertEqual(source._transaction_id, TXN_ID)
@@ -720,7 +720,7 @@ def test_consume_next_w_partial_result(self):
720720
streamed = self._make_one(iterator)
721721
streamed._metadata = self._make_result_set_metadata(FIELDS)
722722
streamed._consume_next()
723-
self.assertEqual(streamed._rows, [])
723+
self.assertEqual(list(streamed), [])
724724
self.assertEqual(streamed._current_row, [])
725725
self.assertEqual(streamed._pending_chunk, VALUES[0])
726726

@@ -742,7 +742,7 @@ def test_consume_next_w_pending_chunk(self):
742742
streamed._metadata = self._make_result_set_metadata(FIELDS)
743743
streamed._pending_chunk = self._make_value(u'Phred ')
744744
streamed._consume_next()
745-
self.assertEqual(streamed._rows, [
745+
self.assertEqual(list(streamed), [
746746
[u'Phred Phlyntstone', BARE[1], BARE[2]],
747747
[BARE[3], BARE[4], BARE[5]],
748748
])
@@ -768,7 +768,7 @@ def test_consume_next_last_set(self):
768768
streamed = self._make_one(iterator)
769769
streamed._metadata = metadata
770770
streamed._consume_next()
771-
self.assertEqual(streamed._rows, [BARE])
771+
self.assertEqual(list(streamed), [BARE])
772772
self.assertEqual(streamed._current_row, [])
773773
self.assertEqual(streamed._stats, stats)
774774

@@ -792,7 +792,7 @@ def test___iter___one_result_set_partial(self):
792792
streamed = self._make_one(iterator)
793793
found = list(streamed)
794794
self.assertEqual(found, [])
795-
self.assertEqual(streamed._rows, [])
795+
self.assertEqual(list(streamed), [])
796796
self.assertEqual(streamed._current_row, BARE)
797797
self.assertEqual(streamed.metadata, metadata)
798798

@@ -820,7 +820,7 @@ def test___iter___multiple_result_sets_filled(self):
820820
[BARE[3], BARE[4], BARE[5]],
821821
[BARE[6], BARE[7], BARE[8]],
822822
])
823-
self.assertEqual(streamed._rows, [])
823+
self.assertEqual(list(streamed), [])
824824
self.assertEqual(streamed._current_row, [])
825825
self.assertIsNone(streamed._pending_chunk)
826826

@@ -853,7 +853,7 @@ def test___iter___w_existing_rows_read(self):
853853
[BARE[3], BARE[4], BARE[5]],
854854
[BARE[6], BARE[7], BARE[8]],
855855
])
856-
self.assertEqual(streamed._rows, [])
856+
self.assertEqual(list(streamed), [])
857857
self.assertEqual(streamed._current_row, [])
858858
self.assertIsNone(streamed._pending_chunk)
859859

0 commit comments

Comments
 (0)
0