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

More for ITS#7620 Fix mdb_ovpage_free().

Browse Source 
Do not binary-search dirty_list, it is unsorted when MDB_WRITEMAP.
Catch errors. In nested txns, put the page in mt_free_pgs after
all since pages dirty in a parent txn would add complexities.
This commit is contained in:
Hallvard Furuseth 2013-06-13 08:25:25 +02:00
parent 2d0b362b6f
commit c37a11a424
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libraries/liblmdb/mdb.c
View File

@ -4281,47 +4281,55 @@ mdb_page_search(MDB_cursor *mc, MDB_val *key, int flags)
static int static int
mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp) mdb_ovpage_free(MDB_cursor *mc, MDB_page *mp)
{ {
MDB_txn *txn = mc->mc_txn;
pgno_t pg = mp->mp_pgno; pgno_t pg = mp->mp_pgno;
unsigned i, ovpages = mp->mp_pages; unsigned i, ovpages = mp->mp_pages;
int rc; int rc;
DPRINTF("free ov page %zu (%d)", pg, ovpages); DPRINTF("free ov page %zu (%d)", pg, ovpages);
mc->mc_db->md_overflow_pages -= ovpages;
/* If the page is dirty we just acquired it, so we should /* If the page is dirty we just acquired it, so we should
* give it back to our current free list, if any. * give it back to our current free list, if any.
* Not currently supported in nested txns.
* Otherwise put it onto the list of pages we freed in this txn. * Otherwise put it onto the list of pages we freed in this txn.
*/ */
if ((mp->mp_flags & P_DIRTY) && mc->mc_txn->mt_env->me_pghead) { if ((mp->mp_flags & P_DIRTY) && !txn->mt_parent && txn->mt_env->me_pghead) {
unsigned j, x; unsigned j, x;
pgno_t *mop = mc->mc_txn->mt_env->me_pghead; pgno_t *mop = txn->mt_env->me_pghead;
/* Remove from dirty list */ MDB_ID2 *dl, ix, iy;
x = mdb_mid2l_search(mc->mc_txn->mt_u.dirty_list, pg); /* Prepare to insert pg */
for (; x < mc->mc_txn->mt_u.dirty_list[0].mid; x++)
mc->mc_txn->mt_u.dirty_list[x] = mc->mc_txn->mt_u.dirty_list[x+1];
mc->mc_txn->mt_u.dirty_list[0].mid--;
/* Make room to insert pg */
j = mop[0] + ovpages; j = mop[0] + ovpages;
if (j > mop[-1]) { if (j > mop[-1]) {
rc = mdb_midl_grow(&mop, ovpages); rc = mdb_midl_grow(&mop, ovpages);
if (rc) if (rc)
return rc; return rc;
mc->mc_txn->mt_env->me_pghead = mop; txn->mt_env->me_pghead = mop;
} }
for (i = mop[0]; i>0; i--) { /* Remove from dirty list */
if (mop[i] < pg) dl = txn->mt_u.dirty_list;
mop[j--] = mop[i]; x = dl[0].mid--;
else for (ix = dl[x]; ix.mid != pg; ix = iy) {
break; if (x > 1) {
x--;
iy = dl[x];
dl[x] = ix;
} else {
assert(x > 1);
return MDB_CORRUPTED;
}
} }
/* Insert in me_pghead */
for (i = mop[0]; i && mop[i] < pg; i--)
mop[j--] = mop[i];
while (j>i) while (j>i)
mop[j--] = pg++; mop[j--] = pg++;
mop[0] += ovpages; mop[0] += ovpages;
} else { } else {
for (i=0; i<ovpages; i++) { for (i=0; i<ovpages; i++) {
mdb_midl_append(&mc->mc_txn->mt_free_pgs, pg); mdb_midl_append(&txn->mt_free_pgs, pg);
pg++; pg++;
} }
} }
mc->mc_db->md_overflow_pages -= ovpages;
return 0; return 0;
} }