mdbx: minor refine mdbx_page_retire().

Change-Id: I29d20ed47f56e17dde8c9417bfa1ec95302c1966
This commit is contained in:
Leonid Yuriev 2020-12-20 01:05:45 +03:00
parent cea29fe485
commit 21fbc36311

View File

@ -4186,7 +4186,7 @@ static int mdbx_page_retire(MDBX_cursor *mc, MDBX_page *mp) {
if (txn->tw.spill_pages) { if (txn->tw.spill_pages) {
const unsigned i = mdbx_pnl_exist(txn->tw.spill_pages, pgno << 1); const unsigned i = mdbx_pnl_exist(txn->tw.spill_pages, pgno << 1);
if (i) { if (unlikely(i)) {
/* This page is no longer spilled */ /* This page is no longer spilled */
#if MDBX_PNL_ASCENDING #if MDBX_PNL_ASCENDING
mdbx_tassert(txn, i == MDBX_PNL_SIZE(txn->tw.spill_pages) || mdbx_tassert(txn, i == MDBX_PNL_SIZE(txn->tw.spill_pages) ||
@ -4195,9 +4195,10 @@ static int mdbx_page_retire(MDBX_cursor *mc, MDBX_page *mp) {
mdbx_tassert(txn, i == 1 || txn->tw.spill_pages[i - 1] >= (pgno + npages) mdbx_tassert(txn, i == 1 || txn->tw.spill_pages[i - 1] >= (pgno + npages)
<< 1); << 1);
#endif #endif
txn->tw.spill_pages[i] |= 1;
if (i == MDBX_PNL_SIZE(txn->tw.spill_pages)) if (i == MDBX_PNL_SIZE(txn->tw.spill_pages))
MDBX_PNL_SIZE(txn->tw.spill_pages) -= 1; MDBX_PNL_SIZE(txn->tw.spill_pages) -= 1;
else
txn->tw.spill_pages[i] |= 1;
int rc = mdbx_page_loose(txn, mp); int rc = mdbx_page_loose(txn, mp);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
mc->mc_flags &= ~(C_INITIALIZED | C_EOF); mc->mc_flags &= ~(C_INITIALIZED | C_EOF);