diff options
author | Alexander Korotkov <akorotkov@postgresql.org> | 2024-05-23 02:12:45 +0300 |
---|---|---|
committer | Alexander Korotkov <akorotkov@postgresql.org> | 2024-05-23 02:12:45 +0300 |
commit | 0b5c161248110b164a3333006004c78f9529a109 (patch) | |
tree | 37cc1ef8b5e2eec58028199022f04184581ddecb | |
parent | 532d94fec32ac11263b53932365560491d1fd50a (diff) | |
download | postgresql-0b5c161248110b164a3333006004c78f9529a109.tar.gz postgresql-0b5c161248110b164a3333006004c78f9529a109.zip |
amcheck: Don't load the right sibling page into BtreeCheckState
5ae2087202 implemented a cross-page unique constraint check by loading
the right sibling to the BtreeCheckState.target variable. This is wrong,
because bt_target_page_check() shouldn't change the target page. Also,
BtreeCheckState.target shouldn't be changed alone without
BtreeCheckState.targetblock.
However, the above didn't cause any visible bugs for the following reasons.
1. We do a cross-page unique constraint check only for leaf index pages.
2. The only way target page get accessed after a cross-page unique constraint
check is loading of the lowkey.
3. The only place lowkey is used is bt_child_highkey_check(), and that applies
only to non-leafs.
The reasons above don't diminish the fact that changing BtreeCheckState.target
for a cross-page unique constraint check is wrong. This commit changes this
check to temporarily store the right sibling to the local variable.
Reported-by: Peter Geoghegan
Discussion: https://postgr.es/m/CAH2-Wzk%2B2116uOXdOViA27SHcr31WKPgmjsxXLBs_aTxAeThzg%40mail.gmail.com
Author: Pavel Borisov
-rw-r--r-- | contrib/amcheck/verify_nbtree.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c index 187b95b2e7d..5354b393b11 100644 --- a/contrib/amcheck/verify_nbtree.c +++ b/contrib/amcheck/verify_nbtree.c @@ -1892,20 +1892,24 @@ bt_target_page_check(BtreeCheckState *state) /* The first key on the next page is the same */ if (_bt_compare(state->rel, rightkey, state->target, max) == 0 && !rightkey->anynullkeys) { + Page rightpage; + elog(DEBUG2, "cross page equal keys"); - state->target = palloc_btree_page(state, - rightblock_number); - topaque = BTPageGetOpaque(state->target); + rightpage = palloc_btree_page(state, + rightblock_number); + topaque = BTPageGetOpaque(rightpage); if (P_IGNORE(topaque) || !P_ISLEAF(topaque)) break; itemid = PageGetItemIdCareful(state, rightblock_number, - state->target, + rightpage, rightfirstoffset); - itup = (IndexTuple) PageGetItem(state->target, itemid); + itup = (IndexTuple) PageGetItem(rightpage, itemid); bt_entry_unique_check(state, itup, rightblock_number, rightfirstoffset, &lVis); + + pfree(rightpage); } } } |