mirror of
https://github.com/isar/libmdbx.git
synced 2025-08-02 22:54:44 +08:00
mdbx: report the parent-pgno in an issues during a DB check.
This commit is contained in:
Леонид Юрьев (Leonid Yuriev)
parent
5c6d91f7c8
commit
ecc36a11ec
48
src/chk.c
48
src/chk.c
@ -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_context_t *const usr = chk->usr;
|
||||
MDBX_env *const env = usr->env;
|
||||
(void)parent_pgno;
|
||||
|
||||
MDBX_chk_table_t *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;
|
||||
|
||||
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 */;
|
||||
}
|
||||
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;
|
||||
switch (pagetype) {
|
||||
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";
|
||||
tbl->pages.other += npages;
|
||||
break;
|
||||
@ -743,8 +743,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
|
||||
pagetype_caption = "large";
|
||||
histogram_acc(npages, &tbl->histogram.large_pages);
|
||||
if (tbl->flags & MDBX_DUPSORT)
|
||||
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i", (unsigned)pagetype,
|
||||
chk_v2a(chk, &tbl->name), tbl->flags, deep);
|
||||
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
|
||||
(unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
|
||||
break;
|
||||
case page_branch:
|
||||
branch = true;
|
||||
@ -758,8 +758,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
|
||||
break;
|
||||
case page_dupfix_leaf:
|
||||
if (!nested)
|
||||
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i", (unsigned)pagetype,
|
||||
chk_v2a(chk, &tbl->name), tbl->flags, deep);
|
||||
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
|
||||
(unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
|
||||
/* fall through */
|
||||
__fallthrough;
|
||||
case page_leaf:
|
||||
@ -767,8 +767,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
|
||||
pagetype_caption = "leaf";
|
||||
tbl->pages.leaf += 1;
|
||||
if (height != tbl_info->internal->height)
|
||||
chk_object_issue(scope, "page", pgno, "wrong tree height", "actual %i != %i table %s", height,
|
||||
tbl_info->internal->height, chk_v2a(chk, &tbl->name));
|
||||
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), parent_pgno);
|
||||
} else {
|
||||
pagetype_caption = (pagetype == page_leaf) ? "nested-leaf" : "nested-leaf-dupfix";
|
||||
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;
|
||||
}
|
||||
if (height != nested->height)
|
||||
chk_object_issue(scope, "page", pgno, "wrong nested-tree height", "actual %i != %i dupsort-node %s", height,
|
||||
nested->height, chk_v2a(chk, &tbl->name));
|
||||
chk_object_issue(scope, "page", pgno, "wrong nested-tree height", "actual %i != %i dupsort-node %s, parent %zu",
|
||||
height, nested->height, chk_v2a(chk, &tbl->name), parent_pgno);
|
||||
}
|
||||
break;
|
||||
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";
|
||||
tbl->pages.nested_subleaf += 1;
|
||||
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_v2a(chk, &tbl->name), tbl->flags, deep);
|
||||
chk_object_issue(scope, "page", pgno, "unexpected", "type %u, table %s flags 0x%x, deep %i, parent %zu",
|
||||
(unsigned)pagetype, chk_v2a(chk, &tbl->name), tbl->flags, deep, parent_pgno);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -814,7 +814,8 @@ __cold static int chk_pgvisitor(const size_t pgno, const unsigned npages, void *
|
||||
} else if (chk->pagemap[spanpgno]) {
|
||||
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",
|
||||
"%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;
|
||||
} else {
|
||||
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)) {
|
||||
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 {
|
||||
if (unused_bytes > page_size)
|
||||
chk_object_issue(scope, "page", pgno, "illegal unused-bytes", "%s-page: %u < %" PRIuSIZE " < %u",
|
||||
pagetype_caption, 0, unused_bytes, env->ps);
|
||||
chk_object_issue(scope, "page", pgno, "illegal unused-bytes", "%s-page: %u < %" PRIuSIZE " < %u, parent %zu",
|
||||
pagetype_caption, 0, unused_bytes, env->ps, parent_pgno);
|
||||
|
||||
if (header_bytes < (int)sizeof(long) || (size_t)header_bytes >= env->ps - sizeof(long)) {
|
||||
chk_object_issue(scope, "page", pgno, "illegal header-length",
|
||||
"%s-page: %" PRIuSIZE " < %" PRIuSIZE " < %" PRIuSIZE, pagetype_caption, sizeof(long),
|
||||
header_bytes, env->ps - sizeof(long));
|
||||
"%s-page: %" PRIuSIZE " < %" PRIuSIZE " < %" PRIuSIZE ", parent %zu", pagetype_caption,
|
||||
sizeof(long), header_bytes, env->ps - sizeof(long), parent_pgno);
|
||||
}
|
||||
if (nentries < 1 || (pagetype == page_branch && nentries < 2)) {
|
||||
chk_object_issue(scope, "page", pgno, nentries ? "half-empty" : "empty",
|
||||
"%s-page: payload %" PRIuSIZE " bytes, %" PRIuSIZE " entries, deep %i", pagetype_caption,
|
||||
payload_bytes, nentries, deep);
|
||||
"%s-page: payload %" PRIuSIZE " bytes, %" PRIuSIZE " entries, deep %i, parent %zu",
|
||||
pagetype_caption, payload_bytes, nentries, deep, parent_pgno);
|
||||
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) {
|
||||
chk_object_issue(scope, "page", pgno, "misused",
|
||||
"%s-page: %" PRIuPTR " != %" PRIuPTR " (%" PRIuPTR "h + %" PRIuPTR "p + %" PRIuPTR
|
||||
"u), deep %i",
|
||||
pagetype_caption, page_size, page_bytes, header_bytes, payload_bytes, unused_bytes, deep);
|
||||
"u), deep %i, parent %zu",
|
||||
pagetype_caption, page_size, page_bytes, header_bytes, payload_bytes, unused_bytes, deep,
|
||||
parent_pgno);
|
||||
if (page_size > page_bytes)
|
||||
tbl->lost_bytes += page_size - page_bytes;
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user