ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-04-27 19:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: rework/speedup filtering of dirty-list from loose-pages inside mdbx_update_gc().

Browse Source 
Change-Id: Icf4101fa77314ab79be90ee429cf2df639686d7e
This commit is contained in:
Leonid Yuriev 2018-08-25 21:12:30 +03:00 committed by Leo Yuriev
parent 8abff4773f
commit f373a0ca84
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bits.h
View File

@ -504,7 +504,7 @@ typedef txnid_t *MDBX_TXL;
typedef union MDBX_ID2 { typedef union MDBX_ID2 {
struct { struct {
pgno_t pgno; pgno_t pgno;
MDBX_page *ptr; void *ptr;
}; };
unsigned limit, length; unsigned limit, length;
} MDBX_ID2; } MDBX_ID2;

30
src/mdbx.c
View File

@ -3662,19 +3662,22 @@ retry:
mdbx_pnl_xmerge(env->me_reclaimed_pglist, loose); mdbx_pnl_xmerge(env->me_reclaimed_pglist, loose);
} }
// filter-out list of dirty-pages from loose-pages
MDBX_ID2L dl = txn->mt_rw_dirtylist; MDBX_ID2L dl = txn->mt_rw_dirtylist;
mdbx_mid2l_sort(dl); mdbx_mid2l_sort(dl);
unsigned left = dl->length;
for (MDBX_page *mp = txn->mt_loose_pages; mp;) { for (MDBX_page *mp = txn->mt_loose_pages; mp;) {
mdbx_tassert(txn, mp->mp_pgno < txn->mt_next_pgno); mdbx_tassert(txn, mp->mp_pgno < txn->mt_next_pgno);
mdbx_ensure(env, mp->mp_pgno >= NUM_METAS); mdbx_ensure(env, mp->mp_pgno >= NUM_METAS);
unsigned s, d; if (left > 0) {
for (s = d = 0; ++s <= dl[0].length;) const unsigned i = mdbx_mid2l_search(dl, mp->mp_pgno);
if (dl[s].pgno != mp->mp_pgno) if (i <= dl->length && dl[i].pgno == mp->mp_pgno) {
dl[++d] = dl[s]; mdbx_tassert(txn, i > 0 && dl[i].ptr != dl);
dl[i].ptr = dl /* mark for deletion */;
dl[0].length -= 1; }
mdbx_tassert(txn, dl[0].length == d); left -= 1;
}
MDBX_page *dp = mp; MDBX_page *dp = mp;
mp = NEXT_LOOSE_PAGE(mp); mp = NEXT_LOOSE_PAGE(mp);
@ -3682,6 +3685,19 @@ retry:
mdbx_dpage_free(env, dp); mdbx_dpage_free(env, dp);
} }
if (left > 0) {
MDBX_ID2L r, w, end = dl + dl->length;
for (r = w = dl + 1; r <= end; r++) {
if (r->ptr != dl) {
if (r != w)
*w = *r;
++w;
}
}
mdbx_tassert(txn, w - dl == (int)left + 1);
}
dl->length = left;
txn->mt_loose_pages = NULL; txn->mt_loose_pages = NULL;
txn->mt_loose_count = 0; txn->mt_loose_count = 0;
} }