Skip to content

Commit cfae63d

Browse files
larkeeskuruppu
authored andcommitted
fix: be permssive about merging an empty struct (#10079)
1 parent ff1dfdd commit cfae63d

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

google/cloud/spanner_v1/streamed.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,12 @@ def _merge_struct(lhs, rhs, type_):
276276
"""Helper for '_merge_by_type'."""
277277
fields = type_.struct_type.fields
278278
lhs, rhs = list(lhs.list_value.values), list(rhs.list_value.values)
279+
280+
# Sanity check: If either list is empty, short-circuit.
281+
# This is effectively a no-op.
282+
if not len(lhs) or not len(rhs):
283+
return Value(list_value=ListValue(values=(lhs + rhs)))
284+
279285
candidate_type = fields[len(lhs) - 1].type
280286
first = rhs.pop(0)
281287
if first.HasField("null_value") or candidate_type.code in _UNMERGEABLE_TYPES:

tests/unit/test_streamed.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,23 @@ def test__merge_chunk_array_of_struct(self):
411411
self.assertEqual(merged, expected)
412412
self.assertIsNone(streamed._pending_chunk)
413413

414+
def test__merge_chunk_array_of_struct_with_empty(self):
415+
iterator = _MockCancellableIterator()
416+
streamed = self._make_one(iterator)
417+
struct_type = self._make_struct_type([("name", "STRING"), ("age", "INT64")])
418+
FIELDS = [self._make_array_field("test", element_type=struct_type)]
419+
streamed._metadata = self._make_result_set_metadata(FIELDS)
420+
partial = self._make_list_value([u"Phred "])
421+
streamed._pending_chunk = self._make_list_value(value_pbs=[partial])
422+
rest = self._make_list_value([])
423+
chunk = self._make_list_value(value_pbs=[rest])
424+
425+
merged = streamed._merge_chunk(chunk)
426+
427+
expected = self._make_list_value(value_pbs=[partial])
428+
self.assertEqual(merged, expected)
429+
self.assertIsNone(streamed._pending_chunk)
430+
414431
def test__merge_chunk_array_of_struct_unmergeable(self):
415432
iterator = _MockCancellableIterator()
416433
streamed = self._make_one(iterator)

0 commit comments

Comments
 (0)