mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
Pass down table relation into more index relation functions
This is done in preparation for logical decoding on standby, which needs to include whether visibility affecting WAL records are about a (user) catalog table. Which is only known for the table, not the indexes. It's also nice to be able to pass the heap relation to GlobalVisTestFor() in vacuumRedirectAndPlaceholder(). Author: "Drouvot, Bertrand" <bertranddrouvot.pg@gmail.com> Discussion: https://postgr.es/m/21b700c3-eecf-2e05-a699-f8c78dd31ec7@gmail.com
This commit is contained in:
@ -349,7 +349,7 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
|
||||
for (; ptr; ptr = ptr->next)
|
||||
{
|
||||
/* Allocate new page */
|
||||
ptr->buffer = gistNewBuffer(rel);
|
||||
ptr->buffer = gistNewBuffer(rel, heapRel);
|
||||
GISTInitBuffer(ptr->buffer, (is_leaf) ? F_LEAF : 0);
|
||||
ptr->page = BufferGetPage(ptr->buffer);
|
||||
ptr->block.blkno = BufferGetBlockNumber(ptr->buffer);
|
||||
@ -1695,7 +1695,8 @@ gistprunepage(Relation rel, Page page, Buffer buffer, Relation heapRel)
|
||||
|
||||
recptr = gistXLogDelete(buffer,
|
||||
deletable, ndeletable,
|
||||
snapshotConflictHorizon);
|
||||
snapshotConflictHorizon,
|
||||
heapRel);
|
||||
|
||||
PageSetLSN(page, recptr);
|
||||
}
|
||||
|
@ -298,7 +298,7 @@ gistbuild(Relation heap, Relation index, IndexInfo *indexInfo)
|
||||
Page page;
|
||||
|
||||
/* initialize the root page */
|
||||
buffer = gistNewBuffer(index);
|
||||
buffer = gistNewBuffer(index, heap);
|
||||
Assert(BufferGetBlockNumber(buffer) == GIST_ROOT_BLKNO);
|
||||
page = BufferGetPage(buffer);
|
||||
|
||||
|
@ -821,7 +821,7 @@ gistcheckpage(Relation rel, Buffer buf)
|
||||
* Caller is responsible for initializing the page by calling GISTInitBuffer
|
||||
*/
|
||||
Buffer
|
||||
gistNewBuffer(Relation r)
|
||||
gistNewBuffer(Relation r, Relation heaprel)
|
||||
{
|
||||
Buffer buffer;
|
||||
bool needLock;
|
||||
@ -865,7 +865,7 @@ gistNewBuffer(Relation r)
|
||||
* page's deleteXid.
|
||||
*/
|
||||
if (XLogStandbyInfoActive() && RelationNeedsWAL(r))
|
||||
gistXLogPageReuse(r, blkno, GistPageGetDeleteXid(page));
|
||||
gistXLogPageReuse(r, heaprel, blkno, GistPageGetDeleteXid(page));
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
@ -597,7 +597,8 @@ gistXLogAssignLSN(void)
|
||||
* Write XLOG record about reuse of a deleted page.
|
||||
*/
|
||||
void
|
||||
gistXLogPageReuse(Relation rel, BlockNumber blkno, FullTransactionId deleteXid)
|
||||
gistXLogPageReuse(Relation rel, Relation heaprel,
|
||||
BlockNumber blkno, FullTransactionId deleteXid)
|
||||
{
|
||||
gistxlogPageReuse xlrec_reuse;
|
||||
|
||||
@ -672,7 +673,7 @@ gistXLogUpdate(Buffer buffer,
|
||||
*/
|
||||
XLogRecPtr
|
||||
gistXLogDelete(Buffer buffer, OffsetNumber *todelete, int ntodelete,
|
||||
TransactionId snapshotConflictHorizon)
|
||||
TransactionId snapshotConflictHorizon, Relation heaprel)
|
||||
{
|
||||
gistxlogDelete xlrec;
|
||||
XLogRecPtr recptr;
|
||||
|
Reference in New Issue
Block a user