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.

Sign up for GitHub

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

Jump to bottom

fix: avoid consuming pending null values when merging #286

Merged
merged 3 commits into from Mar 24, 2021
Merged

fix: avoid consuming pending null values when merging #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79cb924
test: add test for string array with pending null
larkee Mar 22, 2021
c364793
fix: avoid consuming pending null values when merging
larkee Mar 22, 2021
cefe888
test: match implementation to test names
larkee Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 16 additions & 8 deletions google/cloud/spanner_v1/streamed.py
View file
Open in desktop
Expand Up @@ -258,13 +258,17 @@ def _merge_array(lhs, rhs, type_):
lhs.append(first)
else:
last = lhs.pop()
try:
merged = _merge_by_type(last, first, element_type)
except Unmergeable:
if last.HasField("null_value"):
lhs.append(last)
lhs.append(first)
else:
lhs.append(merged)
try:
merged = _merge_by_type(last, first, element_type)
except Unmergeable:
lhs.append(last)
lhs.append(first)
else:
lhs.append(merged)
return Value(list_value=ListValue(values=(lhs + rhs)))


Expand All @@ -284,13 +288,17 @@ def _merge_struct(lhs, rhs, type_):
lhs.append(first)
else:
last = lhs.pop()
try:
merged = _merge_by_type(last, first, candidate_type)
except Unmergeable:
if last.HasField("null_value"):
lhs.append(last)
lhs.append(first)
else:
lhs.append(merged)
try:
merged = _merge_by_type(last, first, candidate_type)
except Unmergeable:
lhs.append(last)
lhs.append(first)
else:
lhs.append(merged)
return Value(list_value=ListValue(values=lhs + rhs))


Expand Down
22 changes: 18 additions & 4 deletions tests/unit/test_streamed.py
View file
Open in desktop
Expand Up @@ -336,11 +336,11 @@ def test__merge_chunk_array_of_string(self):
FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)]
streamed._metadata = self._make_result_set_metadata(FIELDS)
streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C"])
chunk = self._make_list_value([None, u"D", u"E"])
chunk = self._make_list_value([u"D", u"E"])

merged = streamed._merge_chunk(chunk)

expected = self._make_list_value([u"A", u"B", u"C", None, u"D", u"E"])
expected = self._make_list_value([u"A", u"B", u"CD", u"E"])
self.assertEqual(merged, expected)
self.assertIsNone(streamed._pending_chunk)

Expand All @@ -352,11 +352,25 @@ def test__merge_chunk_array_of_string_with_null(self):
FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)]
streamed._metadata = self._make_result_set_metadata(FIELDS)
streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C"])
chunk = self._make_list_value([u"D", u"E"])
chunk = self._make_list_value([None, u"D", u"E"])

merged = streamed._merge_chunk(chunk)

expected = self._make_list_value([u"A", u"B", u"CD", u"E"])
expected = self._make_list_value([u"A", u"B", u"C", None, u"D", u"E"])
self.assertEqual(merged, expected)
self.assertIsNone(streamed._pending_chunk)

def test__merge_chunk_array_of_string_with_null_pending(self):
from google.cloud.spanner_v1 import TypeCode

iterator = _MockCancellableIterator()
streamed = self._make_one(iterator)
FIELDS = [self._make_array_field("name", element_type_code=TypeCode.STRING)]
streamed._metadata = self._make_result_set_metadata(FIELDS)
streamed._pending_chunk = self._make_list_value([u"A", u"B", u"C", None])
chunk = self._make_list_value([u"D", u"E"])
merged = streamed._merge_chunk(chunk)
expected = self._make_list_value([u"A", u"B", u"C", None, u"D", u"E"])
self.assertEqual(merged, expected)
self.assertIsNone(streamed._pending_chunk)

Expand Down