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

mdbx: fix mdbx_ovpage_free().

Browse Source 
Change-Id: I453921b356f412fad59efd6ce31ddb75f0d84358
This commit is contained in:
Leonid Yuriev 2018-09-03 21:26:16 +03:00 committed by Leo Yuriev
parent f1bb2f1ec2
commit 94b1553637
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

@ -6952,6 +6952,7 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
mdbx_cassert(mc, (mc->mc_flags & C_GCFREEZE) == 0); mdbx_cassert(mc, (mc->mc_flags & C_GCFREEZE) == 0);
mdbx_cassert(mc, (mp->mp_flags & P_OVERFLOW) != 0); mdbx_cassert(mc, (mp->mp_flags & P_OVERFLOW) != 0);
mdbx_debug("free ov page %" PRIaPGNO " (%u)", pg, ovpages); mdbx_debug("free ov page %" PRIaPGNO " (%u)", pg, ovpages);
/* If the page is dirty or on the spill list we just acquired it, /* If the page is dirty or on the spill list we just acquired it,
* so we should give it back to our current free list, if any. * so we should give it back to our current free list, if any.
* Otherwise put it onto the list of pages we freed in this txn. * Otherwise put it onto the list of pages we freed in this txn.
@ -6970,6 +6971,7 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
rc = mdbx_pnl_need(&env->me_reclaimed_pglist, ovpages); rc = mdbx_pnl_need(&env->me_reclaimed_pglist, ovpages);
if (unlikely(rc)) if (unlikely(rc))
return rc; return rc;
if (!(mp->mp_flags & P_DIRTY)) { if (!(mp->mp_flags & P_DIRTY)) {
/* This page is no longer spilled */ /* This page is no longer spilled */
if (x == MDBX_PNL_SIZE(sl)) if (x == MDBX_PNL_SIZE(sl))
@ -7003,11 +7005,14 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
/* Insert in me_reclaimed_pglist */ /* Insert in me_reclaimed_pglist */
mop = env->me_reclaimed_pglist; mop = env->me_reclaimed_pglist;
j = MDBX_PNL_SIZE(mop) + ovpages; j = MDBX_PNL_SIZE(mop) + ovpages;
for (i = MDBX_PNL_SIZE(mop); i && mop[i] < pg; i--) for (i = MDBX_PNL_SIZE(mop); i && MDBX_PNL_DISORDERED(mop[i], pg);)
mop[j--] = mop[i]; mop[j--] = mop[i--];
while (j > i)
mop[j--] = pg++;
MDBX_PNL_SIZE(mop) += ovpages; MDBX_PNL_SIZE(mop) += ovpages;
pgno_t n = MDBX_PNL_ASCENDING ? pg + ovpages : pg;
while (j > i)
mop[j--] = MDBX_PNL_ASCENDING ? --n : n++;
mdbx_tassert(txn, mdbx_pnl_check(env->me_reclaimed_pglist, true));
} else { } else {
rc = mdbx_pnl_append_range(&txn->mt_befree_pages, pg, ovpages); rc = mdbx_pnl_append_range(&txn->mt_befree_pages, pg, ovpages);
if (unlikely(rc)) if (unlikely(rc))