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

mdbx: don't export DBIs from nested txn.

Browse Source 
Change-Id: I8c354ac7f889debe2fcf830263cb060253887652
This commit is contained in:
Leonid Yuriev 2020-11-15 22:46:37 +03:00
parent 1c925a0f2e
commit 149b3d09e6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core.c
View File

@ -5903,6 +5903,7 @@ static int mdbx_cursor_shadow(MDBX_txn *parent, MDBX_txn *nested) {
* *
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
static void mdbx_cursors_eot(MDBX_txn *txn, const bool merge) { static void mdbx_cursors_eot(MDBX_txn *txn, const bool merge) {
mdbx_tassert(txn, (txn->mt_flags & MDBX_TXN_RDONLY) == 0);
for (int i = txn->mt_numdbs; --i >= 0;) { for (int i = txn->mt_numdbs; --i >= 0;) {
MDBX_cursor *next, *mc = txn->tw.cursors[i]; MDBX_cursor *next, *mc = txn->tw.cursors[i];
if (!mc) if (!mc)
@ -6818,6 +6819,7 @@ int mdbx_txn_flags(const MDBX_txn *txn) {
/* Export or close DBI handles opened in this txn. */ /* Export or close DBI handles opened in this txn. */
static void mdbx_dbis_update(MDBX_txn *txn, int keep) { static void mdbx_dbis_update(MDBX_txn *txn, int keep) {
mdbx_tassert(txn, !txn->mt_parent && txn == txn->mt_env->me_txn0);
MDBX_dbi n = txn->mt_numdbs; MDBX_dbi n = txn->mt_numdbs;
if (n) { if (n) {
bool locked = false; bool locked = false;
@ -6919,8 +6921,6 @@ static int mdbx_txn_end(MDBX_txn *txn, unsigned mode) {
if (txn == env->me_txn0) if (txn == env->me_txn0)
mdbx_txn_valgrind(env, nullptr); mdbx_txn_valgrind(env, nullptr);
#endif #endif
/* Export or close DBI handles created in this txn */
mdbx_dbis_update(txn, mode & MDBX_END_UPDATE);
if (!(mode & MDBX_END_EOTDONE)) /* !(already closed cursors) */ if (!(mode & MDBX_END_EOTDONE)) /* !(already closed cursors) */
mdbx_cursors_eot(txn, false); mdbx_cursors_eot(txn, false);
if (!(env->me_flags & MDBX_WRITEMAP)) if (!(env->me_flags & MDBX_WRITEMAP))
@ -6931,6 +6931,8 @@ static int mdbx_txn_end(MDBX_txn *txn, unsigned mode) {
env->me_txn = txn->mt_parent; env->me_txn = txn->mt_parent;
if (txn == env->me_txn0) { if (txn == env->me_txn0) {
mdbx_assert(env, txn->mt_parent == NULL); mdbx_assert(env, txn->mt_parent == NULL);
/* Export or close DBI handles created in this txn */
mdbx_dbis_update(txn, mode & MDBX_END_UPDATE);
mdbx_pnl_shrink(&txn->tw.retired_pages); mdbx_pnl_shrink(&txn->tw.retired_pages);
mdbx_pnl_shrink(&txn->tw.reclaimed_pglist); mdbx_pnl_shrink(&txn->tw.reclaimed_pglist);
/* The writer mutex was locked in mdbx_txn_begin. */ /* The writer mutex was locked in mdbx_txn_begin. */