diff options
| author | Robert Haas <rhaas@postgresql.org> | 2020-10-22 08:44:18 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2020-10-22 08:44:18 -0400 |
| commit | 866e24d47db1743dfcff5bd595b57e3a143f2cb1 (patch) | |
| tree | 8a0ed0502ebba60526dcb77f13522c6cae4684e9 /src/backend/access | |
| parent | f8721bd752790859df747905bc44fb5ad8dbf07d (diff) | |
| download | postgresql-866e24d47db1743dfcff5bd595b57e3a143f2cb1.tar.gz postgresql-866e24d47db1743dfcff5bd595b57e3a143f2cb1.zip | |
Extend amcheck to check heap pages.
Mark Dilger, reviewed by Peter Geoghegan, Andres Freund, Álvaro Herrera,
Michael Paquier, Amul Sul, and by me. Some last-minute cosmetic
revisions by me.
Discussion: http://postgr.es/m/12ED3DA8-25F0-4B68-937D-D907CFBF08E7@enterprisedb.com
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/heap/hio.c | 11 | ||||
| -rw-r--r-- | src/backend/access/transam/multixact.c | 19 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index aa3f14c019c..ca357410a29 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -47,6 +47,17 @@ RelationPutHeapTuple(Relation relation, */ Assert(!token || HeapTupleHeaderIsSpeculative(tuple->t_data)); + /* + * Do not allow tuples with invalid combinations of hint bits to be placed + * on a page. These combinations are detected as corruption by the + * contrib/amcheck logic, so if you disable one or both of these + * assertions, make corresponding changes there. + */ + Assert(!((tuple->t_data->t_infomask & HEAP_XMAX_LOCK_ONLY) && + (tuple->t_data->t_infomask2 & HEAP_KEYS_UPDATED))); + Assert(!((tuple->t_data->t_infomask & HEAP_XMAX_COMMITTED) && + (tuple->t_data->t_infomask & HEAP_XMAX_IS_MULTI))); + /* Add the tuple to the page */ pageHeader = BufferGetPage(buffer); diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 6ccdc5b58cb..43653fe5721 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -736,6 +736,25 @@ ReadNextMultiXactId(void) } /* + * ReadMultiXactIdRange + * Get the range of IDs that may still be referenced by a relation. + */ +void +ReadMultiXactIdRange(MultiXactId *oldest, MultiXactId *next) +{ + LWLockAcquire(MultiXactGenLock, LW_SHARED); + *oldest = MultiXactState->oldestMultiXactId; + *next = MultiXactState->nextMXact; + LWLockRelease(MultiXactGenLock); + + if (*oldest < FirstMultiXactId) + *oldest = FirstMultiXactId; + if (*next < FirstMultiXactId) + *next = FirstMultiXactId; +} + + +/* * MultiXactIdCreateFromMembers * Make a new MultiXactId from the specified set of members * |