ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 23:39:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: minor refine page_check().

Browse Source 
Change-Id: I91cae256c47064422d26663078c8c5a6f619a197
This commit is contained in:
Leonid Yuriev 2021-03-27 21:59:17 +03:00
parent 19575e799f
commit 636c212235
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core.c
View File

@ -16545,6 +16545,7 @@ retry:
static __cold int mdbx_page_check(MDBX_cursor *const mc, static __cold int mdbx_page_check(MDBX_cursor *const mc,
const MDBX_page *const mp, unsigned options) { const MDBX_page *const mp, unsigned options) {
DKBUF;
options |= mc->mc_flags & (C_COPYING | C_UPDATING | C_RETIRING | C_SKIPORD); options |= mc->mc_flags & (C_COPYING | C_UPDATING | C_RETIRING | C_SKIPORD);
MDBX_env *const env = mc->mc_txn->mt_env; MDBX_env *const env = mc->mc_txn->mt_env;
const unsigned nkeys = page_numkeys(mp); const unsigned nkeys = page_numkeys(mp);
@ -16590,8 +16591,9 @@ static __cold int mdbx_page_check(MDBX_cursor *const mc,
if ((options & C_SKIPORD) == 0) { if ((options & C_SKIPORD) == 0) {
here.iov_len = ksize; here.iov_len = ksize;
here.iov_base = key; here.iov_base = key;
if (prev.iov_base && unlikely(mc->mc_dbx->md_cmp(&here, &prev) <= 0)) if (prev.iov_base && unlikely(mc->mc_dbx->md_cmp(&prev, &here) >= 0))
rc = bad_page(mp, "leaf2-key #%u wrong order\n", i); rc = bad_page(mp, "leaf2-key #%u wrong order (%s >= %s)\n", i,
DKEY(&prev), DVAL(&here));
prev = here; prev = here;
} }
} }
@ -16619,8 +16621,9 @@ static __cold int mdbx_page_check(MDBX_cursor *const mc,
if ((options & C_SKIPORD) == 0) { if ((options & C_SKIPORD) == 0) {
here.iov_base = key; here.iov_base = key;
here.iov_len = ksize; here.iov_len = ksize;
if (prev.iov_base && unlikely(mc->mc_dbx->md_cmp(&here, &prev) <= 0)) if (prev.iov_base && unlikely(mc->mc_dbx->md_cmp(&prev, &here) >= 0))
rc = bad_page(mp, "node[%u] key wrong order\n", i); rc = bad_page(mp, "node[%u] key wrong order (%s >= %s)\n", i,
DKEY(&prev), DVAL(&here));
prev = here; prev = here;
} }
} }
@ -16763,7 +16766,9 @@ static __cold int mdbx_page_check(MDBX_cursor *const mc,
sub_here.iov_base = sub_key; sub_here.iov_base = sub_key;
if (sub_prev.iov_base && if (sub_prev.iov_base &&
unlikely(mc->mc_dbx->md_dcmp(&sub_prev, &sub_here) >= 0)) unlikely(mc->mc_dbx->md_dcmp(&sub_prev, &sub_here) >= 0))
rc = bad_page(mp, "nested-leaf2-key #%u wrong order\n", j); rc = bad_page(
mp, "nested-leaf2-key #%u wrong order (%s >= %s)\n", j,
DKEY(&sub_prev), DVAL(&sub_here));
sub_prev = sub_here; sub_prev = sub_here;
} }
} }
@ -16798,7 +16803,9 @@ static __cold int mdbx_page_check(MDBX_cursor *const mc,
sub_here.iov_base = sub_key; sub_here.iov_base = sub_key;
if (sub_prev.iov_base && if (sub_prev.iov_base &&
unlikely(mc->mc_dbx->md_dcmp(&sub_prev, &sub_here) >= 0)) unlikely(mc->mc_dbx->md_dcmp(&sub_prev, &sub_here) >= 0))
rc = bad_page(mp, "nested-node-key #%u wrong order\n", j); rc = bad_page(
mp, "nested-node-key #%u wrong order (%s >= %s)\n", j,
DKEY(&sub_prev), DVAL(&sub_here));
sub_prev = sub_here; sub_prev = sub_here;
} }
} }