Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).

- Cloud only: Fix thread used when rate limiting is enabled. Previously enabling
rate limiting might cause a hang
- Fixed error in WriteMultiple with multiple children-only requests

# 5.4.2 - 2024-05-13

Expand Down
5 changes: 3 additions & 2 deletions src/borneo/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -3884,12 +3884,13 @@ def add(self, request, abort_if_unsuccessful):
if table_name is None:
self.set_table_name(request.get_table_name())
else:
top_table = WriteMultipleRequest.get_top_table_name(table_name)
if (WriteMultipleRequest.get_top_table_name(
request.get_table_name().lower())
!= table_name.lower()):
!= top_table.lower()):
raise IllegalArgumentException(
'The parent table_name used for the operation is '
'different from that of others: ' + table_name)
'different from that of others: ' + top_table)
request.validate()
self._ops.append(self.OperationRequest(request, abort_if_unsuccessful))
return self
Expand Down
40 changes: 40 additions & 0 deletions test/write_multiple.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,46 @@ def testWriteMultipleChild(self):
except UnsupportedProtocolException:
self.assertTrue(serial_version < 4)

def testWriteMultipleChildrenOnly(self):
num_operations = 6
wm_req = WriteMultipleRequest()
for i in range(num_operations):
child_row = dict()
child_row['fld_sid'] = 1
child_row['fld_id'] = i
child_row['childid'] = i
child_row['childname'] = 'name_' + str(i)
child_row['childdata'] = 'data_' + str(i)

request = PutRequest()
request.set_value(child_row)
request.set_table_name(self.child_table_name)
request.set_ttl(self.ttl)
request.set_return_row(True)
wm_req.add(request, True)

# put this test in try/except to handle versions of the server
# that cannot handle multiple table names. Technically the
# change happened mid-V3 so the check for serial_version < 4 isn't
# perfect, but it's good enough
try:
result = self.handle.write_multiple(wm_req)
op_results = self._check_write_multiple_result(result, num_operations)

for i in range(num_operations):
child_row = dict()
child_row['fld_sid'] = 1
child_row['fld_id'] = i
child_row['childid'] = i
request = GetRequest()
request.set_key(child_row)
request.set_table_name(self.child_table_name)
result = self.handle.get(request)
self.assertEqual('name_' + str(i), result.get_value()['childname'])
self.assertEqual('data_' + str(i), result.get_value()['childdata'])
except UnsupportedProtocolException:
self.assertTrue(serial_version < 4)

def testWriteMultipleAbortIfUnsuccessful(self):
failed_idx = 1
for request in self.requests:
Expand Down