From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 2 Apr 2014 05:02:14 +0000 (+0200)
Subject: ITS#7829 Simplify last commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~132^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2764360a7b273e579add29830ee0a0419ad37f71;p=openldap

ITS#7829 Simplify last commit
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 10a8358449..2e47bc02e7 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -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;
 }