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

Tweak prev commit

Browse Source 
If somehow "need" is larger than the list size, don't
try to fake out the dirty list.
This commit is contained in:
Howard Chu 2013-08-22 21:29:53 -07:00
parent 7b1db13050
commit 45c4ed1805
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libraries/liblmdb/mdb.c
View File

@ -1479,7 +1479,6 @@ mdb_page_spill(MDB_cursor *m0, MDB_val *key, MDB_val *data)
* better than 1/2, 1/4, or 1/10.
*/
k = 0;
need *= 100;
if (need < MDB_IDL_UM_MAX / 8)
need = MDB_IDL_UM_MAX / 8;
@ -1519,32 +1518,38 @@ mdb_page_spill(MDB_cursor *m0, MDB_val *key, MDB_val *data)
*/
{
MDB_ID2 old;
k = dl[0].mid - i + 1;
old = dl[i-1];
dl[i-1].mid = k;
txn->mt_u.dirty_list = &dl[i-1];
if (i) {
k = dl[0].mid - i + 1;
old = dl[i-1];
dl[i-1].mid = k;
txn->mt_u.dirty_list = &dl[i-1];
}
rc = mdb_page_flush(txn);
/* reset back to the real list */
dl[0].mid -= k;
dl[0].mid += dl[i-1].mid;
dl[i-1] = old;
txn->mt_u.dirty_list = dl;
if (i) {
/* reset back to the real list */
dl[0].mid -= k;
dl[0].mid += dl[i-1].mid;
dl[i-1] = old;
txn->mt_u.dirty_list = dl;
}
}
mdb_cursorpages_mark(m0, P_DIRTY|P_KEEP);
/* Reset any dirty root pages we kept that page_flush didn't see */
for (i=0; i<txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_DIRTY) {
pgno_t pgno = txn->mt_dbs[i].md_root;
if (pgno == P_INVALID)
continue;
if ((rc = mdb_page_get(txn, pgno, &dp, &level)) != MDB_SUCCESS)
goto done;
if (dp->mp_flags & P_KEEP)
dp->mp_flags ^= P_KEEP;
if (i) {
/* Reset any dirty root pages we kept that page_flush didn't see */
for (i=0; i<txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_DIRTY) {
pgno_t pgno = txn->mt_dbs[i].md_root;
if (pgno == P_INVALID)
continue;
if ((rc = mdb_page_get(txn, pgno, &dp, &level)) != MDB_SUCCESS)
goto done;
if (dp->mp_flags & P_KEEP)
dp->mp_flags ^= P_KEEP;
}
}
}