diff options
| -rw-r--r-- | contrib/amcheck/verify_nbtree.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index a4c4c09850e..e4d501a85d1 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -2864,7 +2864,11 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum) * As noted at the beginning of _bt_binsrch(), an internal page must have * children, since there must always be a negative infinity downlink * (there may also be a highkey). In the case of non-rightmost leaf - * pages, there must be at least a highkey. + * pages, there must be at least a highkey. Deleted pages on replica + * might contain no items, because page unlink re-initializes + * page-to-be-deleted. Deleted pages with no items might be on primary + * too due to preceding recovery, but on primary new deletions can't + * happen concurrently to amcheck. * * This is correct when pages are half-dead, since internal pages are * never half-dead, and leaf pages must have a high key when half-dead @@ -2884,13 +2888,13 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum) blocknum, RelationGetRelationName(state->rel), MaxIndexTuplesPerPage))); - if (!P_ISLEAF(opaque) && maxoffset < P_FIRSTDATAKEY(opaque)) + if (!P_ISLEAF(opaque) && !P_ISDELETED(opaque) && maxoffset < P_FIRSTDATAKEY(opaque)) ereport(ERROR, (errcode(ERRCODE_INDEX_CORRUPTED), errmsg("internal block %u in index \"%s\" lacks high key and/or at least one downlink", blocknum, RelationGetRelationName(state->rel)))); - if (P_ISLEAF(opaque) && !P_RIGHTMOST(opaque) && maxoffset < P_HIKEY) + if (P_ISLEAF(opaque) && !P_ISDELETED(opaque) && !P_RIGHTMOST(opaque) && maxoffset < P_HIKEY) ereport(ERROR, (errcode(ERRCODE_INDEX_CORRUPTED), errmsg("non-rightmost leaf block %u in index \"%s\" lacks high key item", |