mirror of
https://github.com/postgres/postgres.git
synced 2025-07-28 23:42:10 +03:00
Rethink the way FSM truncation works. Instead of WAL-logging FSM
truncations in FSM code, call FreeSpaceMapTruncateRel from smgr_redo. To make that cleaner from modularity point of view, move the WAL-logging one level up to RelationTruncate, and move RelationTruncate and all the related WAL-logging to new src/backend/catalog/storage.c file. Introduce new RelationCreateStorage and RelationDropStorage functions that are used instead of calling smgrcreate/smgrscheduleunlink directly. Move the pending rel deletion stuff from smgrcreate/smgrscheduleunlink to the new functions. This leaves smgr.c as a thin wrapper around md.c; all the transactional stuff is now in storage.c. This will make it easier to add new forks with similar truncation logic, like the visibility map.
This commit is contained in:
Heikki Linnakangas
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Resource managers definition
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/rmgr.c,v 1.26 2008/09/30 10:52:11 heikki Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/rmgr.c,v 1.27 2008/11/19 10:34:50 heikki Exp $
|
||||
*/
|
||||
#include "postgres.h"
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
#include "access/nbtree.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog_internal.h"
|
||||
#include "catalog/storage.h"
|
||||
#include "commands/dbcommands.h"
|
||||
#include "commands/sequence.h"
|
||||
#include "commands/tablespace.h"
|
||||
#include "storage/freespace.h"
|
||||
#include "storage/smgr.h"
|
||||
|
||||
|
||||
const RmgrData RmgrTable[RM_MAX_ID + 1] = {
|
||||
@ -31,7 +31,7 @@ const RmgrData RmgrTable[RM_MAX_ID + 1] = {
|
||||
{"Database", dbase_redo, dbase_desc, NULL, NULL, NULL},
|
||||
{"Tablespace", tblspc_redo, tblspc_desc, NULL, NULL, NULL},
|
||||
{"MultiXact", multixact_redo, multixact_desc, NULL, NULL, NULL},
|
||||
{"FreeSpaceMap", fsm_redo, fsm_desc, NULL, NULL, NULL},
|
||||
{"Reserved 7", NULL, NULL, NULL, NULL, NULL},
|
||||
{"Reserved 8", NULL, NULL, NULL, NULL, NULL},
|
||||
{"Heap2", heap2_redo, heap2_desc, NULL, NULL, NULL},
|
||||
{"Heap", heap_redo, heap_desc, NULL, NULL, NULL},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
* Portions Copyright (c) 1994, Regents of the University of California
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.47 2008/11/02 21:24:51 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.48 2008/11/19 10:34:50 heikki Exp $
|
||||
*
|
||||
* NOTES
|
||||
* Each global transaction is associated with a global transaction
|
||||
@ -48,7 +48,9 @@
|
||||
#include "access/twophase.h"
|
||||
#include "access/twophase_rmgr.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "catalog/storage.h"
|
||||
#include "funcapi.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pg_trace.h"
|
||||
@ -141,12 +143,12 @@ static void RecordTransactionCommitPrepared(TransactionId xid,
|
||||
int nchildren,
|
||||
TransactionId *children,
|
||||
int nrels,
|
||||
RelFileFork *rels);
|
||||
RelFileNode *rels);
|
||||
static void RecordTransactionAbortPrepared(TransactionId xid,
|
||||
int nchildren,
|
||||
TransactionId *children,
|
||||
int nrels,
|
||||
RelFileFork *rels);
|
||||
RelFileNode *rels);
|
||||
static void ProcessRecords(char *bufptr, TransactionId xid,
|
||||
const TwoPhaseCallback callbacks[]);
|
||||
|
||||
@ -694,8 +696,8 @@ TwoPhaseGetDummyProc(TransactionId xid)
|
||||
*
|
||||
* 1. TwoPhaseFileHeader
|
||||
* 2. TransactionId[] (subtransactions)
|
||||
* 3. RelFileFork[] (files to be deleted at commit)
|
||||
* 4. RelFileFork[] (files to be deleted at abort)
|
||||
* 3. RelFileNode[] (files to be deleted at commit)
|
||||
* 4. RelFileNode[] (files to be deleted at abort)
|
||||
* 5. TwoPhaseRecordOnDisk
|
||||
* 6. ...
|
||||
* 7. TwoPhaseRecordOnDisk (end sentinel, rmid == TWOPHASE_RM_END_ID)
|
||||
@ -793,8 +795,8 @@ StartPrepare(GlobalTransaction gxact)
|
||||
TransactionId xid = gxact->proc.xid;
|
||||
TwoPhaseFileHeader hdr;
|
||||
TransactionId *children;
|
||||
RelFileFork *commitrels;
|
||||
RelFileFork *abortrels;
|
||||
RelFileNode *commitrels;
|
||||
RelFileNode *abortrels;
|
||||
|
||||
/* Initialize linked list */
|
||||
records.head = palloc0(sizeof(XLogRecData));
|
||||
@ -832,12 +834,12 @@ StartPrepare(GlobalTransaction gxact)
|
||||
}
|
||||
if (hdr.ncommitrels > 0)
|
||||
{
|
||||
save_state_data(commitrels, hdr.ncommitrels * sizeof(RelFileFork));
|
||||
save_state_data(commitrels, hdr.ncommitrels * sizeof(RelFileNode));
|
||||
pfree(commitrels);
|
||||
}
|
||||
if (hdr.nabortrels > 0)
|
||||
{
|
||||
save_state_data(abortrels, hdr.nabortrels * sizeof(RelFileFork));
|
||||
save_state_data(abortrels, hdr.nabortrels * sizeof(RelFileNode));
|
||||
pfree(abortrels);
|
||||
}
|
||||
}
|
||||
@ -1140,8 +1142,10 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
|
||||
TwoPhaseFileHeader *hdr;
|
||||
TransactionId latestXid;
|
||||
TransactionId *children;
|
||||
RelFileFork *commitrels;
|
||||
RelFileFork *abortrels;
|
||||
RelFileNode *commitrels;
|
||||
RelFileNode *abortrels;
|
||||
RelFileNode *delrels;
|
||||
int ndelrels;
|
||||
int i;
|
||||
|
||||
/*
|
||||
@ -1169,10 +1173,10 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
|
||||
bufptr = buf + MAXALIGN(sizeof(TwoPhaseFileHeader));
|
||||
children = (TransactionId *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId));
|
||||
commitrels = (RelFileFork *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileFork));
|
||||
abortrels = (RelFileFork *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileFork));
|
||||
commitrels = (RelFileNode *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode));
|
||||
abortrels = (RelFileNode *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode));
|
||||
|
||||
/* compute latestXid among all children */
|
||||
latestXid = TransactionIdLatest(xid, hdr->nsubxacts, children);
|
||||
@ -1214,21 +1218,28 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
|
||||
*/
|
||||
if (isCommit)
|
||||
{
|
||||
for (i = 0; i < hdr->ncommitrels; i++)
|
||||
{
|
||||
SMgrRelation srel = smgropen(commitrels[i].rnode);
|
||||
smgrdounlink(srel, commitrels[i].forknum, false, false);
|
||||
smgrclose(srel);
|
||||
}
|
||||
delrels = commitrels;
|
||||
ndelrels = hdr->ncommitrels;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; i < hdr->nabortrels; i++)
|
||||
delrels = abortrels;
|
||||
ndelrels = hdr->nabortrels;
|
||||
}
|
||||
for (i = 0; i < ndelrels; i++)
|
||||
{
|
||||
SMgrRelation srel = smgropen(delrels[i]);
|
||||
ForkNumber fork;
|
||||
|
||||
for (fork = 0; fork <= MAX_FORKNUM; fork++)
|
||||
{
|
||||
SMgrRelation srel = smgropen(abortrels[i].rnode);
|
||||
smgrdounlink(srel, abortrels[i].forknum, false, false);
|
||||
smgrclose(srel);
|
||||
if (smgrexists(srel, fork))
|
||||
{
|
||||
XLogDropRelation(delrels[i], fork);
|
||||
smgrdounlink(srel, fork, false, true);
|
||||
}
|
||||
}
|
||||
smgrclose(srel);
|
||||
}
|
||||
|
||||
/* And now do the callbacks */
|
||||
@ -1639,8 +1650,8 @@ RecoverPreparedTransactions(void)
|
||||
bufptr = buf + MAXALIGN(sizeof(TwoPhaseFileHeader));
|
||||
subxids = (TransactionId *) bufptr;
|
||||
bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId));
|
||||
bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileFork));
|
||||
bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileFork));
|
||||
bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode));
|
||||
bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode));
|
||||
|
||||
/*
|
||||
* Reconstruct subtrans state for the transaction --- needed
|
||||
@ -1693,7 +1704,7 @@ RecordTransactionCommitPrepared(TransactionId xid,
|
||||
int nchildren,
|
||||
TransactionId *children,
|
||||
int nrels,
|
||||
RelFileFork *rels)
|
||||
RelFileNode *rels)
|
||||
{
|
||||
XLogRecData rdata[3];
|
||||
int lastrdata = 0;
|
||||
@ -1718,7 +1729,7 @@ RecordTransactionCommitPrepared(TransactionId xid,
|
||||
{
|
||||
rdata[0].next = &(rdata[1]);
|
||||
rdata[1].data = (char *) rels;
|
||||
rdata[1].len = nrels * sizeof(RelFileFork);
|
||||
rdata[1].len = nrels * sizeof(RelFileNode);
|
||||
rdata[1].buffer = InvalidBuffer;
|
||||
lastrdata = 1;
|
||||
}
|
||||
@ -1766,7 +1777,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
|
||||
int nchildren,
|
||||
TransactionId *children,
|
||||
int nrels,
|
||||
RelFileFork *rels)
|
||||
RelFileNode *rels)
|
||||
{
|
||||
XLogRecData rdata[3];
|
||||
int lastrdata = 0;
|
||||
@ -1796,7 +1807,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
|
||||
{
|
||||
rdata[0].next = &(rdata[1]);
|
||||
rdata[1].data = (char *) rels;
|
||||
rdata[1].len = nrels * sizeof(RelFileFork);
|
||||
rdata[1].len = nrels * sizeof(RelFileNode);
|
||||
rdata[1].buffer = InvalidBuffer;
|
||||
lastrdata = 1;
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.268 2008/11/11 14:17:01 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.269 2008/11/19 10:34:50 heikki Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -28,6 +28,7 @@
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/namespace.h"
|
||||
#include "catalog/storage.h"
|
||||
#include "commands/async.h"
|
||||
#include "commands/tablecmds.h"
|
||||
#include "commands/trigger.h"
|
||||
@ -819,7 +820,7 @@ RecordTransactionCommit(void)
|
||||
bool markXidCommitted = TransactionIdIsValid(xid);
|
||||
TransactionId latestXid = InvalidTransactionId;
|
||||
int nrels;
|
||||
RelFileFork *rels;
|
||||
RelFileNode *rels;
|
||||
bool haveNonTemp;
|
||||
int nchildren;
|
||||
TransactionId *children;
|
||||
@ -900,7 +901,7 @@ RecordTransactionCommit(void)
|
||||
{
|
||||
rdata[0].next = &(rdata[1]);
|
||||
rdata[1].data = (char *) rels;
|
||||
rdata[1].len = nrels * sizeof(RelFileFork);
|
||||
rdata[1].len = nrels * sizeof(RelFileNode);
|
||||
rdata[1].buffer = InvalidBuffer;
|
||||
lastrdata = 1;
|
||||
}
|
||||
@ -1165,7 +1166,7 @@ RecordTransactionAbort(bool isSubXact)
|
||||
TransactionId xid = GetCurrentTransactionIdIfAny();
|
||||
TransactionId latestXid;
|
||||
int nrels;
|
||||
RelFileFork *rels;
|
||||
RelFileNode *rels;
|
||||
int nchildren;
|
||||
TransactionId *children;
|
||||
XLogRecData rdata[3];
|
||||
@ -1226,7 +1227,7 @@ RecordTransactionAbort(bool isSubXact)
|
||||
{
|
||||
rdata[0].next = &(rdata[1]);
|
||||
rdata[1].data = (char *) rels;
|
||||
rdata[1].len = nrels * sizeof(RelFileFork);
|
||||
rdata[1].len = nrels * sizeof(RelFileNode);
|
||||
rdata[1].buffer = InvalidBuffer;
|
||||
lastrdata = 1;
|
||||
}
|
||||
@ -2078,7 +2079,6 @@ AbortTransaction(void)
|
||||
AtEOXact_xml();
|
||||
AtEOXact_on_commit_actions(false);
|
||||
AtEOXact_Namespace(false);
|
||||
smgrabort();
|
||||
AtEOXact_Files();
|
||||
AtEOXact_ComboCid();
|
||||
AtEOXact_HashTables(false);
|
||||
@ -4239,12 +4239,17 @@ xact_redo_commit(xl_xact_commit *xlrec, TransactionId xid)
|
||||
/* Make sure files supposed to be dropped are dropped */
|
||||
for (i = 0; i < xlrec->nrels; i++)
|
||||
{
|
||||
SMgrRelation srel;
|
||||
SMgrRelation srel = smgropen(xlrec->xnodes[i]);
|
||||
ForkNumber fork;
|
||||
|
||||
XLogDropRelation(xlrec->xnodes[i].rnode, xlrec->xnodes[i].forknum);
|
||||
|
||||
srel = smgropen(xlrec->xnodes[i].rnode);
|
||||
smgrdounlink(srel, xlrec->xnodes[i].forknum, false, true);
|
||||
for (fork = 0; fork <= MAX_FORKNUM; fork++)
|
||||
{
|
||||
if (smgrexists(srel, fork))
|
||||
{
|
||||
XLogDropRelation(xlrec->xnodes[i], fork);
|
||||
smgrdounlink(srel, fork, false, true);
|
||||
}
|
||||
}
|
||||
smgrclose(srel);
|
||||
}
|
||||
}
|
||||
@ -4277,12 +4282,17 @@ xact_redo_abort(xl_xact_abort *xlrec, TransactionId xid)
|
||||
/* Make sure files supposed to be dropped are dropped */
|
||||
for (i = 0; i < xlrec->nrels; i++)
|
||||
{
|
||||
SMgrRelation srel;
|
||||
SMgrRelation srel = smgropen(xlrec->xnodes[i]);
|
||||
ForkNumber fork;
|
||||
|
||||
XLogDropRelation(xlrec->xnodes[i].rnode, xlrec->xnodes[i].forknum);
|
||||
|
||||
srel = smgropen(xlrec->xnodes[i].rnode);
|
||||
smgrdounlink(srel, xlrec->xnodes[i].forknum, false, true);
|
||||
for (fork = 0; fork <= MAX_FORKNUM; fork++)
|
||||
{
|
||||
if (smgrexists(srel, fork))
|
||||
{
|
||||
XLogDropRelation(xlrec->xnodes[i], fork);
|
||||
smgrdounlink(srel, fork, false, true);
|
||||
}
|
||||
}
|
||||
smgrclose(srel);
|
||||
}
|
||||
}
|
||||
@ -4339,8 +4349,7 @@ xact_desc_commit(StringInfo buf, xl_xact_commit *xlrec)
|
||||
appendStringInfo(buf, "; rels:");
|
||||
for (i = 0; i < xlrec->nrels; i++)
|
||||
{
|
||||
char *path = relpath(xlrec->xnodes[i].rnode,
|
||||
xlrec->xnodes[i].forknum);
|
||||
char *path = relpath(xlrec->xnodes[i], MAIN_FORKNUM);
|
||||
appendStringInfo(buf, " %s", path);
|
||||
pfree(path);
|
||||
}
|
||||
@ -4367,8 +4376,7 @@ xact_desc_abort(StringInfo buf, xl_xact_abort *xlrec)
|
||||
appendStringInfo(buf, "; rels:");
|
||||
for (i = 0; i < xlrec->nrels; i++)
|
||||
{
|
||||
char *path = relpath(xlrec->xnodes[i].rnode,
|
||||
xlrec->xnodes[i].forknum);
|
||||
char *path = relpath(xlrec->xnodes[i], MAIN_FORKNUM);
|
||||
appendStringInfo(buf, " %s", path);
|
||||
pfree(path);
|
||||
}
|
||||
|
||||
@ -11,7 +11,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/xlogutils.c,v 1.62 2008/11/11 13:19:16 heikki Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.63 2008/11/19 10:34:50 heikki Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -273,7 +273,7 @@ XLogReadBufferExtended(RelFileNode rnode, ForkNumber forknum,
|
||||
* filesystem loses an inode during a crash. Better to write the data
|
||||
* until we are actually told to delete the file.)
|
||||
*/
|
||||
smgrcreate(smgr, forknum, false, true);
|
||||
smgrcreate(smgr, forknum, true);
|
||||
|
||||
lastblock = smgrnblocks(smgr, forknum);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user