Skip to content

B
BTrees
Commit ef4eea82 authored by Tres Seaver's avatar Tres Seaver
Browse files
Options

Fixin' to expand coverage for _p_resolveConflict.

parent d66be83a
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 79 deletions
BTrees/_base.py
View file @ ef4eea82
...@@ -200,6 +200,7 @@ class _SetBase(_Base): ...@@ -200,6 +200,7 @@ class _SetBase(_Base):
add(i) add(i)
def _p_resolveConflict(self, s_old, s_com, s_new): def _p_resolveConflict(self, s_old, s_com, s_new):
b_old = self.__class__() b_old = self.__class__()
if s_old is not None: if s_old is not None:
b_old.__setstate__(s_old) b_old.__setstate__(s_old)
...@@ -209,11 +210,12 @@ class _SetBase(_Base): ...@@ -209,11 +210,12 @@ class _SetBase(_Base):
b_new = self.__class__() b_new = self.__class__()
if s_new is not None: if s_new is not None:
b_new.__setstate__(s_new) b_new.__setstate__(s_new)
if (b_com._next != b_old._next or if (b_com._next != b_old._next or
b_new._next != b_old._next): b_new._next != b_old._next): # conflict: com or new changed _next
raise BTreesConflictError(-1, -1, -1, 0) raise BTreesConflictError(-1, -1, -1, 0)
if not b_com or not b_new: if not b_com or not b_new: # conflict: com or new empty
raise BTreesConflictError(-1, -1, -1, 12) raise BTreesConflictError(-1, -1, -1, 12)
i_old = _SetIteration(b_old, True) i_old = _SetIteration(b_old, True)
...@@ -231,15 +233,14 @@ class _SetBase(_Base): ...@@ -231,15 +233,14 @@ class _SetBase(_Base):
it.advance() it.advance()
while i_old.active and i_com.active and i_new.active: while i_old.active and i_com.active and i_new.active:
cmp12 = cmp(i_old.key, i_com.key) cmpOC = cmp(i_old.key, i_com.key)
cmp13 = cmp(i_old.key, i_new.key) cmpON = cmp(i_old.key, i_new.key)
if cmp12 == 0: if cmpOC == 0:
if cmp13 == 0: if cmpON == 0: # all match
result.add(i_old.key) merge_output(i_old)
i_old.advance()
i_com.advance() i_com.advance()
i_new.advance() i_new.advance()
elif cmp13 > 0: # insert in new elif cmpON > 0: # insert in new
merge_output(i_new) merge_output(i_new)
else: # deleted new else: # deleted new
if i_new.position == 1: if i_new.position == 1:
...@@ -249,8 +250,8 @@ class _SetBase(_Base): ...@@ -249,8 +250,8 @@ class _SetBase(_Base):
raise merge_error(13) raise merge_error(13)
i_old.advance() i_old.advance()
i_com.advance() i_com.advance()
elif cmp13 == 0: elif cmpON == 0:
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
merge_output(i_com) merge_output(i_com)
else: # delete committed else: # delete committed
if i_com.position == 1: if i_com.position == 1:
...@@ -260,34 +261,34 @@ class _SetBase(_Base): ...@@ -260,34 +261,34 @@ class _SetBase(_Base):
raise merge_error(13) raise merge_error(13)
i_old.advance() i_old.advance()
i_new.advance() i_new.advance()
else: # both keys changed else: # both com and new keys changed
cmp23 = cmp(i_com.key, i_new.key) cmpCN = cmp(i_com.key, i_new.key)
if cmp23 == 0: if cmpCN == 0: # both inserted same key
raise merge_error(4) raise merge_error(4)
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
if cmp23 > 0: # insert i_new first if cmpCN > 0: # insert i_new first
merge_output(i_new) merge_output(i_new)
else: else:
merge_output(i_com) merge_output(i_com)
elif cmp13 > 0: # insert i_new elif cmpON > 0: # insert i_new
merge_output(i_new) merge_output(i_new)
else: else: # both com and new deleted same key
raise merge_error(5) # both deleted same key raise merge_error(5)
while i_com.active and i_new.active: # new inserts while i_com.active and i_new.active: # new inserts
cmp23 = cmp(i_com.key, i_new.key) cmpCN = cmp(i_com.key, i_new.key)
if cmp23 == 0: if cmpCN == 0: # dueling insert
raise merge_error(6) # dueling insert raise merge_error(6)
if cmp23 > 0: # insert new if cmpCN > 0: # insert new
merge_output(i_new) merge_output(i_new)
else: # insert committed else: # insert committed
merge_output(i_com) merge_output(i_com)
while i_old.active and i_com.active: # new deletes rest of original while i_old.active and i_com.active: # new deletes rest of original
cmp12 = cmp(i_old.key, i_com.key) cmpOC = cmp(i_old.key, i_com.key)
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
merge_output(i_com) merge_output(i_com)
elif cmp12 == 0: # del in new elif cmpOC == 0: # del in new
i_old.advance() i_old.advance()
i_com.advance() i_com.advance()
else: # dueling deletes or delete and change else: # dueling deletes or delete and change
...@@ -295,10 +296,10 @@ class _SetBase(_Base): ...@@ -295,10 +296,10 @@ class _SetBase(_Base):
while i_old.active and i_new.active: while i_old.active and i_new.active:
# committed deletes rest of original # committed deletes rest of original
cmp13 = cmp(i_old.key, i_new.key) cmpON = cmp(i_old.key, i_new.key)
if cmp13 > 0: # insert new if cmpON > 0: # insert new
merge_output(i_new) merge_output(i_new)
elif cmp13 == 0: # deleted in committed elif cmpON == 0: # deleted in committed
i_old.advance() i_old.advance()
i_new.advance() i_new.advance()
else: # dueling deletes or delete and change else: # dueling deletes or delete and change
...@@ -388,10 +389,10 @@ class _MappingBase(_Base): ...@@ -388,10 +389,10 @@ class _MappingBase(_Base):
it.advance() it.advance()
while i_old.active and i_com.active and i_new.active: while i_old.active and i_com.active and i_new.active:
cmp12 = cmp(i_old.key, i_com.key) cmpOC = cmp(i_old.key, i_com.key)
cmp13 = cmp(i_old.key, i_new.key) cmpON = cmp(i_old.key, i_new.key)
if cmp12==0: if cmpOC==0:
if cmp13==0: if cmpON==0:
if i_com.value == i_old.value: if i_com.value == i_old.value:
result[i_old.key] = i_new.value result[i_old.key] = i_new.value
elif i_new.value == i_old.value: elif i_new.value == i_old.value:
...@@ -401,7 +402,7 @@ class _MappingBase(_Base): ...@@ -401,7 +402,7 @@ class _MappingBase(_Base):
i_old.advance() i_old.advance()
i_com.advance() i_com.advance()
i_new.advance() i_new.advance()
elif (cmp13 > 0): # insert in new elif (cmpON > 0): # insert in new
merge_output(i_new) merge_output(i_new)
elif i_old.value == i_com.value: # deleted new elif i_old.value == i_com.value: # deleted new
if i_new.position == 1: if i_new.position == 1:
...@@ -413,8 +414,8 @@ class _MappingBase(_Base): ...@@ -413,8 +414,8 @@ class _MappingBase(_Base):
i_com.advance() i_com.advance()
else: else:
raise merge_error(2) raise merge_error(2)
elif cmp13 == 0: elif cmpON == 0:
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
merge_output(i_com) merge_output(i_com)
elif i_old.value == i_new.value: # delete committed elif i_old.value == i_new.value: # delete committed
if i_com.position == 1: if i_com.position == 1:
...@@ -427,33 +428,33 @@ class _MappingBase(_Base): ...@@ -427,33 +428,33 @@ class _MappingBase(_Base):
else: else:
raise merge_error(3) raise merge_error(3)
else: # both keys changed else: # both keys changed
cmp23 = cmp(i_com.key, i_new.key) cmpCN = cmp(i_com.key, i_new.key)
if cmp23 == 0: if cmpCN == 0:
raise merge_error(4) raise merge_error(4)
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
if cmp23 > 0: # insert i_new first if cmpCN > 0: # insert i_new first
merge_output(i_new) merge_output(i_new)
else: else:
merge_output(i_com) merge_output(i_com)
elif cmp13 > 0: # insert i_new elif cmpON > 0: # insert i_new
merge_output(i_new) merge_output(i_new)
else: else:
raise merge_error(5) # both deleted same key raise merge_error(5) # both deleted same key
while i_com.active and i_new.active: # new inserts while i_com.active and i_new.active: # new inserts
cmp23 = cmp(i_com.key, i_new.key) cmpCN = cmp(i_com.key, i_new.key)
if cmp23 == 0: if cmpCN == 0:
raise merge_error(6) # dueling insert raise merge_error(6) # dueling insert
if cmp23 > 0: # insert new if cmpCN > 0: # insert new
merge_output(i_new) merge_output(i_new)
else: # insert committed else: # insert committed
merge_output(i_com) merge_output(i_com)
while i_old.active and i_com.active: # new deletes rest of original while i_old.active and i_com.active: # new deletes rest of original
cmp12 = cmp(i_old.key, i_com.key) cmpOC = cmp(i_old.key, i_com.key)
if cmp12 > 0: # insert committed if cmpOC > 0: # insert committed
merge_output(i_com) merge_output(i_com)
elif cmp12 == 0 and (i_old.value == i_com.value): # del in new elif cmpOC == 0 and (i_old.value == i_com.value): # del in new
i_old.advance() i_old.advance()
i_com.advance() i_com.advance()
else: # dueling deletes or delete and change else: # dueling deletes or delete and change
...@@ -461,10 +462,10 @@ class _MappingBase(_Base): ...@@ -461,10 +462,10 @@ class _MappingBase(_Base):
while i_old.active and i_new.active: while i_old.active and i_new.active:
# committed deletes rest of original # committed deletes rest of original
cmp13 = cmp(i_old.key, i_new.key) cmpON = cmp(i_old.key, i_new.key)
if cmp13 > 0: # insert new if cmpON > 0: # insert new
merge_output(i_new) merge_output(i_new)
elif cmp13 == 0 and (i_old.value == i_new.value): elif cmpON == 0 and (i_old.value == i_new.value):
# deleted in committed # deleted in committed
i_old.advance() i_old.advance()
i_new.advance() i_new.advance()
......
BTrees/tests/test__base.py
View file @ ef4eea82
...@@ -371,6 +371,25 @@ class Test__SetIteration(unittest.TestCase): ...@@ -371,6 +371,25 @@ class Test__SetIteration(unittest.TestCase):
from .._base import _SetIteration from .._base import _SetIteration
return _SetIteration return _SetIteration
def _makeOne(self, to_iterate, useValues=False, default=None):
return self._getTargetClass()(to_iterate, useValues, default)
def test_ctor_w_None(self):
si = self._makeOne(None)
self.assertEqual(si.useValues, False)
self.failIf('key' in si.__dict__)
self.assertEqual(si.value, None)
self.assertEqual(si.active, False)
self.assertEqual(si.position, -1)
def test_ctor_w_non_empty_list(self):
si = self._makeOne(['a', 'b', 'c'])
self.assertEqual(si.useValues, False)
self.assertEqual(si.key, 'a')
self.assertEqual(si.value, None)
self.assertEqual(si.active, True)
self.assertEqual(si.position, 1)
class Test__SetBase(unittest.TestCase): class Test__SetBase(unittest.TestCase):
...@@ -392,68 +411,88 @@ class Test__SetBase(unittest.TestCase): ...@@ -392,68 +411,88 @@ class Test__SetBase(unittest.TestCase):
return iter(self._keys) return iter(self._keys)
return _TestSet() return _TestSet()
def test__p_resolveConflict_new_next(self): def test__p_resolveConflict_x_on_com_next(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
N_NEW = object() N_NEW = object()
s_old = ([], None) s_old = ([], None)
s_com = ([], N_NEW) s_com = ([], N_NEW)
s_new = ([], None) s_new = ([], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 0) self.assertEqual(e.reason, 0)
def test__p_resolveConflict_committed_next(self): def test__p_resolveConflict_x_on_new_next(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
N_NEW = object() N_NEW = object()
s_old = ([], None) s_old = ([], None)
s_com = ([], None) s_com = ([], None)
s_new = ([], N_NEW) s_new = ([], N_NEW)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 0) self.assertEqual(e.reason, 0)
def test__p_resolveConflict_empty_committed(self): def test__p_resolveConflict_x_on_com_empty(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
s_old = ([], None) s_old = (['a', 'b'], None)
s_com = ([], None) s_com = ([], None)
s_new = (['a'], None) s_new = (['a'], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 12) self.assertEqual(e.reason, 12)
def test__p_resolveConflict_empty_new(self): def test__p_resolveConflict_x_on_new_empty(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
s_old = ([], None) s_old = (['a', 'b'], None)
s_com = (['a'], None) s_com = (['a'], None)
s_new = ([], None) s_new = ([], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 12) self.assertEqual(e.reason, 12)
def test__p_resolveConflict_delete_first_new(self): def test__p_resolveConflict_x_on_del_first_com(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
s_old = (['a','b'], None) s_old = (['a','b'], None)
s_com = (['a','b','c'], None) s_com = (['b'], None)
s_new = (['b'], None) s_new = (['a', 'b', 'c'], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 13) self.assertEqual(e.reason, 13)
def test__p_resolveConflict_delete_first_committed(self): def test__p_resolveConflict_x_on_del_first_new(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _set = self._makeOne()
s_old = (['a','b'], None) s_old = (['a', 'b'], None)
s_com = (['b'], None) s_com = (['a', 'b', 'c'], None)
s_new = (['a', 'b', 'c'], None) s_new = (['b'], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 13) self.assertEqual(e.reason, 13)
def test__p_resolveConflict_x_on_ins_same_after_del(self):
from ..Interfaces import BTreesConflictError
_set = self._makeOne()
s_old = (['a', 'b'], None)
s_com = (['a', 'c'], None)
s_new = (['a', 'c', 'd'], None)
e = self.assertRaises(BTreesConflictError,
_set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 4)
def test__p_resolveConflict_x_on_del_same(self):
from ..Interfaces import BTreesConflictError
_set = self._makeOne()
s_old = (['a', 'b', 'c'], None)
s_com = (['a', 'c'], None)
s_new = (['a', 'd', 'e'], None)
e = self.assertRaises(BTreesConflictError,
_set._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 5)
class Test__MappingBase(unittest.TestCase): class Test__MappingBase(unittest.TestCase):
...@@ -481,22 +520,22 @@ class Test__MappingBase(unittest.TestCase): ...@@ -481,22 +520,22 @@ class Test__MappingBase(unittest.TestCase):
def test__p_resolveConflict_delete_first_new(self): def test__p_resolveConflict_delete_first_new(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _mapping = self._makeOne()
s_old = (['a', 0, 'b', 1], None) s_old = (['a', 0, 'b', 1], None)
s_com = (['a', 1, 'b', 2, 'c', 3], None) s_com = (['a', 1, 'b', 2, 'c', 3], None)
s_new = (['b', 4], None) s_new = (['b', 4], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _mapping._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 2) self.assertEqual(e.reason, 2)
def test__p_resolveConflict_delete_first_committed(self): def test__p_resolveConflict_delete_first_committed(self):
from ..Interfaces import BTreesConflictError from ..Interfaces import BTreesConflictError
bucket = self._makeOne() _mapping = self._makeOne()
s_old = (['a', 0, 'b', 1], None) s_old = (['a', 0, 'b', 1], None)
s_com = (['b', 4], None) s_com = (['b', 4], None)
s_new = (['a', 1, 'b', 2, 'c', 3], None) s_new = (['a', 1, 'b', 2, 'c', 3], None)
e = self.assertRaises(BTreesConflictError, e = self.assertRaises(BTreesConflictError,
bucket._p_resolveConflict, s_old, s_com, s_new) _mapping._p_resolveConflict, s_old, s_com, s_new)
self.assertEqual(e.reason, 3) self.assertEqual(e.reason, 3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7