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

mdbx: исправление assert-проверки при попытке создания таблицы с другими флагами/опциями.

Browse Source 
Сообщение о проблеме https://t.me/libmdbx/6101
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2024-08-22 00:00:29 +03:00
parent 2b5d7ed29a
commit b4dcf148c5
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/dbi.c
View File

@ -279,12 +279,14 @@ int dbi_bind(MDBX_txn *txn, const size_t dbi, unsigned user_flags,
} else if ((user_flags & MDBX_CREATE) == 0) } else if ((user_flags & MDBX_CREATE) == 0)
return /* FIXME: return extended info */ MDBX_INCOMPATIBLE; return /* FIXME: return extended info */ MDBX_INCOMPATIBLE;
else { else {
eASSERT(env, env->dbs_flags[dbi] & DB_VALID);
if (txn->dbi_state[dbi] & DBI_STALE) { if (txn->dbi_state[dbi] & DBI_STALE) {
eASSERT(env, env->dbs_flags[dbi] & DB_VALID);
int err = tbl_fetch(txn, dbi); int err = tbl_fetch(txn, dbi);
if (unlikely(err == MDBX_SUCCESS)) if (unlikely(err == MDBX_SUCCESS))
return err; return err;
} }
eASSERT(env, ((env->dbs_flags[dbi] ^ txn->dbs[dbi].flags) &
DB_PERSISTENT_FLAGS) == 0);
eASSERT(env, eASSERT(env,
(txn->dbi_state[dbi] & (DBI_LINDO | DBI_VALID | DBI_STALE)) == (txn->dbi_state[dbi] & (DBI_LINDO | DBI_VALID | DBI_STALE)) ==
(DBI_LINDO | DBI_VALID)); (DBI_LINDO | DBI_VALID));
@ -295,7 +297,7 @@ int dbi_bind(MDBX_txn *txn, const size_t dbi, unsigned user_flags,
if (unlikely(txn->cursors[dbi])) if (unlikely(txn->cursors[dbi]))
return MDBX_DANGLING_DBI; return MDBX_DANGLING_DBI;
env->dbs_flags[dbi] = DB_POISON; env->dbs_flags[dbi] = DB_POISON;
atomic_store32(&env->dbi_seqs[dbi], dbi_seq_next(env, MAIN_DBI), atomic_store32(&env->dbi_seqs[dbi], dbi_seq_next(env, dbi),
mo_AcquireRelease); mo_AcquireRelease);
const uint32_t seq = dbi_seq_next(env, dbi); const uint32_t seq = dbi_seq_next(env, dbi);