diff options
| author | Robert Haas <rhaas@postgresql.org> | 2023-03-27 13:37:16 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2023-03-27 13:37:16 -0400 |
| commit | c87aff065c33e1a3c9bf0350f9160e84bfce1c36 (patch) | |
| tree | bfdc2ffedc6b201acc1229295907cfd70d3675e4 /src | |
| parent | 80d5e3a615518e9eee8ba4afa5cf05ebe486dbf6 (diff) | |
| download | postgresql-c87aff065c33e1a3c9bf0350f9160e84bfce1c36.tar.gz postgresql-c87aff065c33e1a3c9bf0350f9160e84bfce1c36.zip | |
amcheck: Generalize one of the recently-added update chain checks.
Commit bbc1376b39627c6bddd8a0dc0a7dda24c91a97a0 checked that if
a redirected line pointer pointed to a tuple, the tuple should be
marked both HEAP_ONLY_TUPLE and HEAP_UPDATED. But Andres Freund
pointed out that *any* tuple that is marked HEAP_ONLY_TUPLE should
be marked HEAP_UPDATED, not just one that is the target of a
redirected line pointer. Do that instead.
To see why this is better, consider a redirect line pointer A
which points to a heap-only tuple B which points (via CTID)
to another heap-only tuple C. With the old code, we'd complain
if B was not marked HEAP_UPDATED, but with this change, we'll
complain if either B or C is not marked HEAP_UPDATED.
(Note that, with or without this commit, if either B or C were
not marked HEAP_ONLY_TUPLE, we would also complain about that.)
Discussion: http://postgr.es/m/CA%2BTgmobLypZx%3DcOH%2ByY1GZmCruaoucHm77A6y_-Bo%3Dh-_3H28g%40mail.gmail.com
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_amcheck/t/004_verify_heapam.pl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl index cc4aa4af875..90ba59ec0b7 100644 --- a/src/bin/pg_amcheck/t/004_verify_heapam.pl +++ b/src/bin/pg_amcheck/t/004_verify_heapam.pl @@ -617,12 +617,10 @@ for (my $tupidx = 0; $tupidx < $ROWCOUNT; $tupidx++) } elsif ($offnum == 17) { - # at offnum 19 we will unset HEAP_ONLY_TUPLE and HEAP_UPDATED flags. + # at offnum 19 we will unset HEAP_ONLY_TUPLE flag die "offnum $offnum should be a redirect" if defined $tup; push @expected, qr/${header}redirected line pointer points to a non-heap-only tuple at offset \d+/; - push @expected, - qr/${header}redirected line pointer points to a non-heap-updated tuple at offset \d+/; } elsif ($offnum == 18) { @@ -637,10 +635,9 @@ for (my $tupidx = 0; $tupidx < $ROWCOUNT; $tupidx++) } elsif ($offnum == 19) { - # unset HEAP_ONLY_TUPLE and HEAP_UPDATED flag, so that update chain - # validation will complain about offset 17 + # unset HEAP_ONLY_TUPLE flag, so that update chain validation will + # complain about offset 17 $tup->{t_infomask2} &= ~HEAP_ONLY_TUPLE; - $tup->{t_infomask} &= ~HEAP_UPDATED; } elsif ($offnum == 22) { @@ -688,6 +685,8 @@ for (my $tupidx = 0; $tupidx < $ROWCOUNT; $tupidx++) $tup->{t_infomask2} |= HEAP_ONLY_TUPLE; push @expected, qr/${header}tuple is root of chain but is marked as heap-only tuple/; + push @expected, + qr/${header}tuple is heap only, but not the result of an update/; } elsif ($offnum == 33) { |