diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-06-12 09:12:31 +0000 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2008-06-12 09:12:31 +0000 |
| commit | a213f1ee6c5a1bbe1f074ca201975e76ad2ed50c (patch) | |
| tree | c5ac3531c006389123da3ba506e5b25eb09ecd02 /src/backend/access/transam/xlog.c | |
| parent | c4f2a0458dc029d1214f013f1434f70f5194e56d (diff) | |
| download | postgresql-a213f1ee6c5a1bbe1f074ca201975e76ad2ed50c.tar.gz postgresql-a213f1ee6c5a1bbe1f074ca201975e76ad2ed50c.zip | |
Refactor XLogOpenRelation() and XLogReadBuffer() in preparation for relation
forks. XLogOpenRelation() and the associated light-weight relation cache in
xlogutils.c is gone, and XLogReadBuffer() now takes a RelFileNode as argument,
instead of Relation.
For functions that still need a Relation struct during WAL replay, there's a
new function called CreateFakeRelcacheEntry() that returns a fake entry like
XLogOpenRelation() used to.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 26f0fa72932..4c9b7872ca3 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.313 2008/06/08 22:00:47 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.314 2008/06/12 09:12:30 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -2840,7 +2840,6 @@ CleanupBackupHistory(void) static void RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn) { - Relation reln; Buffer buffer; Page page; BkpBlock bkpb; @@ -2856,8 +2855,7 @@ RestoreBkpBlocks(XLogRecord *record, XLogRecPtr lsn) memcpy(&bkpb, blk, sizeof(BkpBlock)); blk += sizeof(BkpBlock); - reln = XLogOpenRelation(bkpb.node); - buffer = XLogReadBuffer(reln, bkpb.block, true); + buffer = XLogReadBuffer(bkpb.node, bkpb.block, true); Assert(BufferIsValid(buffer)); page = (Page) BufferGetPage(buffer); @@ -5064,9 +5062,7 @@ StartupXLOG(void) BACKUP_LABEL_FILE, BACKUP_LABEL_OLD))); } - /* Start up the recovery environment */ - XLogInitRelationCache(); - + /* Initialize resource managers */ for (rmid = 0; rmid <= RM_MAX_ID; rmid++) { if (RmgrTable[rmid].rm_startup != NULL) @@ -5330,11 +5326,6 @@ StartupXLOG(void) * allows some extra error checking in xlog_redo. */ CreateCheckPoint(CHECKPOINT_IS_SHUTDOWN | CHECKPOINT_IMMEDIATE); - - /* - * Close down recovery environment - */ - XLogCloseRelationCache(); } /* |