mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Speedup deletion from spill_pgs

Browse Source
This commit is contained in:
Howard Chu 2013-08-24 19:48:37 +01:00
parent 6423c87749
commit 41bf5c906a
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/liblmdb/mdb.c
View File

@ -1475,6 +1475,17 @@ mdb_page_spill(MDB_cursor *m0, MDB_val *key, MDB_val *data)
txn->mt_spill_pgs = mdb_midl_alloc(MDB_IDL_UM_MAX);
if (!txn->mt_spill_pgs)
return ENOMEM;
} else {
/* strip any dups */
MDB_IDL sl = txn->mt_spill_pgs;
unsigned int num = sl[0];
j=1;
for (i=1; i<=num; i++) {
if (sl[i] == sl[j])
continue;
sl[++j] = sl[i];
}
sl[0] = j;
}
/* Preserve pages which may soon be dirtied again */
@ -1813,10 +1824,15 @@ mdb_page_unspill(MDB_txn *tx0, MDB_page *mp, MDB_page **ret)
mdb_page_copy(np, mp, env->me_psize);
}
if (txn == tx0) {
/* If in current txn, this page is no longer spilled */
for (; x < txn->mt_spill_pgs[0]; x++)
/* If in current txn, this page is no longer spilled.
* If it happens to be the last page, truncate the spill list.
* Otherwise temporarily dup its neighbor over it. Dups will
* be stripped out later by the next mdb_page_spill run.
*/
if (x == txn->mt_spill_pgs[0])
txn->mt_spill_pgs[0]--;
else
txn->mt_spill_pgs[x] = txn->mt_spill_pgs[x+1];
txn->mt_spill_pgs[0]--;
} /* otherwise, if belonging to a parent txn, the
* page remains spilled until child commits
*/