Skip to content

Fix TypeError when working with nested maps [JIRA: CLIENTS-417] #402

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

Merged
hazen merged 1 commit into from
Dec 21, 2015
Merged

Fix TypeError when working with nested maps [JIRA: CLIENTS-417] #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions riak/datatypes/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,15 @@ def modified(self):
"""
Whether the map has staged local modifications.
"""
values_modified = [self._value[v].modified for v in self._value]
modified = (any(values_modified) or self._removes or self._updates)
if modified:
if self._removes:
return True
else:
return False
for v in self._value:
if self._value[v].modified:
return True
for v in self._updates:
if self._updates[v].modified:
return True
return False

def to_op(self):
"""
Expand Down
6 changes: 6 additions & 0 deletions riak/tests/test_datatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ def op(self, dtype):
dtype.registers['b'].assign('testing')
dtype.flags['c'].enable()
dtype.maps['d'][('e', 'set')].add('deep value')
dtype.maps['f'].counters['g']
dtype.maps['h'].maps['i'].flags['j']


def check_op_output(self, op):
self.assertIn(('update', ('a', 'counter'), ('increment', 2)), op)
Expand All @@ -130,6 +133,9 @@ def check_op_output(self, op):
self.assertIn(('update', ('d', 'map'), [('update', ('e', 'set'),
{'adds': ['deep value']})]),
op)
self.assertNotIn(('update', ('f', 'map'), None), op)
self.assertNotIn(('update', ('h', 'map'), [('update', ('i', 'map'),
None)]), op)

def test_removes_require_context(self):
dtype = self.dtype(self.bucket, 'key')
Expand Down