mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7829 Simplify last commit

Browse Source
This commit is contained in:
Hallvard Furuseth 2014-04-02 07:02:14 +02:00
parent fca18d2586
commit 2764360a7b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/liblmdb/mdb.c
View File

@ -7464,24 +7464,21 @@ mdb_rebalance(MDB_cursor *mc)
minkeys = 1 + (IS_BRANCH(mn.mc_pg[mn.mc_top]));
if (PAGEFILL(mc->mc_txn->mt_env, mn.mc_pg[mn.mc_top]) >= FILL_THRESHOLD && NUMKEYS(mn.mc_pg[mn.mc_top]) > minkeys) {
rc = mdb_node_move(&mn, mc);
if (mc->mc_ki[ptop] == 0) {
mc->mc_ki[mc->mc_top] = oldki;
} else {
mc->mc_ki[mc->mc_top] = oldki + 1;
if (mc->mc_ki[ptop]) {
oldki++;
}
} else {
if (mc->mc_ki[ptop] == 0) {
rc = mdb_page_merge(&mn, mc);
mc->mc_ki[mc->mc_top] = oldki;
} else {
unsigned int nkeys = NUMKEYS(mn.mc_pg[mn.mc_top]);
oldki += NUMKEYS(mn.mc_pg[mn.mc_top]);
mn.mc_ki[mn.mc_top] += mc->mc_ki[mn.mc_top] + 1;
rc = mdb_page_merge(mc, &mn);
mc->mc_pg[mc->mc_top] = mn.mc_pg[mn.mc_top];
mc->mc_ki[mc->mc_top] = oldki + nkeys;
}
mc->mc_flags &= ~C_EOF;
}
mc->mc_ki[mc->mc_top] = oldki;
return rc;
}