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

Addresses #293

Browse source 
Addresses #307
Fixed the condition under which the border sweep would fail.


git-svn-id: file:///svn/tokudb@2081 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Vincenzo Liberatore 2008-02-04 21:55:16 +00:00
parent 5762a74d90
commit d283051af7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/lock_tree/locktree.c
View file

@ -728,21 +728,22 @@ static int __toku_lt_preprocess(toku_lock_tree* tree, DB_TXN* txn,
return 0;
}
static int __toku_lt_get_border(toku_lock_tree* tree, BOOL in_self,
static int __toku_lt_get_border(toku_lock_tree* tree, BOOL in_borderwrite,
toku_range* pred, toku_range* succ,
BOOL* found_p, BOOL* found_s,
toku_range* to_insert) {
assert(tree && pred && succ && found_p && found_s);
int r;
toku_range_tree* rt;
rt = in_self ? tree->borderwrite :
__toku_lt_ifexist_selfwrite(tree, tree->buf[0].data);
rt = in_borderwrite ? tree->borderwrite :
__toku_lt_ifexist_selfwrite(tree, tree->buf[0].data);
if (!rt) return __toku_lt_panic(tree);
r = toku_rt_predecessor(rt, to_insert->left, pred, found_p);
if (r!=0) return r;
r = toku_rt_successor (rt, to_insert->right, succ, found_s);
if (r!=0) return r;
if (*found_p && *found_s && pred->data == succ->data) {
if (in_borderwrite && *found_p && *found_s && pred->data == succ->data &&
pred->data == to_insert->data) {
return __toku_lt_panic(tree); }
return 0;
}
@ -1090,7 +1091,7 @@ static int __toku_sweep_border(toku_lock_tree* tree, toku_range* range) {
BOOL found_p;
BOOL found_s;
r = __toku_lt_get_border(tree, FALSE, &pred, &succ, &found_p, &found_s,
r = __toku_lt_get_border(tree, TRUE, &pred, &succ, &found_p, &found_s,
&buf[0]);
if (r!=0) return r;