ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-21 21:48:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix nested txn.

Browse Source 
Change-Id: Iff752d23a880ed4f5322145446be9c989b837479
This commit is contained in:
Leonid Yuriev 2019-11-19 16:52:26 +03:00
parent acde45ff3a
commit c00f484813
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/elements/core.c
View File

@ -6562,7 +6562,7 @@ int mdbx_txn_commit(MDBX_txn *txn) {
parent->mt_geo = txn->mt_geo; parent->mt_geo = txn->mt_geo;
parent->mt_canary = txn->mt_canary; parent->mt_canary = txn->mt_canary;
parent->mt_flags = txn->mt_flags | (parent->mt_flags & MDBX_SHRINK_ALLOWED); parent->mt_flags |= txn->mt_flags & MDBX_TXN_DIRTY;
/* Merge our cursors into parent's and close them */ /* Merge our cursors into parent's and close them */
mdbx_cursors_eot(txn, 1); mdbx_cursors_eot(txn, 1);
@ -6739,9 +6739,14 @@ int mdbx_txn_commit(MDBX_txn *txn) {
parent->tw.spill_pages = txn->tw.spill_pages; parent->tw.spill_pages = txn->tw.spill_pages;
} }
} }
if (parent->tw.spill_pages)
parent->mt_flags &= ~(MDBX_TXN_SPILLS | MDBX_TXN_HAS_CHILD);
if (parent->tw.spill_pages) {
assert(mdbx_pnl_check4assert(parent->tw.spill_pages, assert(mdbx_pnl_check4assert(parent->tw.spill_pages,
parent->mt_next_pgno << 1)); parent->mt_next_pgno << 1));
if (MDBX_PNL_SIZE(parent->tw.spill_pages))
parent->mt_flags |= MDBX_TXN_SPILLS;
}
/* Append our loose page list to parent's */ /* Append our loose page list to parent's */
if (txn->tw.loose_pages) { if (txn->tw.loose_pages) {
@ -6785,8 +6790,11 @@ int mdbx_txn_commit(MDBX_txn *txn) {
end_mode |= MDBX_END_EOTDONE; end_mode |= MDBX_END_EOTDONE;
if (txn->tw.dirtylist->length == 0 && if (txn->tw.dirtylist->length == 0 &&
(txn->mt_flags & (MDBX_TXN_DIRTY | MDBX_TXN_SPILLS)) == 0) (txn->mt_flags & (MDBX_TXN_DIRTY | MDBX_TXN_SPILLS)) == 0) {
for (int i = txn->mt_numdbs; --i >= 0;)
mdbx_tassert(txn, (txn->mt_dbflags[i] & DB_DIRTY) == 0);
goto done; goto done;
}
mdbx_debug("committing txn %" PRIaTXN " %p on mdbenv %p, root page %" PRIaPGNO mdbx_debug("committing txn %" PRIaTXN " %p on mdbenv %p, root page %" PRIaPGNO
"/%" PRIaPGNO, "/%" PRIaPGNO,