mdbx: rework backlog for freeDB deletion.

Change-Id: Ib535233313e8ddd21c35df46c03e5e298f3587e6
This commit is contained in:
Leo Yuriev 2016-04-19 16:27:02 +03:00
parent 90aa4b154a
commit ae324984cb

25
mdb.c
View File

@ -3282,31 +3282,16 @@ mdb_backlog_size(MDB_txn *txn)
static int static int
mdb_prep_backlog(MDB_txn *txn, MDB_cursor *mc) mdb_prep_backlog(MDB_txn *txn, MDB_cursor *mc)
{ {
/* LY: Critical level (1) for copy a one leaf-page. if (mdb_backlog_size(txn) <= mc->mc_db->md_depth) {
* But also (+2) for split leaf-page into a couple with creation
* one branch-page (for ability of insertion and my paranoia). */
int minimal_level = 3;
/* LY: Safe level for update branch-pages from root */
int safe_level = minimal_level + 8;
if (mdb_backlog_size(txn) < safe_level) {
/* Make sure "hot" pages of freeDB is touched and on freelist */
int rc = mdb_cursor_touch(mc); int rc = mdb_cursor_touch(mc);
if (unlikely(rc)) if (unlikely(rc))
return rc; return rc;
while (mdb_backlog_size(txn) < minimal_level) { /* LY: one more page is required if a b-tree needs rebalancing */
MDB_page *mp = NULL; if (unlikely(mdb_backlog_size(txn) < 1)) {
rc = mdb_page_alloc(mc, 1, &mp, MDB_ALLOC_GC | MDB_ALLOC_NEW); rc = mdb_page_alloc(mc, 1, NULL, MDB_ALLOC_GC);
if (unlikely(rc)) if (unlikely(rc && rc != MDB_NOTFOUND))
return rc; return rc;
if (mp) {
NEXT_LOOSE_PAGE(mp) = txn->mt_loose_pgs;
txn->mt_loose_pgs = mp;
txn->mt_loose_count++;
mp->mp_flags |= P_LOOSE;
}
} }
} }