upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-05-28 04:35:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8174 LMDB: fixes for mdb_drop(MAIN_DBI)

Browse source
This commit is contained in:
Howard Chu 2026-04-22 13:24:29 +01:00
parent 0734803dba
commit d0fcfd3d02
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/liblmdb/lmdb.h
View file

@ -528,6 +528,8 @@ typedef enum MDB_cursor_op {
#define MDB_TXN_PENDING (-30775)
/** Environment can't rollback the last transaction */
#define MDB_CANT_ROLLBACK (-30774)
/** Can't drop main DBI while other DBIs are open */
#define MDB_DBIS_BUSY (-30773)
/** The last defined error code */
#define MDB_LAST_ERRCODE MDB_CANT_ROLLBACK
/** @} */

30
libraries/liblmdb/mdb.c
View file

@ -1524,8 +1524,9 @@ struct MDB_txn {
#define MDB_TXN_HAS_CHILD 0x10 /**< txn has an #MDB_txn.%mt_child */
#define MDB_TXN_DIRTYNUM 0x20 /**< dirty list uses nump list */
#define MDB_TXN_PREPARE 0x40 /**< prepare txn, don't fully commit */
#define MDB_TXN_DROPPED 0x80 /**< main DBI has been dropped, env will reset */
/** most operations on the txn are currently illegal */
#define MDB_TXN_BLOCKED (MDB_TXN_FINISHED|MDB_TXN_ERROR|MDB_TXN_HAS_CHILD|MDB_TXN_PREPARE)
#define MDB_TXN_BLOCKED (MDB_TXN_FINISHED|MDB_TXN_ERROR|MDB_TXN_HAS_CHILD|MDB_TXN_PREPARE|MDB_TXN_DROPPED)
/** @} */
unsigned int mt_flags; /**< @ref mdb_txn */
/** #dirty_list room: Array size - \#dirty pages visible to this txn.
@ -1914,6 +1915,7 @@ static char *const mdb_errstr[] = {
"MDB_ENV_ENCRYPTION: Environment encryption mismatch",
"MDB_TXN_PENDING: Transaction already prepared, must abort or commit",
"MDB_CANT_ROLLBACK: Environment can't rollback last transaction",
"MDB_DBIS_BUSY: Can't drop main DBI while other DBIs are open",
};
char *
@ -12232,11 +12234,35 @@ int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del)
if (TXN_DBI_CHANGED(txn, dbi))
return MDB_BAD_DBI;
MDB_TRACE(("%u, %d", dbi, del));
/* Dropping the main DBI empties/resets the entire environment.
* Can't do it if any other DBIs are still open. Can only commit
* or abort after this.
*/
if (dbi == MAIN_DBI) {
MDB_dbi i;
for (i = CORE_DBS; i<txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_VALID)
return MDB_DBIS_BUSY;
}
for (i = 0; i<CORE_DBS; i++) {
txn->mt_dbflags[i] |= DB_DIRTY;
txn->mt_dbs[i].md_depth = 0;
txn->mt_dbs[i].md_branch_pages = 0;
txn->mt_dbs[i].md_leaf_pages = 0;
txn->mt_dbs[i].md_overflow_pages = 0;
txn->mt_dbs[i].md_entries = 0;
txn->mt_dbs[i].md_root = P_INVALID;
}
txn->mt_flags |= MDB_TXN_DIRTY|MDB_TXN_DROPPED;
return MDB_SUCCESS;
}
rc = mdb_cursor_open(txn, dbi, &mc);
if (rc)
return rc;
MDB_TRACE(("%u, %d", dbi, del));
rc = mdb_drop0(mc, mc->mc_db->md_flags & MDB_DUPSORT);
/* Invalidate the dropped DB's cursors */
for (m2 = txn->mt_cursors[dbi]; m2; m2 = m2->mc_next)