From cc35312154846bfbc5d2924bdc60b5ac67da093e Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Date: Fri, 2 Aug 2024 20:51:31 +0900
Subject: [PATCH v34 13/16] Enable commit records to handle fork removals

Currently, COMMIT/ABORT WAL records store relation locators that need
to be removed upon commit. This patch adds support for handling these
removals on a per-fork basis. While the PREPARE record can store the
same information, it is not used.
---
 src/backend/access/rmgrdesc/xactdesc.c | 50 ++++++++++++++++++++---
 src/backend/access/transam/twophase.c  | 56 ++++++++++++++++++++++----
 src/backend/access/transam/xact.c      | 30 +++++++++++---
 src/backend/storage/buffer/bufmgr.c    |  2 +-
 src/backend/storage/smgr/md.c          | 11 +++--
 src/include/access/xact.h              |  8 ++++
 src/include/storage/md.h               |  3 +-
 7 files changed, 137 insertions(+), 23 deletions(-)

diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c
index dccca201e0..ac3815fc57 100644
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@ -82,6 +82,12 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 
 		data += MinSizeOfXactRelfileLocators;
 		data += xl_rellocators->nrels * sizeof(RelFileLocator);
+
+		if (parsed->xinfo & XACT_XINFO_HAS_RELFILEFORKS)
+		{
+			parsed->xforks = (ForkBitmap *)data;
+			data += xl_rellocators->nrels * sizeof(ForkBitmap);
+		}
 	}
 
 	if (parsed->xinfo & XACT_XINFO_HAS_DROPPED_STATS)
@@ -188,6 +194,12 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 
 		data += MinSizeOfXactRelfileLocators;
 		data += xl_rellocator->nrels * sizeof(RelFileLocator);
+
+		if (parsed->xinfo & XACT_XINFO_HAS_RELFILEFORKS)
+		{
+			parsed->xforks = (ForkBitmap *)data;
+			data += xl_rellocator->nrels * sizeof(ForkBitmap);
+		}
 	}
 
 	if (parsed->xinfo & XACT_XINFO_HAS_DROPPED_STATS)
@@ -263,9 +275,21 @@ ParsePrepareRecord(uint8 info, xl_xact_prepare *xlrec, xl_xact_parsed_prepare *p
 	parsed->xlocators = (RelFileLocator *) bufptr;
 	bufptr += MAXALIGN(xlrec->ncommitrels * sizeof(RelFileLocator));
 
+	if (xlrec->comhasforks)
+	{
+		parsed->xforks = (ForkBitmap *) bufptr;
+		bufptr += MAXALIGN(xlrec->ncommitrels * sizeof(ForkBitmap));
+	}
+
 	parsed->abortlocators = (RelFileLocator *) bufptr;
 	bufptr += MAXALIGN(xlrec->nabortrels * sizeof(RelFileLocator));
 
+	if (xlrec->abohasforks)
+	{
+		parsed->abortforks = (ForkBitmap *) bufptr;
+		bufptr += MAXALIGN(xlrec->nabortrels * sizeof(ForkBitmap));
+	}
+
 	parsed->stats = (xl_xact_stats_item *) bufptr;
 	bufptr += MAXALIGN(xlrec->ncommitstats * sizeof(xl_xact_stats_item));
 
@@ -278,7 +302,7 @@ ParsePrepareRecord(uint8 info, xl_xact_prepare *xlrec, xl_xact_parsed_prepare *p
 
 static void
 xact_desc_relations(StringInfo buf, char *label, int nrels,
-					RelFileLocator *xlocators)
+					RelFileLocator *xlocators, ForkBitmap *xforks)
 {
 	int			i;
 
@@ -291,6 +315,19 @@ xact_desc_relations(StringInfo buf, char *label, int nrels,
 
 			appendStringInfo(buf, " %s", path);
 			pfree(path);
+
+			if (xforks)
+			{
+				char delim = ':';
+				for (int j = 0 ; j <= MAX_FORKNUM ; j++)
+				{
+					if (FORKBITMAP_ISSET(xforks[i], j))
+					{
+						appendStringInfo(buf, "%c%d", delim, j);
+						delim = ',';
+					}
+				}
+			}
 		}
 	}
 }
@@ -340,7 +377,8 @@ xact_desc_commit(StringInfo buf, uint8 info, xl_xact_commit *xlrec, RepOriginId
 
 	appendStringInfoString(buf, timestamptz_to_str(xlrec->xact_time));
 
-	xact_desc_relations(buf, "rels", parsed.nrels, parsed.xlocators);
+	xact_desc_relations(buf, "rels",
+						parsed.nrels, parsed.xlocators, parsed.xforks);
 	xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
 	xact_desc_stats(buf, "", parsed.nstats, parsed.stats);
 
@@ -376,7 +414,8 @@ xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort *xlrec, RepOriginId or
 
 	appendStringInfoString(buf, timestamptz_to_str(xlrec->xact_time));
 
-	xact_desc_relations(buf, "rels", parsed.nrels, parsed.xlocators);
+	xact_desc_relations(buf, "rels",
+						parsed.nrels, parsed.xlocators, parsed.xforks);
 	xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
 
 	if (parsed.xinfo & XACT_XINFO_HAS_ORIGIN)
@@ -400,9 +439,10 @@ xact_desc_prepare(StringInfo buf, uint8 info, xl_xact_prepare *xlrec, RepOriginI
 	appendStringInfo(buf, "gid %s: ", parsed.twophase_gid);
 	appendStringInfoString(buf, timestamptz_to_str(parsed.xact_time));
 
-	xact_desc_relations(buf, "rels(commit)", parsed.nrels, parsed.xlocators);
+	xact_desc_relations(buf, "rels(commit)", parsed.nrels,
+						parsed.xlocators, parsed.xforks);
 	xact_desc_relations(buf, "rels(abort)", parsed.nabortrels,
-						parsed.abortlocators);
+						parsed.abortlocators, parsed.abortforks);
 	xact_desc_stats(buf, "commit ", parsed.nstats, parsed.stats);
 	xact_desc_stats(buf, "abort ", parsed.nabortstats, parsed.abortstats);
 	xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 24285c7d20..6ac1fbfa24 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -203,6 +203,7 @@ static void RecordTransactionCommitPrepared(TransactionId xid,
 											TransactionId *children,
 											int nrels,
 											RelFileLocator *rels,
+											ForkBitmap *forks,
 											int nstats,
 											xl_xact_stats_item *stats,
 											int ninvalmsgs,
@@ -214,6 +215,7 @@ static void RecordTransactionAbortPrepared(TransactionId xid,
 										   TransactionId *children,
 										   int nrels,
 										   RelFileLocator *rels,
+										   ForkBitmap	  *forks,
 										   int nstats,
 										   xl_xact_stats_item *stats,
 										   const char *gid);
@@ -1070,7 +1072,9 @@ StartPrepare(GlobalTransaction gxact)
 	TwoPhaseFileHeader hdr;
 	TransactionId *children;
 	RelFileLocator *commitrels;
+	ForkBitmap	   *commitforks = NULL;
 	RelFileLocator *abortrels;
+	ForkBitmap	   *abortforks = NULL;
 	xl_xact_stats_item *abortstats = NULL;
 	xl_xact_stats_item *commitstats = NULL;
 	SharedInvalidationMessage *invalmsgs;
@@ -1097,7 +1101,9 @@ StartPrepare(GlobalTransaction gxact)
 	hdr.owner = gxact->owner;
 	hdr.nsubxacts = xactGetCommittedChildren(&children);
 	hdr.ncommitrels = smgrGetPendingDeletes(true, &commitrels);
+	hdr.comhasforks = (commitforks != NULL);
 	hdr.nabortrels = smgrGetPendingDeletes(false, &abortrels);
+	hdr.abohasforks = (abortforks != NULL);
 	hdr.ncommitstats =
 		pgstat_get_transactional_drops(true, &commitstats);
 	hdr.nabortstats =
@@ -1126,11 +1132,23 @@ StartPrepare(GlobalTransaction gxact)
 	{
 		save_state_data(commitrels, hdr.ncommitrels * sizeof(RelFileLocator));
 		pfree(commitrels);
+
+		if (hdr.comhasforks)
+		{
+			save_state_data(commitforks, hdr.ncommitrels * sizeof(ForkBitmap));
+			pfree(commitforks);
+		}
 	}
 	if (hdr.nabortrels > 0)
 	{
 		save_state_data(abortrels, hdr.nabortrels * sizeof(RelFileLocator));
 		pfree(abortrels);
+
+		if (hdr.abohasforks)
+		{
+			save_state_data(abortforks, hdr.nabortrels * sizeof(ForkBitmap));
+			pfree(abortforks);
+		}
 	}
 	if (hdr.ncommitstats > 0)
 	{
@@ -1512,8 +1530,11 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	TransactionId latestXid;
 	TransactionId *children;
 	RelFileLocator *commitrels;
+	ForkBitmap	   *commitforks = NULL;
 	RelFileLocator *abortrels;
+	ForkBitmap	   *abortforks = NULL;
 	RelFileLocator *delrels;
+	ForkBitmap	   *delforks;
 	int			ndelrels;
 	xl_xact_stats_item *commitstats;
 	xl_xact_stats_item *abortstats;
@@ -1549,8 +1570,18 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId));
 	commitrels = (RelFileLocator *) bufptr;
 	bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileLocator));
+	if (hdr->comhasforks)
+	{
+		commitforks = (ForkBitmap *) bufptr;
+		bufptr += MAXALIGN(hdr->ncommitrels * sizeof(ForkBitmap));
+	}
 	abortrels = (RelFileLocator *) bufptr;
 	bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileLocator));
+	if (hdr->abohasforks)
+	{
+		abortforks = (ForkBitmap *) bufptr;
+		bufptr += MAXALIGN(hdr->nabortrels * sizeof(ForkBitmap));
+	}
 	commitstats = (xl_xact_stats_item *) bufptr;
 	bufptr += MAXALIGN(hdr->ncommitstats * sizeof(xl_xact_stats_item));
 	abortstats = (xl_xact_stats_item *) bufptr;
@@ -1575,7 +1606,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	if (isCommit)
 		RecordTransactionCommitPrepared(xid,
 										hdr->nsubxacts, children,
-										hdr->ncommitrels, commitrels,
+										hdr->ncommitrels,
+										commitrels, commitforks,
 										hdr->ncommitstats,
 										commitstats,
 										hdr->ninvalmsgs, invalmsgs,
@@ -1583,7 +1615,8 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	else
 		RecordTransactionAbortPrepared(xid,
 									   hdr->nsubxacts, children,
-									   hdr->nabortrels, abortrels,
+									   hdr->nabortrels,
+									   abortrels, abortforks,
 									   hdr->nabortstats,
 									   abortstats,
 									   gid);
@@ -1604,6 +1637,9 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	 */
 	gxact->valid = false;
 
+	/* Currently, prepare info should not have per-fork storage information. */
+	Assert(!commitforks && !abortforks);
+
 	/*
 	 * We have to remove any files that were supposed to be dropped. For
 	 * consistency with the regular xact.c code paths, must do this before
@@ -1614,16 +1650,18 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
 	if (isCommit)
 	{
 		delrels = commitrels;
+		delforks = commitforks;
 		ndelrels = hdr->ncommitrels;
 	}
 	else
 	{
 		delrels = abortrels;
+		delforks = abortforks;
 		ndelrels = hdr->nabortrels;
 	}
 
 	/* Make sure files supposed to be dropped are dropped */
-	DropRelationFiles(delrels, ndelrels, false);
+	DropRelationFiles(delrels, delforks, ndelrels, false);
 
 	if (isCommit)
 		pgstat_execute_transactional_drops(hdr->ncommitstats, commitstats, false);
@@ -2128,7 +2166,11 @@ RecoverPreparedTransactions(void)
 		subxids = (TransactionId *) bufptr;
 		bufptr += MAXALIGN(hdr->nsubxacts * sizeof(TransactionId));
 		bufptr += MAXALIGN(hdr->ncommitrels * sizeof(RelFileLocator));
+		if (hdr->comhasforks)
+			bufptr += MAXALIGN(hdr->ncommitrels * sizeof(ForkBitmap));
 		bufptr += MAXALIGN(hdr->nabortrels * sizeof(RelFileLocator));
+		if (hdr->abohasforks)
+			bufptr += MAXALIGN(hdr->nabortrels * sizeof(ForkBitmap));
 		bufptr += MAXALIGN(hdr->ncommitstats * sizeof(xl_xact_stats_item));
 		bufptr += MAXALIGN(hdr->nabortstats * sizeof(xl_xact_stats_item));
 		bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
@@ -2312,7 +2354,7 @@ RecordTransactionCommitPrepared(TransactionId xid,
 								int nchildren,
 								TransactionId *children,
 								int nrels,
-								RelFileLocator *rels,
+								RelFileLocator *rels, ForkBitmap *forks,
 								int nstats,
 								xl_xact_stats_item *stats,
 								int ninvalmsgs,
@@ -2343,7 +2385,7 @@ RecordTransactionCommitPrepared(TransactionId xid,
 	 * not they do.
 	 */
 	recptr = XactLogCommitRecord(committs,
-								 nchildren, children, nrels, rels,
+								 nchildren, children, nrels, rels, forks,
 								 nstats, stats,
 								 ninvalmsgs, invalmsgs,
 								 initfileinval,
@@ -2410,7 +2452,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
 							   int nchildren,
 							   TransactionId *children,
 							   int nrels,
-							   RelFileLocator *rels,
+							   RelFileLocator *rels, ForkBitmap *forks,
 							   int nstats,
 							   xl_xact_stats_item *stats,
 							   const char *gid)
@@ -2442,7 +2484,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
 	 */
 	recptr = XactLogAbortRecord(GetCurrentTimestamp(),
 								nchildren, children,
-								nrels, rels,
+								nrels, rels, forks,
 								nstats, stats,
 								MyXactFlags | XACT_FLAGS_ACQUIREDACCESSEXCLUSIVELOCK,
 								xid, gid);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 1e1f86e578..3a594325d2 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1325,6 +1325,7 @@ RecordTransactionCommit(void)
 	TransactionId latestXid = InvalidTransactionId;
 	int			nrels;
 	RelFileLocator *rels;
+	ForkBitmap	   *forks = NULL;
 	int			nchildren;
 	TransactionId *children;
 	int			ndroppedstats = 0;
@@ -1436,7 +1437,7 @@ RecordTransactionCommit(void)
 		 * Insert the commit XLOG record.
 		 */
 		XactLogCommitRecord(GetCurrentTransactionStopTimestamp(),
-							nchildren, children, nrels, rels,
+							nchildren, children, nrels, rels, forks,
 							ndroppedstats, droppedstats,
 							nmsgs, invalMessages,
 							RelcacheInitFileInval,
@@ -1753,6 +1754,7 @@ RecordTransactionAbort(bool isSubXact)
 	TransactionId latestXid;
 	int			nrels;
 	RelFileLocator *rels;
+	ForkBitmap	   *forks = NULL;
 	int			ndroppedstats = 0;
 	xl_xact_stats_item *droppedstats = NULL;
 	int			nchildren;
@@ -1814,7 +1816,7 @@ RecordTransactionAbort(bool isSubXact)
 
 	XactLogAbortRecord(xact_time,
 					   nchildren, children,
-					   nrels, rels,
+					   nrels, rels, forks,
 					   ndroppedstats, droppedstats,
 					   MyXactFlags, InvalidTransactionId,
 					   NULL);
@@ -5844,7 +5846,7 @@ xactGetCommittedChildren(TransactionId **ptr)
 XLogRecPtr
 XactLogCommitRecord(TimestampTz commit_time,
 					int nsubxacts, TransactionId *subxacts,
-					int nrels, RelFileLocator *rels,
+					int nrels, RelFileLocator *rels, ForkBitmap *forks,
 					int ndroppedstats, xl_xact_stats_item *droppedstats,
 					int nmsgs, SharedInvalidationMessage *msgs,
 					bool relcacheInval,
@@ -5912,6 +5914,9 @@ XactLogCommitRecord(TimestampTz commit_time,
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_RELFILELOCATORS;
 		xl_relfilelocators.nrels = nrels;
 		info |= XLR_SPECIAL_REL_UPDATE;
+
+		if (forks)
+			xl_xinfo.xinfo |= XACT_XINFO_HAS_RELFILEFORKS;
 	}
 
 	if (ndroppedstats > 0)
@@ -5974,6 +5979,10 @@ XactLogCommitRecord(TimestampTz commit_time,
 						 MinSizeOfXactRelfileLocators);
 		XLogRegisterData((char *) rels,
 						 nrels * sizeof(RelFileLocator));
+
+		if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILEFORKS)
+			XLogRegisterData((char *) forks,
+							 nrels * sizeof(ForkBitmap));
 	}
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_DROPPED_STATS)
@@ -6016,7 +6025,7 @@ XactLogCommitRecord(TimestampTz commit_time,
 XLogRecPtr
 XactLogAbortRecord(TimestampTz abort_time,
 				   int nsubxacts, TransactionId *subxacts,
-				   int nrels, RelFileLocator *rels,
+				   int nrels, RelFileLocator *rels, ForkBitmap *forks,
 				   int ndroppedstats, xl_xact_stats_item *droppedstats,
 				   int xactflags, TransactionId twophase_xid,
 				   const char *twophase_gid)
@@ -6061,6 +6070,9 @@ XactLogAbortRecord(TimestampTz abort_time,
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_RELFILELOCATORS;
 		xl_relfilelocators.nrels = nrels;
 		info |= XLR_SPECIAL_REL_UPDATE;
+
+		if (forks)
+			xl_xinfo.xinfo |= XACT_XINFO_HAS_RELFILEFORKS;
 	}
 
 	if (ndroppedstats > 0)
@@ -6127,6 +6139,10 @@ XactLogAbortRecord(TimestampTz abort_time,
 						 MinSizeOfXactRelfileLocators);
 		XLogRegisterData((char *) rels,
 						 nrels * sizeof(RelFileLocator));
+
+		if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILEFORKS)
+			XLogRegisterData((char *) forks,
+							 nrels * sizeof(ForkBitmap));
 	}
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_DROPPED_STATS)
@@ -6267,7 +6283,8 @@ xact_redo_commit(xl_xact_parsed_commit *parsed,
 		XLogFlush(lsn);
 
 		/* Make sure files supposed to be dropped are dropped */
-		DropRelationFiles(parsed->xlocators, parsed->nrels, true);
+		DropRelationFiles(parsed->xlocators, parsed->xforks, parsed->nrels,
+						  true);
 	}
 
 	SimpleUndoLog_UndoByXid(true, xid, parsed->nsubxacts, parsed->subxacts);
@@ -6381,7 +6398,8 @@ xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid,
 		 */
 		XLogFlush(lsn);
 
-		DropRelationFiles(parsed->xlocators, parsed->nrels, true);
+		DropRelationFiles(parsed->xlocators, parsed->xforks, parsed->nrels,
+						  true);
 	}
 
 	SimpleUndoLog_UndoByXid(false, xid, parsed->nsubxacts, parsed->subxacts);
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 3eb4a0c792..87b56403c1 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -171,7 +171,7 @@ struct copy_storage_using_buffer_read_stream_private
 typedef struct RelFileForks
 {
 	RelFileLocator rloc;	 /* key member for qsort */
-	ForkBitmap	   forks;	 /* fork number in bitmap */
+	ForkBitmap	   forks;	 /* fork numbers in bitmap */
 } RelFileForks;
 
 /*
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 5125cfe640..95bb91df50 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -1443,7 +1443,8 @@ ForgetDatabaseSyncRequests(Oid dbid)
  * DropRelationFiles -- drop files of all given relations
  */
 void
-DropRelationFiles(RelFileLocator *delrels, int ndelrels, bool isRedo)
+DropRelationFiles(RelFileLocator *delrels, ForkBitmap *delforks, int ndelrels,
+				  bool isRedo)
 {
 	SMgrRelation *srels;
 	int			i;
@@ -1457,13 +1458,17 @@ DropRelationFiles(RelFileLocator *delrels, int ndelrels, bool isRedo)
 		{
 			ForkNumber	fork;
 
+			/* Close the spacified forks at smgr level. */
 			for (fork = 0; fork <= MAX_FORKNUM; fork++)
-				XLogDropRelation(delrels[i], fork);
+			{
+				if (!delforks || FORKBITMAP_ISSET(delforks[i], fork))
+					XLogDropRelation(delrels[i], fork);
+			}
 		}
 		srels[i] = srel;
 	}
 
-	smgrdounlinkall(srels, NULL, ndelrels, isRedo);
+	smgrdounlinkall(srels, delforks, ndelrels, isRedo);
 
 	for (i = 0; i < ndelrels; i++)
 		smgrclose(srels[i]);
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 8f23611dcc..73c6dd3ba1 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -196,6 +196,7 @@ typedef struct SavedTransactionCharacteristics
 #define XACT_XINFO_HAS_AE_LOCKS			(1U << 6)
 #define XACT_XINFO_HAS_GID				(1U << 7)
 #define XACT_XINFO_HAS_DROPPED_STATS	(1U << 8)
+#define XACT_XINFO_HAS_RELFILEFORKS		(1U << 9)
 
 /*
  * Also stored in xinfo, these indicating a variety of additional actions that
@@ -355,7 +356,9 @@ typedef struct xl_xact_prepare
 	Oid			owner;			/* user running the transaction */
 	int32		nsubxacts;		/* number of following subxact XIDs */
 	int32		ncommitrels;	/* number of delete-on-commit rels */
+	bool		comhasforks;	/* commitrels is accompanied by forknums */
 	int32		nabortrels;		/* number of delete-on-abort rels */
+	bool		abohasforks;	/* abortrels is accompanied by forknums */
 	int32		ncommitstats;	/* number of stats to drop on commit */
 	int32		nabortstats;	/* number of stats to drop on abort */
 	int32		ninvalmsgs;		/* number of cache invalidation messages */
@@ -383,6 +386,7 @@ typedef struct xl_xact_parsed_commit
 
 	int			nrels;
 	RelFileLocator *xlocators;
+	ForkBitmap	   *xforks;
 
 	int			nstats;
 	xl_xact_stats_item *stats;
@@ -394,6 +398,7 @@ typedef struct xl_xact_parsed_commit
 	char		twophase_gid[GIDSIZE];	/* only for 2PC */
 	int			nabortrels;		/* only for 2PC */
 	RelFileLocator *abortlocators;	/* only for 2PC */
+	ForkBitmap	   *abortforks;	/* only for 2PC */
 	int			nabortstats;	/* only for 2PC */
 	xl_xact_stats_item *abortstats; /* only for 2PC */
 
@@ -416,6 +421,7 @@ typedef struct xl_xact_parsed_abort
 
 	int			nrels;
 	RelFileLocator *xlocators;
+	ForkBitmap	   *xforks;
 
 	int			nstats;
 	xl_xact_stats_item *stats;
@@ -499,6 +505,7 @@ extern int	xactGetCommittedChildren(TransactionId **ptr);
 extern XLogRecPtr XactLogCommitRecord(TimestampTz commit_time,
 									  int nsubxacts, TransactionId *subxacts,
 									  int nrels, RelFileLocator *rels,
+									  ForkBitmap *forks,
 									  int ndroppedstats,
 									  xl_xact_stats_item *droppedstats,
 									  int nmsgs, SharedInvalidationMessage *msgs,
@@ -510,6 +517,7 @@ extern XLogRecPtr XactLogCommitRecord(TimestampTz commit_time,
 extern XLogRecPtr XactLogAbortRecord(TimestampTz abort_time,
 									 int nsubxacts, TransactionId *subxacts,
 									 int nrels, RelFileLocator *rels,
+									 ForkBitmap *forks,
 									 int ndroppedstats,
 									 xl_xact_stats_item *droppedstats,
 									 int xactflags, TransactionId twophase_xid,
diff --git a/src/include/storage/md.h b/src/include/storage/md.h
index 620f10abde..c9166c7ac1 100644
--- a/src/include/storage/md.h
+++ b/src/include/storage/md.h
@@ -46,7 +46,8 @@ extern void mdimmedsync(SMgrRelation reln, ForkNumber forknum);
 extern void mdregistersync(SMgrRelation reln, ForkNumber forknum);
 
 extern void ForgetDatabaseSyncRequests(Oid dbid);
-extern void DropRelationFiles(RelFileLocator *delrels, int ndelrels, bool isRedo);
+extern void DropRelationFiles(RelFileLocator *delrels, ForkBitmap *delforks,
+							  int ndelrels, bool isRedo);
 
 /* md sync callbacks */
 extern int	mdsyncfiletag(const FileTag *ftag, char *path);
-- 
2.43.5

