ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-03-13 20:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: исправление закрытия курсоров при завершении вложенных транзакций (backport).

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2024-05-25 14:16:28 +03:00
parent 75fd4ecf54
commit 07cfe65ea0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -8371,9 +8371,7 @@ static void cursors_eot(MDBX_txn *txn, const bool merge) {
MDBX_SUPPRESS_GOOFY_MSVC_ANALYZER(6001); MDBX_SUPPRESS_GOOFY_MSVC_ANALYZER(6001);
ENSURE(txn->mt_env, bk->mc_signature == MDBX_MC_LIVE); ENSURE(txn->mt_env, bk->mc_signature == MDBX_MC_LIVE);
tASSERT(txn, mx == bk->mc_xcursor); tASSERT(txn, mx == bk->mc_xcursor);
if (stage == MDBX_MC_WAIT4EOT /* Cursor was closed by user */) if (merge) {
mc->mc_signature = stage /* Promote closed state to parent txn */;
else if (merge) {
/* Restore pointers to parent txn */ /* Restore pointers to parent txn */
mc->mc_next = bk->mc_next; mc->mc_next = bk->mc_next;
mc->mc_backup = bk->mc_backup; mc->mc_backup = bk->mc_backup;
@ -8392,6 +8390,8 @@ static void cursors_eot(MDBX_txn *txn, const bool merge) {
} }
bk->mc_signature = 0; bk->mc_signature = 0;
osal_free(bk); osal_free(bk);
if (stage == MDBX_MC_WAIT4EOT /* Cursor was closed by user */)
mc->mc_signature = stage /* Promote closed state to parent txn */;
} else { } else {
ENSURE(txn->mt_env, stage == MDBX_MC_LIVE); ENSURE(txn->mt_env, stage == MDBX_MC_LIVE);
mc->mc_signature = MDBX_MC_READY4CLOSE /* Cursor may be reused */; mc->mc_signature = MDBX_MC_READY4CLOSE /* Cursor may be reused */;