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

mdbx: don't hold dbi-lock during tree deletion inside mdbx_drop().

Browse Source 
Change-Id: I29824271ba09a4443196bc1207279a257a8e26c0
This commit is contained in:
Leonid Yuriev 2019-10-18 23:16:12 +03:00
parent b690415f44
commit 4e386be914
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/elements/core.c
View File

@ -14350,13 +14350,6 @@ int mdbx_drop(MDBX_txn *txn, MDBX_dbi dbi, int del) {
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
MDBX_env *env = txn->mt_env;
rc = mdbx_fastmutex_acquire(&env->me_dbi_lock);
if (unlikely(rc != MDBX_SUCCESS)) {
mdbx_cursor_close(mc);
return rc;
}
if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) { if (unlikely(!TXN_DBI_EXIST(txn, dbi, DB_USRVALID))) {
rc = MDBX_EINVAL; rc = MDBX_EINVAL;
goto bailout; goto bailout;
@ -14377,9 +14370,17 @@ int mdbx_drop(MDBX_txn *txn, MDBX_dbi dbi, int del) {
/* Can't delete the main DB */ /* Can't delete the main DB */
if (del && dbi >= CORE_DBS) { if (del && dbi >= CORE_DBS) {
rc = mdbx_del0(txn, MAIN_DBI, &mc->mc_dbx->md_name, NULL, F_SUBDATA); rc = mdbx_del0(txn, MAIN_DBI, &mc->mc_dbx->md_name, NULL, F_SUBDATA);
if (likely(!rc)) { if (likely(rc == MDBX_SUCCESS)) {
txn->mt_dbflags[dbi] = DB_STALE; txn->mt_dbflags[dbi] = DB_STALE;
MDBX_env *env = txn->mt_env;
rc = mdbx_fastmutex_acquire(&env->me_dbi_lock);
if (unlikely(rc != MDBX_SUCCESS)) {
txn->mt_flags |= MDBX_TXN_ERROR;
goto bailout;
}
mdbx_dbi_close_locked(env, dbi); mdbx_dbi_close_locked(env, dbi);
mdbx_ensure(env,
mdbx_fastmutex_release(&env->me_dbi_lock) == MDBX_SUCCESS);
} else { } else {
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
} }
@ -14398,7 +14399,6 @@ int mdbx_drop(MDBX_txn *txn, MDBX_dbi dbi, int del) {
bailout: bailout:
mdbx_cursor_close(mc); mdbx_cursor_close(mc);
mdbx_ensure(env, mdbx_fastmutex_release(&env->me_dbi_lock) == MDBX_SUCCESS);
return rc; return rc;
} }