Skip to content

M
MariaDB
Commit 6d1c8625 authored by Yoni Fogel's avatar Yoni Fogel
Browse files
Options

Addresses #288 

Fixes bugs in tests where find parameters did not have data == NULL

git-svn-id: file:///svn/tokudb@1770 c7de825b-a66e-492c-adef-691d508d4ae1
parent 0ac037f2
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 109 deletions
src/range_tree/tests/test_00042_find_limited.c
View file @ 6d1c8625
...@@ -87,30 +87,30 @@ void tests(BOOL allow_overlaps) { ...@@ -87,30 +87,30 @@ void tests(BOOL allow_overlaps) {
runinsert(0, init_range(&insert, 6, 7, 0)); runinsert(0, init_range(&insert, 6, 7, 0));
runinsert(0, init_range(&insert, 8, 9, 0)); runinsert(0, init_range(&insert, 8, 9, 0));
runlimitsearch(init_range(&query, 2, 7, 0), 0, 3); runlimitsearch(init_range(&query, 2, 7, -1), 0, 3);
runlimitsearch(init_range(&query, 2, 7, 0), 1, 1); runlimitsearch(init_range(&query, 2, 7, -1), 1, 1);
runlimitsearch(init_range(&query, 2, 7, 0), 2, 2); runlimitsearch(init_range(&query, 2, 7, -1), 2, 2);
runlimitsearch(init_range(&query, 2, 7, 0), 3, 3); runlimitsearch(init_range(&query, 2, 7, -1), 3, 3);
runlimitsearch(init_range(&query, 2, 7, 0), 4, 3); runlimitsearch(init_range(&query, 2, 7, -1), 4, 3);
close_tree(); close_tree();
/* Tree is empty (return none) */ /* Tree is empty (return none) */
setup_tree(allow_overlaps, FALSE, 0, 0, 0); setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runlimitsearch(init_range(&query, 0, 0, 0), 0, 0); runlimitsearch(init_range(&query, 0, 0, -1), 0, 0);
close_tree(); close_tree();
/* Tree contains only elements to the left. */ /* Tree contains only elements to the left. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0); setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 1, 2, 0)); runinsert(0, init_range(&insert, 1, 2, 0));
runinsert(0, init_range(&insert, 3, 4, 0)); runinsert(0, init_range(&insert, 3, 4, 0));
runlimitsearch(init_range(&query, 8, 30, 0), 0, 0); runlimitsearch(init_range(&query, 8, 30, -1), 0, 0);
close_tree(); close_tree();
/* Tree contains only elements to the right. */ /* Tree contains only elements to the right. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0); setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 10, 20, 0)); runinsert(0, init_range(&insert, 10, 20, 0));
runinsert(0, init_range(&insert, 30, 40, 0)); runinsert(0, init_range(&insert, 30, 40, 0));
runlimitsearch(init_range(&query, 5, 7, 0), 0, 0); runlimitsearch(init_range(&query, 5, 7, -1), 0, 0);
close_tree(); close_tree();
/* Tree contains only elements to the left and to the right. */ /* Tree contains only elements to the left and to the right. */
...@@ -119,7 +119,7 @@ void tests(BOOL allow_overlaps) { ...@@ -119,7 +119,7 @@ void tests(BOOL allow_overlaps) {
runinsert(0, init_range(&insert, 30, 40, 0)); runinsert(0, init_range(&insert, 30, 40, 0));
runinsert(0, init_range(&insert, 70, 80, 0)); runinsert(0, init_range(&insert, 70, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0)); runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 60, 65, 0), 0, 0); runlimitsearch(init_range(&query, 60, 65, -1), 0, 0);
close_tree(); close_tree();
/* Tree contains overlaps and elements to the left. */ /* Tree contains overlaps and elements to the left. */
...@@ -128,7 +128,7 @@ void tests(BOOL allow_overlaps) { ...@@ -128,7 +128,7 @@ void tests(BOOL allow_overlaps) {
runinsert(0, init_range(&insert, 30, 40, 0)); runinsert(0, init_range(&insert, 30, 40, 0));
runinsert(0, init_range(&insert, 60, 80, 0)); runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0)); runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2); runlimitsearch(init_range(&query, 70, 95, -1), 0, 2);
close_tree(); close_tree();
/* Tree contains overlaps and elements to the right. */ /* Tree contains overlaps and elements to the right. */
...@@ -137,7 +137,7 @@ void tests(BOOL allow_overlaps) { ...@@ -137,7 +137,7 @@ void tests(BOOL allow_overlaps) {
runinsert(0, init_range(&insert, 130, 140, 0)); runinsert(0, init_range(&insert, 130, 140, 0));
runinsert(0, init_range(&insert, 60, 80, 0)); runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0)); runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2); runlimitsearch(init_range(&query, 70, 95, -1), 0, 2);
close_tree(); close_tree();
/* Tree contains overlaps and elements to the left and to the right. */ /* Tree contains overlaps and elements to the left and to the right. */
...@@ -148,7 +148,7 @@ void tests(BOOL allow_overlaps) { ...@@ -148,7 +148,7 @@ void tests(BOOL allow_overlaps) {
runinsert(0, init_range(&insert, 130, 140, 0)); runinsert(0, init_range(&insert, 130, 140, 0));
runinsert(0, init_range(&insert, 60, 80, 0)); runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0)); runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2); runlimitsearch(init_range(&query, 70, 95, -1), 0, 2);
close_tree(); close_tree();
} }
......
src/range_tree/tests/test_00045_find_overlaps.c
View file @ 6d1c8625
...@@ -73,22 +73,22 @@ void tests(BOOL allow_overlaps) { ...@@ -73,22 +73,22 @@ void tests(BOOL allow_overlaps) {
/* Tree: {|0-1|}, query of |1-2| returns |0-1| */ /* Tree: {|0-1|}, query of |1-2| returns |0-1| */
setup_tree(allow_overlaps, 0, 1, 0); setup_tree(allow_overlaps, 0, 1, 0);
runsearch(0, init_range(&query, 1, 2, 0), init_range(&expect, 0, 1, 0)); runsearch(0, init_range(&query, 1, 2, -1), init_range(&expect, 0, 1, 0));
close_tree(); close_tree();
/* Tree: {|1-2|}, query of |0-1| returns |1-2| */ /* Tree: {|1-2|}, query of |0-1| returns |1-2| */
setup_tree(allow_overlaps, 1, 2, 0); setup_tree(allow_overlaps, 1, 2, 0);
runsearch(0, init_range(&query, 0, 1, 0), init_range(&expect, 1, 2, 0)); runsearch(0, init_range(&query, 0, 1, -1), init_range(&expect, 1, 2, 0));
close_tree(); close_tree();
/* Tree: {|1-2|}, insert of of |0-1| success == allow_overlaps */ /* Tree: {|1-2|}, insert of of |0-1| success == allow_overlaps */
setup_tree(allow_overlaps, 1, 2, 0); setup_tree(allow_overlaps, 1, 2, 0);
runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 1, 0)); runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 1, -1));
close_tree(); close_tree();
/* Tree: {|0-1|}, insert of of |1-2| success == allow_overlaps */ /* Tree: {|0-1|}, insert of of |1-2| success == allow_overlaps */
setup_tree(allow_overlaps, 0, 1, 0); setup_tree(allow_overlaps, 0, 1, 0);
runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 1, 2, 0)); runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 1, 2, -1));
close_tree(); close_tree();
/* /*
...@@ -102,22 +102,22 @@ void tests(BOOL allow_overlaps) { ...@@ -102,22 +102,22 @@ void tests(BOOL allow_overlaps) {
/* Tree: {|0-3|}, query of |1-2| returns |0-3| */ /* Tree: {|0-3|}, query of |1-2| returns |0-3| */
setup_tree(allow_overlaps, 0, 3, 0); setup_tree(allow_overlaps, 0, 3, 0);
runsearch(0, init_range(&query, 1, 2, 0), init_range(&expect, 0, 3, 0)); runsearch(0, init_range(&query, 1, 2, -1), init_range(&expect, 0, 3, 0));
close_tree(); close_tree();
/* Tree: {|1-2|}, query of |0-3| returns |1-2| */ /* Tree: {|1-2|}, query of |0-3| returns |1-2| */
setup_tree(allow_overlaps, 1, 2, 0); setup_tree(allow_overlaps, 1, 2, 0);
runsearch(0, init_range(&query, 0, 3, 0), init_range(&expect, 1, 2, 0)); runsearch(0, init_range(&query, 0, 3, -1), init_range(&expect, 1, 2, 0));
close_tree(); close_tree();
/* Tree: {|1-2|}, insert of of |0-3| success == allow_overlaps */ /* Tree: {|1-2|}, insert of of |0-3| success == allow_overlaps */
setup_tree(allow_overlaps, 1, 2, 0); setup_tree(allow_overlaps, 1, 2, 0);
runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 3, 0)); runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 3, -1));
close_tree(); close_tree();
/* Tree: {|0-3|}, insert of of |1-2| success == allow_overlaps */ /* Tree: {|0-3|}, insert of of |1-2| success == allow_overlaps */
setup_tree(allow_overlaps, 0, 3, 0); setup_tree(allow_overlaps, 0, 3, 0);
runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 1, 2, 0)); runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 1, 2, -1));
close_tree(); close_tree();
/* /*
...@@ -129,12 +129,12 @@ void tests(BOOL allow_overlaps) { ...@@ -129,12 +129,12 @@ void tests(BOOL allow_overlaps) {
/* Tree: {|0-3|}, query of |0-3| returns |0-3| */ /* Tree: {|0-3|}, query of |0-3| returns |0-3| */
setup_tree(allow_overlaps, 0, 3, 0); setup_tree(allow_overlaps, 0, 3, 0);
runsearch(0, init_range(&query, 0, 3, 0), init_range(&expect, 0, 3, 0)); runsearch(0, init_range(&query, 0, 3, -1), init_range(&expect, 0, 3, 0));
close_tree(); close_tree();
/* Tree: {|0-3|}, insert of of |0-3| success == allow_overlaps */ /* Tree: {|0-3|}, insert of of |0-3| success == allow_overlaps */
setup_tree(allow_overlaps, 0, 3, 0); setup_tree(allow_overlaps, 0, 3, 0);
runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 3, 0)); runinsert((allow_overlaps ? 0 : EDOM), init_range(&query, 0, 3, -1));
close_tree(); close_tree();
} }
......
src/range_tree/tests/test_00050_predecessorsuccessor.c
View file @ 6d1c8625
/* We are going to test whether we can insert and delete. */
#include "test.h" #include "test.h"
int main(int argc, const char *argv[]) { void verify_all_overlap(toku_range* query, toku_range* list, unsigned listlen) {
int r; unsigned i;
toku_range_tree *tree;
toku_range range;
toku_range find_range;
int nums[8] = {0,1,2,3,4,5,6,7};
char letters[2] = {'A','B'};
unsigned found;
toku_range* buf = (toku_range*)toku_malloc(2*sizeof(toku_range));
unsigned bufsize = 2;
parse_args(argc, argv); 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);
}
}
find_range.left = &nums[4]; int nums[200];
find_range.right = &nums[4]; char letters[2] = {'A','B'};
find_range.data = NULL;
/* Test no overlap case. */ toku_range_tree *tree;
/* Test overlap case */ toku_range* buf;
/* unsigned buflen;
1 2 3 4 5 6 7
|---A---|
|---B---|
*/
r = toku_rt_create(&tree, int_cmp, char_cmp, TRUE);
CKERR(r);
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); toku_range* init_range(toku_range* range, int left, int right, int data) {
assert(found == 0); range->left = &nums[left];
assert(bufsize >= 4); range->right = &nums[right];
if (data < 0) range->data = NULL;
range.left = &nums[1]; else range->data = &letters[data];
range.right = &nums[3]; return range;
range.data = &letters[0]; }
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); void setup_tree(BOOL allow_overlaps, BOOL insert, int left, int right, int data) {
assert(found == 1); int r;
assert(bufsize >= 4); toku_range range;
r = toku_rt_create(&tree, int_cmp, char_cmp, allow_overlaps); CKERR(r);
range.left = &nums[4]; if (insert) {
range.right = &nums[6]; r = toku_rt_insert(tree, init_range(&range, left, right, data));
range.data = &letters[1]; CKERR(r);
r = toku_rt_insert(tree, &range); CKERR(r); }
}
void close_tree(void) {
int r;
r = toku_rt_close(tree); CKERR(r);
}
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); void runsearch(int rexpect, toku_range* query, toku_range* expect) {
assert(found == 2); int r;
assert(bufsize >= 4); unsigned found;
r = toku_rt_find(tree, query, 0, &buf, &buflen, &found);
CKERR2(r, rexpect);
if (rexpect != 0) return;
assert(found == 1);
assert(int_cmp(&buf[0].left, expect->left) == 0 &&
int_cmp(&buf[0].right, expect->right) == 0 &&
char_cmp(&buf[0].data, expect->data) == 0);
}
range.left = &nums[4]; void runinsert(int rexpect, toku_range* toinsert) {
range.right = &nums[6]; int r;
range.data = &letters[1]; r = toku_rt_insert(tree, toinsert);
r = toku_rt_delete(tree, &range); CKERR(r); CKERR2(r, rexpect);
}
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); void runlimitsearch(toku_range* query, unsigned limit, unsigned findexpect) {
assert(found == 1); int r;
assert(bufsize >= 4); unsigned found;
/* Verify the right one is still there, and the wrong one is not there. */ r=toku_rt_find(tree, query, limit, &buf, &buflen, &found); CKERR(r);
assert(*(int*)buf[0].left == 1 && verify_all_overlap(query, buf, found);
*(int*)buf[0].right == 3 &&
*(char*)buf[0].data == letters[0]); assert(found == findexpect);
}
range.left = &nums[4];
range.right = &nums[6];
range.data = &letters[1];
r = toku_rt_insert(tree, &range); CKERR(r);
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 2);
assert(bufsize >= 4);
range.left = &nums[1];
range.right = &nums[3];
range.data = &letters[0];
r = toku_rt_delete(tree, &range); CKERR(r);
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r);
assert(found == 1);
assert(bufsize >= 4);
/* Verify the right one is still there, and the wrong one is not there. */
assert(*(int*)buf[0].left == 4 &&
*(int*)buf[0].right == 6 &&
*(char*)buf[0].data == letters[1]);
/* Clean up. */ void tests(BOOL allow_overlaps) {
range.left = &nums[4]; toku_range query;
range.right = &nums[6]; toku_range insert;
range.data = &letters[1]; /*
r = toku_rt_delete(tree, &range); CKERR(r); Limited/Unlimited Queries
r = toku_rt_find(tree, &find_range, 4, &buf, &bufsize, &found); CKERR(r); Limit of k does not produce all, but limit of 0 does. Single point overlaps
assert(found == 0); */
assert(bufsize >= 4);
/* Done */ /* Tree: {|0-1|,|2-3|,|4-5|,|6-7|,|8-9|}, query of |2-7|, limit 2 finds 2,
limit 3 finds 3, limit 4 finds 3, limit 0 finds 3 */
setup_tree(allow_overlaps, TRUE, 0, 1, 0);
runinsert(0, init_range(&insert, 2, 3, 0));
runinsert(0, init_range(&insert, 4, 5, 0));
runinsert(0, init_range(&insert, 6, 7, 0));
runinsert(0, init_range(&insert, 8, 9, 0));
runlimitsearch(init_range(&query, 2, 7, 0), 0, 3);
runlimitsearch(init_range(&query, 2, 7, 0), 1, 1);
runlimitsearch(init_range(&query, 2, 7, 0), 2, 2);
runlimitsearch(init_range(&query, 2, 7, 0), 3, 3);
runlimitsearch(init_range(&query, 2, 7, 0), 4, 3);
close_tree();
/* Tree is empty (return none) */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runlimitsearch(init_range(&query, 0, 0, 0), 0, 0);
close_tree();
/* Tree contains only elements to the left. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 1, 2, 0));
runinsert(0, init_range(&insert, 3, 4, 0));
runlimitsearch(init_range(&query, 8, 30, 0), 0, 0);
close_tree();
/* Tree contains only elements to the right. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 10, 20, 0));
runinsert(0, init_range(&insert, 30, 40, 0));
runlimitsearch(init_range(&query, 5, 7, 0), 0, 0);
close_tree();
/* Tree contains only elements to the left and to the right. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 10, 20, 0));
runinsert(0, init_range(&insert, 30, 40, 0));
runinsert(0, init_range(&insert, 70, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 60, 65, 0), 0, 0);
close_tree();
/* Tree contains overlaps and elements to the left. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 10, 20, 0));
runinsert(0, init_range(&insert, 30, 40, 0));
runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2);
close_tree();
/* Tree contains overlaps and elements to the right. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 110, 120, 0));
runinsert(0, init_range(&insert, 130, 140, 0));
runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2);
close_tree();
/* Tree contains overlaps and elements to the left and to the right. */
setup_tree(allow_overlaps, FALSE, 0, 0, 0);
runinsert(0, init_range(&insert, 10, 20, 0));
runinsert(0, init_range(&insert, 30, 40, 0));
runinsert(0, init_range(&insert, 110, 120, 0));
runinsert(0, init_range(&insert, 130, 140, 0));
runinsert(0, init_range(&insert, 60, 80, 0));
runinsert(0, init_range(&insert, 90, 100, 0));
runlimitsearch(init_range(&query, 70, 95, 0), 0, 2);
close_tree();
}
r = toku_rt_close(tree); CKERR(r); int main(int argc, const char *argv[]) {
int i;
for (i = 0; i < sizeof(nums) / sizeof(nums[0]); i++) nums[i] = i;
buflen = 2;
buf = (toku_range*)toku_malloc(2 * sizeof(toku_range));
tests(FALSE);
tests(TRUE);
tree = NULL; tree = NULL;
toku_free(buf); toku_free(buf);
buf = NULL; buf = NULL;
return 0; return 0;
} }
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