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

mdbx: fix accounting mdbx_drop0().

Browse Source
This commit is contained in:
Leo Yuriev 2018-08-30 18:45:09 +03:00
parent 5c06a4c917
commit 3a8d73b7ef
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mdbx.c
View File

@ -11322,9 +11322,7 @@ int mdbx_dbi_flags(MDBX_txn *txn, MDBX_dbi dbi, unsigned *flags) {
* [in] subs non-Zero to check for sub-DBs in this DB. * [in] subs non-Zero to check for sub-DBs in this DB.
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
static int mdbx_drop0(MDBX_cursor *mc, int subs) { static int mdbx_drop0(MDBX_cursor *mc, int subs) {
int rc; int rc = mdbx_page_search(mc, NULL, MDBX_PS_FIRST);
rc = mdbx_page_search(mc, NULL, MDBX_PS_FIRST);
if (likely(rc == MDBX_SUCCESS)) { if (likely(rc == MDBX_SUCCESS)) {
MDBX_txn *txn = mc->mc_txn; MDBX_txn *txn = mc->mc_txn;
MDBX_node *ni; MDBX_node *ni;
@ -11335,7 +11333,14 @@ static int mdbx_drop0(MDBX_cursor *mc, int subs) {
* This also avoids any P_LEAF2 pages, which have no nodes. * This also avoids any P_LEAF2 pages, which have no nodes.
* Also if the DB doesn't have sub-DBs and has no overflow * Also if the DB doesn't have sub-DBs and has no overflow
* pages, omit scanning leaves. */ * pages, omit scanning leaves. */
if ((mc->mc_flags & C_SUB) || (!subs && !mc->mc_db->md_overflow_pages))
if (mc->mc_flags & C_SUB) {
MDBX_db *outer = mdbx_outer_db(mc);
outer->md_branch_pages -= mc->mc_db->md_branch_pages;
outer->md_leaf_pages -= mc->mc_db->md_leaf_pages;
outer->md_overflow_pages -= mc->mc_db->md_overflow_pages;
mdbx_cursor_pop(mc);
} else if (!subs && !mc->mc_db->md_overflow_pages)
mdbx_cursor_pop(mc); mdbx_cursor_pop(mc);
mdbx_cursor_copy(mc, &mx); mdbx_cursor_copy(mc, &mx);