mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Addresses #288

Browse source 
Verifies end_cmp commutativity via overlap, and adds test cases to
stress exact comparison

git-svn-id: file:///svn/tokudb@1911 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Vincenzo Liberatore 2008-01-26 20:27:42 +00:00
parent 136b3161bb
commit 714bdcff42
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/range_tree/linear.c
View file

@ -94,11 +94,9 @@ static BOOL __toku_rt_exact(toku_range_tree* tree,
assert(tree);
assert(a);
assert(b);
/* The comparison function must be commutative */
assert(tree->end_cmp (a->left, b->left) != 0 ||
tree->end_cmp (a->right, b->right) == 0 );
return (tree->end_cmp (a->left, b->left) == 0 &&
tree->end_cmp (a->right, b->right) == 0 &&
tree->data_cmp(a->data, b->data) == 0);
}
@ -188,8 +186,10 @@ int toku_rt_insert(toku_range_tree* tree, toku_range* range) {
}
else {
for (i = 0; i < tree->numelements; i++) {
if (__toku_rt_overlap(tree, range, &tree->ranges[i]) ||
__toku_rt_overlap(tree, &tree->ranges[i], range)) return EDOM;
/* I am going to check that end_cmp is commutative as such: */
assert (__toku_rt_overlap(tree, range, &tree->ranges[i]) ==
__toku_rt_overlap(tree, &tree->ranges[i], range));
if (__toku_rt_overlap(tree, range, &tree->ranges[i])) return EDOM;
}
}
r = __toku_rt_increase_capacity(tree, tree->numelements + 1);

10
src/range_tree/tests/test_00020_insertdelete.c
View file

@ -38,6 +38,16 @@ int main(int argc, const char *argv[]) {
/* Try and fail to insert exact same thing. */
r = toku_rt_insert(tree, &range); CKERR2(r,EDOM);
/* Try and succeed to insert (and delete) similar yet different things */
range.right = &nums[6];
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_delete(tree, &range); CKERR(r);
range.right = &nums[5];
range.data = &letters[1];
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_delete(tree, &range); CKERR(r);
range.data = &letters[0];
range.left = &nums[2];
range.right = &nums[6];
range.data = &letters[0];