diff options
Diffstat (limited to 'src/backend/access/transam/twophase.c')
| -rw-r--r-- | src/backend/access/transam/twophase.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 75551f60cbc..41b31c5c6f1 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -204,7 +204,7 @@ static void RecordTransactionCommitPrepared(TransactionId xid, int nchildren, TransactionId *children, int nrels, - RelFileNode *rels, + RelFileLocator *rels, int nstats, xl_xact_stats_item *stats, int ninvalmsgs, @@ -215,7 +215,7 @@ static void RecordTransactionAbortPrepared(TransactionId xid, int nchildren, TransactionId *children, int nrels, - RelFileNode *rels, + RelFileLocator *rels, int nstats, xl_xact_stats_item *stats, const char *gid); @@ -951,8 +951,8 @@ TwoPhaseGetDummyProc(TransactionId xid, bool lock_held) * * 1. TwoPhaseFileHeader * 2. TransactionId[] (subtransactions) - * 3. RelFileNode[] (files to be deleted at commit) - * 4. RelFileNode[] (files to be deleted at abort) + * 3. RelFileLocator[] (files to be deleted at commit) + * 4. RelFileLocator[] (files to be deleted at abort) * 5. SharedInvalidationMessage[] (inval messages to be sent at commit) * 6. TwoPhaseRecordOnDisk * 7. ... @@ -1047,8 +1047,8 @@ StartPrepare(GlobalTransaction gxact) TransactionId xid = gxact->xid; TwoPhaseFileHeader hdr; TransactionId *children; - RelFileNode *commitrels; - RelFileNode *abortrels; + RelFileLocator *commitrels; + RelFileLocator *abortrels; xl_xact_stats_item *abortstats = NULL; xl_xact_stats_item *commitstats = NULL; SharedInvalidationMessage *invalmsgs; @@ -1102,12 +1102,12 @@ StartPrepare(GlobalTransaction gxact) } if (hdr.ncommitrels > 0) { - save_state_data(commitrels, hdr.ncommitrels * sizeof(RelFileNode)); + save_state_data(commitrels, hdr.ncommitrels * sizeof(RelFileLocator)); pfree(commitrels); } if (hdr.nabortrels > 0) { - save_state_data(abortrels, hdr.nabortrels * sizeof(RelFileNode)); + save_state_data(abortrels, hdr.nabortrels * sizeof(RelFileLocator)); pfree(abortrels); } if (hdr.ncommitstats > 0) @@ -1489,9 +1489,9 @@ FinishPreparedTransaction(const char *gid, bool isCommit) TwoPhaseFileHeader *hdr; TransactionId latestXid; TransactionId *children; - RelFileNode *commitrels; - RelFileNode *abortrels; - RelFileNode *delrels; + RelFileLocator *commitrels; + RelFileLocator *abortrels; + RelFileLocator *delrels; int ndelrels; xl_xact_stats_item *commitstats; xl_xact_stats_item *abortstats; @@ -1525,10 +1525,10 @@ FinishPreparedTransaction(const char *gid, bool isCommit) bufptr += MAXALIGN(hdr->gidlen); children = (TransactionId *) bufptr; bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId)); - commitrels = (RelFileNode *) bufptr; - bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode)); - abortrels = (RelFileNode *) bufptr; - bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode)); + commitrels = (RelFileLocator *) bufptr; + bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileLocator)); + abortrels = (RelFileLocator *) bufptr; + bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileLocator)); commitstats = (xl_xact_stats_item *) bufptr; bufptr += MAXALIGN(hdr->ncommitstats * sizeof(xl_xact_stats_item)); abortstats = (xl_xact_stats_item *) bufptr; @@ -2100,8 +2100,8 @@ RecoverPreparedTransactions(void) bufptr += MAXALIGN(hdr->gidlen); subxids = (TransactionId *) bufptr; bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId)); - bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileNode)); - bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileNode)); + bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileLocator)); + bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileLocator)); bufptr += MAXALIGN(hdr->ncommitstats * sizeof(xl_xact_stats_item)); bufptr += MAXALIGN(hdr->nabortstats * sizeof(xl_xact_stats_item)); bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage)); @@ -2285,7 +2285,7 @@ RecordTransactionCommitPrepared(TransactionId xid, int nchildren, TransactionId *children, int nrels, - RelFileNode *rels, + RelFileLocator *rels, int nstats, xl_xact_stats_item *stats, int ninvalmsgs, @@ -2383,7 +2383,7 @@ RecordTransactionAbortPrepared(TransactionId xid, int nchildren, TransactionId *children, int nrels, - RelFileNode *rels, + RelFileLocator *rels, int nstats, xl_xact_stats_item *stats, const char *gid) |