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

mdbx: report the parent-pgno in an issues during a DB check.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2025-07-28 13:59:24 +03:00
parent 5c6d91f7c8
commit ecc36a11ec
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/chk.c
View File

@ -691,7 +691,6 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
MDBX_chk_internal_t *const chk = scope->internal; MDBX_chk_internal_t *const chk = scope->internal;
MDBX_chk_context_t *const usr = chk->usr; MDBX_chk_context_t *const usr = chk->usr;
MDBX_env *const env = usr->env; MDBX_env *const env = usr->env;
(void)parent_pgno;
MDBX_chk_table_t *tbl; MDBX_chk_table_t *tbl;
int err = chk_get_tbl(scope, tbl_info, &tbl); int err = chk_get_tbl(scope, tbl_info, &tbl);
@ -699,7 +698,7 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
return err; return err;
if (deep > 42) { if (deep > 42) {
chk_scope_issue(scope, "too deeply %u", deep); chk_scope_issue(scope, "too deeply %u, page %zu, parent %zu", deep, pgno, parent_pgno);
return MDBX_CORRUPTED /* avoid infinite loop/recursion */; return MDBX_CORRUPTED /* avoid infinite loop/recursion */;
} }
histogram_acc(deep, &tbl->histogram.deep); histogram_acc(deep, &tbl->histogram.deep);
@ -725,7 +724,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
bool branch = false; bool branch = false;
switch (pagetype) { switch (pagetype) {
default: default:
chk_object_issue(scope, "page", pgno, "unknown page-type", "type %u, deep %i", (unsigned)pagetype, deep); chk_object_issue(scope, "page", pgno, "unknown page-type", "type %u, deep %i, parent %zu", (unsigned)pagetype, deep,
parent_pgno);
pagetype_caption = "unknown"; pagetype_caption = "unknown";
tbl->pages.other += npages; tbl->pages.other += npages;
break; break;
@ -743,8 +743,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
pagetype_caption = "large"; pagetype_caption = "large";
histogram_acc(npages, &tbl->histogram.large_pages); histogram_acc(npages, &tbl->histogram.large_pages);
if (tbl->flags & MDBX_DUPSORT) if (tbl->flags & MDBX_DUPSORT)
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i", (unsigned)pagetype, chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
chk_v2a(chk, &tbl->name), tbl->flags, deep); (unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
break; break;
case page_branch: case page_branch:
branch = true; branch = true;
@ -758,8 +758,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
break; break;
case page_dupfix_leaf: case page_dupfix_leaf:
if (!nested) if (!nested)
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i", (unsigned)pagetype, chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
chk_v2a(chk, &tbl->name), tbl->flags, deep); (unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
/* fall through */ /* fall through */
__fallthrough; __fallthrough;
case page_leaf: case page_leaf:
@ -767,8 +767,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
pagetype_caption = "leaf"; pagetype_caption = "leaf";
tbl->pages.leaf += 1; tbl->pages.leaf += 1;
if (height != tbl_info->internal->height) if (height != tbl_info->internal->height)
chk_object_issue(scope, "page", pgno, "wrong tree height", "actual %i != %i table %s", height, chk_object_issue(scope, "page", pgno, "wrong tree height", "actual %i != %i table %s, parent %zu", height,
tbl_info->internal->height, chk_v2a(chk, &tbl->name)); tbl_info->internal->height, chk_v2a(chk, &tbl->name), parent_pgno);
} else { } else {
pagetype_caption = (pagetype == page_leaf) ? "nested-leaf" : "nested-leaf-dupfix"; pagetype_caption = (pagetype == page_leaf) ? "nested-leaf" : "nested-leaf-dupfix";
tbl->pages.nested_leaf += 1; tbl->pages.nested_leaf += 1;
@ -777,8 +777,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
chk->last_nested = nested; chk->last_nested = nested;
} }
if (height != nested->height) if (height != nested->height)
chk_object_issue(scope, "page", pgno, "wrong nested-tree height", "actual %i != %i dupsort-node %s", height, chk_object_issue(scope, "page", pgno, "wrong nested-tree height", "actual %i != %i dupsort-node %s, parent %zu",
nested->height, chk_v2a(chk, &tbl->name)); height, nested->height, chk_v2a(chk, &tbl->name), parent_pgno);
} }
break; break;
case page_sub_dupfix_leaf: case page_sub_dupfix_leaf:
@ -786,8 +786,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
pagetype_caption = (pagetype == page_sub_leaf) ? "subleaf-dupsort" : "subleaf-dupfix"; pagetype_caption = (pagetype == page_sub_leaf) ? "subleaf-dupsort" : "subleaf-dupfix";
tbl->pages.nested_subleaf += 1; tbl->pages.nested_subleaf += 1;
if ((tbl->flags & MDBX_DUPSORT) == 0 || nested) if ((tbl->flags & MDBX_DUPSORT) == 0 || nested)
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i", (unsigned)pagetype, chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
chk_v2a(chk, &tbl->name), tbl->flags, deep); (unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
break; break;
} }
@ -814,7 +814,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
} else if (chk->pagemap[spanpgno]) { } else if (chk->pagemap[spanpgno]) {
const MDBX_chk_table_t *const rival = chk->table[chk->pagemap[spanpgno] - 1]; const MDBX_chk_table_t *const rival = chk->table[chk->pagemap[spanpgno] - 1];
chk_object_issue(scope, "page", spanpgno, (branch && rival == tbl) ? "loop" : "already used", chk_object_issue(scope, "page", spanpgno, (branch && rival == tbl) ? "loop" : "already used",
"%s-page: by %s, deep %i", pagetype_caption, chk_v2a(chk, &rival->name), deep); "%s-page: by %s, deep %i, parent %zu", pagetype_caption, chk_v2a(chk, &rival->name), deep,
parent_pgno);
already_used = true; already_used = true;
} else { } else {
chk->pagemap[spanpgno] = (int16_t)tbl->id + 1; chk->pagemap[spanpgno] = (int16_t)tbl->id + 1;
@ -828,21 +829,21 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
} }
if (MDBX_IS_ERROR(page_err)) { if (MDBX_IS_ERROR(page_err)) {
chk_object_issue(scope, "page", pgno, "invalid/corrupted", "%s-page", pagetype_caption); chk_object_issue(scope, "page", pgno, "invalid/corrupted", "%s-page, parent %zu", pagetype_caption, parent_pgno);
} else { } else {
if (unused_bytes > page_size) if (unused_bytes > page_size)
chk_object_issue(scope, "page", pgno, "illegal unused-bytes", "%s-page: %u < %" PRIuSIZE " < %u", chk_object_issue(scope, "page", pgno, "illegal unused-bytes", "%s-page: %u < %" PRIuSIZE " < %u, parent %zu",
pagetype_caption, 0, unused_bytes, env->ps); pagetype_caption, 0, unused_bytes, env->ps, parent_pgno);
if (header_bytes < (int)sizeof(long) || (size_t)header_bytes >= env->ps - sizeof(long)) { if (header_bytes < (int)sizeof(long) || (size_t)header_bytes >= env->ps - sizeof(long)) {
chk_object_issue(scope, "page", pgno, "illegal header-length", chk_object_issue(scope, "page", pgno, "illegal header-length",
"%s-page: %" PRIuSIZE " < %" PRIuSIZE " < %" PRIuSIZE, pagetype_caption, sizeof(long), "%s-page: %" PRIuSIZE " < %" PRIuSIZE " < %" PRIuSIZE ", parent %zu", pagetype_caption,
header_bytes, env->ps - sizeof(long)); sizeof(long), header_bytes, env->ps - sizeof(long), parent_pgno);
} }
if (nentries < 1 || (pagetype == page_branch && nentries < 2)) { if (nentries < 1 || (pagetype == page_branch && nentries < 2)) {
chk_object_issue(scope, "page", pgno, nentries ? "half-empty" : "empty", chk_object_issue(scope, "page", pgno, nentries ? "half-empty" : "empty",
"%s-page: payload %" PRIuSIZE " bytes, %" PRIuSIZE " entries, deep %i", pagetype_caption, "%s-page: payload %" PRIuSIZE " bytes, %" PRIuSIZE " entries, deep %i, parent %zu",
payload_bytes, nentries, deep); pagetype_caption, payload_bytes, nentries, deep, parent_pgno);
tbl->pages.empty += 1; tbl->pages.empty += 1;
} }
@ -850,8 +851,9 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
if (page_bytes != page_size) { if (page_bytes != page_size) {
chk_object_issue(scope, "page", pgno, "misused", chk_object_issue(scope, "page", pgno, "misused",
"%s-page: %" PRIuPTR " != %" PRIuPTR " (%" PRIuPTR "h + %" PRIuPTR "p + %" PRIuPTR "%s-page: %" PRIuPTR " != %" PRIuPTR " (%" PRIuPTR "h + %" PRIuPTR "p + %" PRIuPTR
"u), deep %i", "u), deep %i, parent %zu",
pagetype_caption, page_size, page_bytes, header_bytes, payload_bytes, unused_bytes, deep); pagetype_caption, page_size, page_bytes, header_bytes, payload_bytes, unused_bytes, deep,
parent_pgno);
if (page_size > page_bytes) if (page_size > page_bytes)
tbl->lost_bytes += page_size - page_bytes; tbl->lost_bytes += page_size - page_bytes;
} else { } else {