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

mdbx: add C_GCFREEZE cursor's flag.

Browse Source 
Change-Id: I813a2c2ac30564d8943f0cf50a601b858dda0bd9
This commit is contained in:
Leo Yuriev 2018-08-26 11:04:45 +03:00
parent f373a0ca84
commit 8966a1773c
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bits.h
View File

@ -670,6 +670,7 @@ struct MDBX_cursor {
#define C_DEL 0x08 /* last op was a cursor_del */
#define C_UNTRACK 0x40 /* Un-track cursor when closing */
#define C_RECLAIMING 0x80 /* FreeDB lookup is prohibited */
#define C_GCFREEZE 0x100 /* me_reclaimed_pglist must not be updated */
unsigned mc_flags; /* see mdbx_cursor */
MDBX_page *mc_pg[CURSOR_STACK]; /* stack of pushed pages */
indx_t mc_ki[CURSOR_STACK]; /* stack of page indices */
@ -1274,3 +1275,6 @@ static __inline size_t pgno_align2os_bytes(const MDBX_env *env, pgno_t pgno) {
static __inline pgno_t pgno_align2os_pgno(const MDBX_env *env, pgno_t pgno) {
return bytes2pgno(env, pgno_align2os_bytes(env, pgno));
}
/* Do not spill pages to disk if txn is getting full, may fail instead */
#define MDBX_NOSPILL 0x8000

21
src/mdbx.c
View File

@ -2344,6 +2344,7 @@ static int mdbx_page_alloc(MDBX_cursor *mc, unsigned num, MDBX_page **mp,
}
/* Append PNL from FreeDB record to me_reclaimed_pglist */
mdbx_cassert(mc, (mc->mc_flags & C_GCFREEZE) == 0);
pgno_t *re_pnl = (pgno_t *)data.iov_base;
mdbx_tassert(txn, re_pnl[0] == 0 ||
data.iov_len == (re_pnl[0] + 1) * sizeof(pgno_t));
@ -2552,6 +2553,7 @@ done:
}
if (repg_pos) {
mdbx_cassert(mc, (mc->mc_flags & C_GCFREEZE) == 0);
mdbx_tassert(txn, pgno < txn->mt_next_pgno);
mdbx_tassert(txn, pgno == repg_list[repg_pos]);
/* Cutoff allocated pages from me_reclaimed_pglist */
@ -4000,9 +4002,10 @@ retry:
pgno_t save = end[0];
end[0] = (pgno_t)chunk;
mdbx_tassert(txn, mdbx_pnl_check(end, false));
mc.mc_flags |= C_RECLAIMING;
rc = mdbx_cursor_put(&mc, &key, &data, MDBX_CURRENT);
mc.mc_flags ^= C_RECLAIMING;
mc.mc_flags |= C_RECLAIMING | C_GCFREEZE;
rc = mdbx_cursor_put(&mc, &key, &data, MDBX_CURRENT | MDBX_NOSPILL);
mdbx_tassert(txn, end[0] == (pgno_t)chunk);
mc.mc_flags ^= C_RECLAIMING | C_GCFREEZE;
mdbx_tassert(txn, mdbx_pnl_check(end, false));
mdbx_tassert(
txn, cleaned_gc_slot ==
@ -6744,6 +6747,7 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
pgno_t pn = pg << 1;
int rc;
mdbx_cassert(mc, (mc->mc_flags & C_GCFREEZE) == 0);
mdbx_debug("free ov page %" PRIaPGNO " (%u)", pg, ovpages);
/* 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.
@ -7581,6 +7585,7 @@ static int mdbx_cursor_touch(MDBX_cursor *mc) {
if (mc->mc_dbi >= CORE_DBS &&
(*mc->mc_dbflag & (DB_DIRTY | DB_DUPDATA)) == 0) {
mdbx_cassert(mc, (mc->mc_flags & C_RECLAIMING) == 0);
/* Touch DB record of named DB */
MDBX_cursor mc2;
MDBX_xcursor mcx;
@ -7604,9 +7609,6 @@ static int mdbx_cursor_touch(MDBX_cursor *mc) {
return rc;
}
/* Do not spill pages to disk if txn is getting full, may fail instead */
#define MDBX_NOSPILL 0x8000
int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
unsigned flags) {
MDBX_env *env;
@ -7987,8 +7989,11 @@ int mdbx_cursor_put(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
ovpages = omp->mp_pages;
/* Is the ov page large enough? */
if (ovpages ==
/* LY: add configuragle theshold to keep reserve space */ dpages) {
if (unlikely(mc->mc_flags & C_GCFREEZE)
? ovpages >= dpages
: ovpages ==
/* LY: add configurable threshold to keep reserve space */
dpages) {
if (!(omp->mp_flags & P_DIRTY) &&
(level || (env->me_flags & MDBX_WRITEMAP))) {
rc = mdbx_page_unspill(mc->mc_txn, omp, &omp);