diff options
Diffstat (limited to 'src/backend/access/gist')
| -rw-r--r-- | src/backend/access/gist/gistbuild.c | 4 | ||||
| -rw-r--r-- | src/backend/access/gist/gistxlog.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c index f5a5caff8ec..374e64e8086 100644 --- a/src/backend/access/gist/gistbuild.c +++ b/src/backend/access/gist/gistbuild.c @@ -462,7 +462,7 @@ gist_indexsortbuild(GISTBuildState *state) smgrwrite(RelationGetSmgr(state->indexrel), MAIN_FORKNUM, GIST_ROOT_BLKNO, levelstate->pages[0], true); if (RelationNeedsWAL(state->indexrel)) - log_newpage(&state->indexrel->rd_node, MAIN_FORKNUM, GIST_ROOT_BLKNO, + log_newpage(&state->indexrel->rd_locator, MAIN_FORKNUM, GIST_ROOT_BLKNO, levelstate->pages[0], true); pfree(levelstate->pages[0]); @@ -663,7 +663,7 @@ gist_indexsortbuild_flush_ready_pages(GISTBuildState *state) } if (RelationNeedsWAL(state->indexrel)) - log_newpages(&state->indexrel->rd_node, MAIN_FORKNUM, state->ready_num_pages, + log_newpages(&state->indexrel->rd_locator, MAIN_FORKNUM, state->ready_num_pages, state->ready_blknos, state->ready_pages, true); for (int i = 0; i < state->ready_num_pages; i++) diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index df70f906b4e..b4f629f4a8f 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -191,11 +191,12 @@ gistRedoDeleteRecord(XLogReaderState *record) */ if (InHotStandby) { - RelFileNode rnode; + RelFileLocator rlocator; - XLogRecGetBlockTag(record, 0, &rnode, NULL, NULL); + XLogRecGetBlockTag(record, 0, &rlocator, NULL, NULL); - ResolveRecoveryConflictWithSnapshot(xldata->latestRemovedXid, rnode); + ResolveRecoveryConflictWithSnapshot(xldata->latestRemovedXid, + rlocator); } if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO) @@ -395,7 +396,7 @@ gistRedoPageReuse(XLogReaderState *record) */ if (InHotStandby) ResolveRecoveryConflictWithSnapshotFullXid(xlrec->latestRemovedFullXid, - xlrec->node); + xlrec->locator); } void @@ -607,7 +608,7 @@ gistXLogPageReuse(Relation rel, BlockNumber blkno, FullTransactionId latestRemov */ /* XLOG stuff */ - xlrec_reuse.node = rel->rd_node; + xlrec_reuse.locator = rel->rd_locator; xlrec_reuse.block = blkno; xlrec_reuse.latestRemovedFullXid = latestRemovedXid; |