upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 23:29:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7515 Fix MDB parent/child txn interaction.

Browse source 
mdb_txn_commit(child): Copy more state. Copy all of mt_dbs:
Include mainDB, and even freeDB since mdb_drop() can update
it. Don't skip DBs with unchanged root, this could break
when the new was newly opened and the old unused junk.

mdb_page_get(): Search parents' dirty lists.
This commit is contained in:
Hallvard Furuseth 2013-02-16 19:11:20 +01:00
parent d90581fa5a
commit 00d7a96bd5
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libraries/liblmdb/mdb.c
View file

@ -2063,22 +2063,19 @@ mdb_txn_commit(MDB_txn *txn)
} }
if (txn->mt_parent) { if (txn->mt_parent) {
MDB_db *ip, *jp; MDB_txn *parent = txn->mt_parent;
MDB_dbi i;
unsigned x, y; unsigned x, y;
MDB_ID2L dst, src; MDB_ID2L dst, src;
parent->mt_next_pgno = txn->mt_next_pgno;
parent->mt_flags = txn->mt_flags;
/* Merge (and close) our cursors with parent's */ /* Merge (and close) our cursors with parent's */
mdb_cursor_merge(txn); mdb_cursor_merge(txn);
/* Update parent's DB table */ /* Update parent's DB table. */
ip = &txn->mt_parent->mt_dbs[2]; memcpy(parent->mt_dbs, txn->mt_dbs, txn->mt_numdbs * sizeof(MDB_db));
jp = &txn->mt_dbs[2]; memcpy(parent->mt_dbflags, txn->mt_dbflags, txn->mt_numdbs);
for (i = 2; i < txn->mt_numdbs; i++) {
if (ip->md_root != jp->md_root)
*ip = *jp;
ip++; jp++;
}
txn->mt_parent->mt_numdbs = txn->mt_numdbs; txn->mt_parent->mt_numdbs = txn->mt_numdbs;
/* Append our free list to parent's */ /* Append our free list to parent's */
@ -3910,28 +3907,31 @@ mdb_page_get(MDB_txn *txn, pgno_t pgno, MDB_page **ret)
{ {
MDB_page *p = NULL; MDB_page *p = NULL;
if (txn->mt_env->me_flags & MDB_WRITEMAP) { if (!((txn->mt_flags & MDB_TXN_RDONLY) |
if (pgno < txn->mt_next_pgno) (txn->mt_env->me_flags & MDB_WRITEMAP)))
p = (MDB_page *)(txn->mt_env->me_map + txn->mt_env->me_psize * pgno); {
MDB_txn *tx2 = txn;
do {
MDB_ID2L dl = tx2->mt_u.dirty_list;
if (dl[0].mid) {
unsigned x = mdb_mid2l_search(dl, pgno);
if (x <= dl[0].mid && dl[x].mid == pgno) {
p = dl[x].mptr;
goto done; goto done;
} }
if (!F_ISSET(txn->mt_flags, MDB_TXN_RDONLY) && txn->mt_u.dirty_list[0].mid) {
unsigned x;
x = mdb_mid2l_search(txn->mt_u.dirty_list, pgno);
if (x <= txn->mt_u.dirty_list[0].mid && txn->mt_u.dirty_list[x].mid == pgno) {
p = txn->mt_u.dirty_list[x].mptr;
} }
} while ((tx2 = tx2->mt_parent) != NULL);
} }
if (!p) {
if (pgno < txn->mt_next_pgno) if (pgno < txn->mt_next_pgno) {
p = (MDB_page *)(txn->mt_env->me_map + txn->mt_env->me_psize * pgno); p = (MDB_page *)(txn->mt_env->me_map + txn->mt_env->me_psize * pgno);
} } else {
done:
*ret = p;
if (!p) {
DPRINTF("page %zu not found", pgno); DPRINTF("page %zu not found", pgno);
assert(p != NULL); assert(p != NULL);
} }
done:
*ret = p;
return (p != NULL) ? MDB_SUCCESS : MDB_PAGE_NOTFOUND; return (p != NULL) ? MDB_SUCCESS : MDB_PAGE_NOTFOUND;
} }