Skip to content

Commit

Permalink
Merge branch 'master' into opentelemetry-tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
larkee committed Jul 15, 2020
2 parents 9b4972e + edfefc8 commit ef30b12
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions google/cloud/spanner_v1/snapshot.py
Expand Up @@ -436,7 +436,7 @@ class Snapshot(_SnapshotBase):
at a timestamp where all previously committed transactions are visible.
:type session: :class:`~google.cloud.spanner_v1.session.Session`
:param session: the session used to perform the commit.
:param session: The session used to perform the commit.
:type read_timestamp: :class:`datetime.datetime`
:param read_timestamp: Execute all reads at the given timestamp.
Expand All @@ -454,7 +454,7 @@ class Snapshot(_SnapshotBase):
``exact_staleness`` old.
:type multi_use: :class:`bool`
:param multi_use: If true, multipl :meth:`read` / :meth:`execute_sql`
:param multi_use: If true, multiple :meth:`read` / :meth:`execute_sql`
calls can be performed with the snapshot in the
context of a read-only transaction, used to ensure
isolation / consistency. Incompatible with
Expand Down
2 changes: 0 additions & 2 deletions google/cloud/spanner_v1/streamed.py
Expand Up @@ -42,7 +42,6 @@ class StreamedResultSet(object):
def __init__(self, response_iterator, source=None):
self._response_iterator = response_iterator
self._rows = [] # Fully-processed rows
self._counter = 0 # Counter for processed responses
self._metadata = None # Until set from first PRS
self._stats = None # Until set from last PRS
self._current_row = [] # Accumulated values for incomplete row
Expand Down Expand Up @@ -114,7 +113,6 @@ def _consume_next(self):
Parse the result set into new/existing rows in :attr:`_rows`
"""
response = six.next(self._response_iterator)
self._counter += 1

if self._metadata is None: # first response
metadata = self._metadata = response.metadata
Expand Down

0 comments on commit ef30b12

Please sign in to comment.