Skip to content

Cherry-pick upstream amcheck fixes (v15) #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hlinnaka wants to merge 2 commits into
base: REL_15_STABLE_neon
Choose a base branch
from
Open

Cherry-pick upstream amcheck fixes (v15) #827

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5364e31
Fix amcheck's handling of incomplete root splits in B-tree
hlinnaka Dec 2, 2025
09142f5
Fix amcheck's handling of half-dead B-tree pages
hlinnaka Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contrib/amcheck/verify_nbtree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ bt_check_level_from_leftmost(BtreeCheckState *state, BtreeLevel level)
errmsg("block %u is not leftmost in index \"%s\"",
current, RelationGetRelationName(state->rel))));

if (level.istruerootlevel && !P_ISROOT(opaque))
if (level.istruerootlevel && (!P_ISROOT(opaque) && !P_INCOMPLETE_SPLIT(opaque)))
ereport(ERROR,
(errcode(ERRCODE_INDEX_CORRUPTED),
errmsg("block %u is not true root in index \"%s\"",
Expand Down Expand Up @@ -2048,7 +2048,7 @@ bt_child_highkey_check(BtreeCheckState *state,
* If we visit page with high key, check that it is equal to the
* target key next to corresponding downlink.
*/
if (!rightsplit && !P_RIGHTMOST(opaque))
if (!rightsplit && !P_RIGHTMOST(opaque) && !P_ISHALFDEAD(opaque))
{
BTPageOpaque topaque;
IndexTuple highkey;
Expand Down