Skip to content

M
mariadb
Commit e2c4ac7c authored by Yoni Fogel's avatar Yoni Fogel
Browse files
Options

Addresses #288 

More range tree tests.

git-svn-id: file:///svn/tokudb@1744 c7de825b-a66e-492c-adef-691d508d4ae1
parent 629c7cb5
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 2 deletions
src/range_tree/tests/test_00020_insertdelete.c
View file @ e2c4ac7c
...@@ -23,6 +23,13 @@ int main(int argc, const char *argv[]) { ...@@ -23,6 +23,13 @@ int main(int argc, const char *argv[]) {
r = toku_rt_create(&tree, int_cmp, char_cmp, TRUE); r = toku_rt_create(&tree, int_cmp, char_cmp, TRUE);
CKERR(r); CKERR(r);
/* Verify we can insert a trivial range and lose it. */
range.left = &nums[1];
range.right = &nums[1];
range.data = &letters[0];
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_delete(tree, &range); CKERR(r);
range.left = &nums[1]; range.left = &nums[1];
range.right = &nums[5]; range.right = &nums[5];
range.data = &letters[0]; range.data = &letters[0];
...@@ -86,15 +93,21 @@ int main(int argc, const char *argv[]) { ...@@ -86,15 +93,21 @@ int main(int argc, const char *argv[]) {
tree = NULL; tree = NULL;
/* Test no overlap case. */ /* Test no overlap case. */
/* Test overlap case */
/* /*
1 2 3 4 5 6 7 1 2 3 4 5 6 7
|---A---| |---A---|
|---B---| |---B---|
*/ */
r = toku_rt_create(&tree, int_cmp, char_cmp, TRUE); r = toku_rt_create(&tree, int_cmp, char_cmp, FALSE);
CKERR(r); CKERR(r);
/* Verify we can insert a trivial range and lose it. */
range.left = &nums[1];
range.right = &nums[1];
range.data = &letters[0];
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_delete(tree, &range); CKERR(r);
range.left = &nums[1]; range.left = &nums[1];
range.right = &nums[3]; range.right = &nums[3];
range.data = &letters[0]; range.data = &letters[0];
......
src/range_tree/tests/test_00040_find.c
View file @ e2c4ac7c
...@@ -2,6 +2,16 @@ ...@@ -2,6 +2,16 @@
#include "test.h" #include "test.h"
void verify_all_overlap(toku_range* query, toku_range* list, unsigned listlen) {
unsigned i;
for (i = 0; i < listlen; i++) {
/* Range A and B overlap iff A.left <= B.right && B.left <= A.right */
assert(int_cmp(query->left, list[i].right) <= 0 &&
int_cmp(list[i].left, query->right) <= 0);
}
}
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
int r; int r;
toku_range_tree *tree; toku_range_tree *tree;
...@@ -43,6 +53,7 @@ int main(int argc, const char *argv[]) { ...@@ -43,6 +53,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1); assert(found == 1);
assert(bufsize == 2); assert(bufsize == 2);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[2]; range.left = &nums[2];
range.right = &nums[6]; range.right = &nums[6];
...@@ -52,6 +63,7 @@ int main(int argc, const char *argv[]) { ...@@ -52,6 +63,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 2); assert(found == 2);
assert(bufsize == 2); assert(bufsize == 2);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[3]; range.left = &nums[3];
range.right = &nums[7]; range.right = &nums[7];
...@@ -62,6 +74,7 @@ int main(int argc, const char *argv[]) { ...@@ -62,6 +74,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 3); assert(found == 3);
assert(bufsize >= 3); assert(bufsize >= 3);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[2]; range.left = &nums[2];
range.right = &nums[6]; range.right = &nums[6];
...@@ -71,6 +84,8 @@ int main(int argc, const char *argv[]) { ...@@ -71,6 +84,8 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 4); assert(found == 4);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[2]; range.left = &nums[2];
range.right = &nums[6]; range.right = &nums[6];
...@@ -80,6 +95,7 @@ int main(int argc, const char *argv[]) { ...@@ -80,6 +95,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 3); assert(found == 3);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Verify the right one is still there, and the wrong one is not there. */ /* Verify the right one is still there, and the wrong one is not there. */
for (i = 0; i < found; i++) { for (i = 0; i < found; i++) {
...@@ -96,6 +112,7 @@ int main(int argc, const char *argv[]) { ...@@ -96,6 +112,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 4); assert(found == 4);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[2]; range.left = &nums[2];
range.right = &nums[6]; range.right = &nums[6];
...@@ -105,6 +122,8 @@ int main(int argc, const char *argv[]) { ...@@ -105,6 +122,8 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 3); assert(found == 3);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Verify the right one is still there, and the wrong one is not there. */ /* Verify the right one is still there, and the wrong one is not there. */
for (i = 0; i < found; i++) { for (i = 0; i < found; i++) {
assert(*(int*)buf[i].left != 2 || assert(*(int*)buf[i].left != 2 ||
...@@ -121,6 +140,7 @@ int main(int argc, const char *argv[]) { ...@@ -121,6 +140,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 2); assert(found == 2);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[2]; range.left = &nums[2];
range.right = &nums[6]; range.right = &nums[6];
...@@ -130,6 +150,8 @@ int main(int argc, const char *argv[]) { ...@@ -130,6 +150,8 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1); assert(found == 1);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Verify the right one is still there, and the wrong one is not there. */ /* Verify the right one is still there, and the wrong one is not there. */
assert(*(int*)buf[0].left == 1 && assert(*(int*)buf[0].left == 1 &&
*(int*)buf[0].right == 5 && *(int*)buf[0].right == 5 &&
...@@ -143,6 +165,7 @@ int main(int argc, const char *argv[]) { ...@@ -143,6 +165,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 0); assert(found == 0);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Done */ /* Done */
...@@ -163,6 +186,7 @@ int main(int argc, const char *argv[]) { ...@@ -163,6 +186,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 0); assert(found == 0);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[1]; range.left = &nums[1];
range.right = &nums[3]; range.right = &nums[3];
...@@ -172,6 +196,7 @@ int main(int argc, const char *argv[]) { ...@@ -172,6 +196,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1); assert(found == 1);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[4]; range.left = &nums[4];
range.right = &nums[6]; range.right = &nums[6];
...@@ -181,6 +206,7 @@ int main(int argc, const char *argv[]) { ...@@ -181,6 +206,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 2); assert(found == 2);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[4]; range.left = &nums[4];
range.right = &nums[6]; range.right = &nums[6];
...@@ -190,6 +216,8 @@ int main(int argc, const char *argv[]) { ...@@ -190,6 +216,8 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1); assert(found == 1);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Verify the right one is still there, and the wrong one is not there. */ /* Verify the right one is still there, and the wrong one is not there. */
assert(*(int*)buf[0].left == 1 && assert(*(int*)buf[0].left == 1 &&
*(int*)buf[0].right == 3 && *(int*)buf[0].right == 3 &&
...@@ -203,6 +231,7 @@ int main(int argc, const char *argv[]) { ...@@ -203,6 +231,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 2); assert(found == 2);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
range.left = &nums[1]; range.left = &nums[1];
range.right = &nums[3]; range.right = &nums[3];
...@@ -212,6 +241,8 @@ int main(int argc, const char *argv[]) { ...@@ -212,6 +241,8 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1); assert(found == 1);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Verify the right one is still there, and the wrong one is not there. */ /* Verify the right one is still there, and the wrong one is not there. */
assert(*(int*)buf[0].left == 4 && assert(*(int*)buf[0].left == 4 &&
*(int*)buf[0].right == 6 && *(int*)buf[0].right == 6 &&
...@@ -226,6 +257,7 @@ int main(int argc, const char *argv[]) { ...@@ -226,6 +257,7 @@ int main(int argc, const char *argv[]) {
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 0); assert(found == 0);
assert(bufsize >= 4); assert(bufsize >= 4);
verify_all_overlap(&find_range, buf, found);
/* Done */ /* Done */
......
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