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

mdbx: logging MDBX_PROBLEM reasons.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-29 20:17:02 +03:00
parent 11e8727483
commit a36b065cd9
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mdbx.c
View File

@ -1037,6 +1037,9 @@ static int mdbx_page_loose(MDBX_cursor *mc, MDBX_page *mp) {
unsigned x = mdbx_mid2l_search(dl, pgno); unsigned x = mdbx_mid2l_search(dl, pgno);
if (x <= dl[0].mid && dl[x].mid == pgno) { if (x <= dl[0].mid && dl[x].mid == pgno) {
if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */ if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */
mdbx_error("wrong page 0x%p #%" PRIaPGNO
" in the dirtylist[%d], expecting %p",
dl[x].mptr, pgno, x, mp);
mc->mc_flags &= ~(C_INITIALIZED | C_EOF); mc->mc_flags &= ~(C_INITIALIZED | C_EOF);
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
return MDBX_PROBLEM; return MDBX_PROBLEM;
@ -1935,6 +1938,9 @@ static int mdbx_page_touch(MDBX_cursor *mc) {
unsigned x = mdbx_mid2l_search(dl, pgno); unsigned x = mdbx_mid2l_search(dl, pgno);
if (x <= dl[0].mid && dl[x].mid == pgno) { if (x <= dl[0].mid && dl[x].mid == pgno) {
if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */ if (unlikely(mp != dl[x].mptr)) { /* bad cursor? */
mdbx_error("wrong page 0x%p #%" PRIaPGNO
" in the dirtylist[%d], expecting %p",
dl[x].mptr, pgno, x, mp);
mc->mc_flags &= ~(C_INITIALIZED | C_EOF); mc->mc_flags &= ~(C_INITIALIZED | C_EOF);
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
return MDBX_PROBLEM; return MDBX_PROBLEM;
@ -5082,6 +5088,8 @@ static int mdbx_ovpage_free(MDBX_cursor *mc, MDBX_page *mp) {
dl[x] = ix; dl[x] = ix;
} else { } else {
mdbx_cassert(mc, x > 1); mdbx_cassert(mc, x > 1);
mdbx_error("not found page 0x%p #%" PRIaPGNO " in the dirtylist", mp,
mp->mp_pgno);
j = ++(dl[0].mid); j = ++(dl[0].mid);
dl[j] = ix; /* Unsorted. OK when MDBX_TXN_ERROR. */ dl[j] = ix; /* Unsorted. OK when MDBX_TXN_ERROR. */
txn->mt_flags |= MDBX_TXN_ERROR; txn->mt_flags |= MDBX_TXN_ERROR;
@ -6448,6 +6456,7 @@ new_sub:
return rc; return rc;
bad_sub: bad_sub:
if (unlikely(rc == MDBX_KEYEXIST)) if (unlikely(rc == MDBX_KEYEXIST))
mdbx_error("unexpected %s", "MDBX_KEYEXIST");
/* should not happen, we deleted that item */ /* should not happen, we deleted that item */
rc = MDBX_PROBLEM; rc = MDBX_PROBLEM;
} }
@ -8237,8 +8246,10 @@ static int mdbx_page_split(MDBX_cursor *mc, MDBX_val *newkey, MDBX_val *newdata,
mn.mc_top++; mn.mc_top++;
} }
if (unlikely(rc != MDBX_SUCCESS)) { if (unlikely(rc != MDBX_SUCCESS)) {
if (rc == MDBX_NOTFOUND) /* improper mdbx_cursor_sibling() result */ if (rc == MDBX_NOTFOUND) /* improper mdbx_cursor_sibling() result */ {
mdbx_error("unexpected %s", "MDBX_NOTFOUND");
rc = MDBX_PROBLEM; rc = MDBX_PROBLEM;
}
goto done; goto done;
} }
if (nflags & MDBX_APPEND) { if (nflags & MDBX_APPEND) {
@ -8759,8 +8770,10 @@ static int __cold mdbx_env_compact(MDBX_env *env, mdbx_filehandle_t fd) {
my.mc_wlen[0] = env->me_psize * NUM_METAS; my.mc_wlen[0] = env->me_psize * NUM_METAS;
my.mc_txn = txn; my.mc_txn = txn;
rc = mdbx_env_cwalk(&my, &root, 0); rc = mdbx_env_cwalk(&my, &root, 0);
if (rc == MDBX_SUCCESS && root != new_root) if (rc == MDBX_SUCCESS && root != new_root) {
mdbx_error("unexpected root %" PRIaPGNO " (%" PRIaPGNO ")", root, new_root);
rc = MDBX_PROBLEM; /* page leak or corrupt DB */ rc = MDBX_PROBLEM; /* page leak or corrupt DB */
}
finish: finish:
if (rc != MDBX_SUCCESS) if (rc != MDBX_SUCCESS)