From 5e48e6540a2541b01aae8514249a51729a13bf40 Mon Sep 17 00:00:00 2001
From: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Date: Fri, 2 Aug 2024 21:39:11 +0900
Subject: [PATCH v35 19/21] Add per-fork deletion support to pendingDeletes

This patch introduces the ability to handle commit-time pending
deletes on a per-fork basis.
---
 src/backend/access/transam/twophase.c | 10 ++++-
 src/backend/access/transam/xact.c     |  2 +-
 src/backend/catalog/storage.c         | 64 +++++++++++++++++++++++----
 src/include/catalog/storage.h         |  3 +-
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 4def078b652..817d8cad587 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -1088,6 +1088,7 @@ StartPrepare(GlobalTransaction gxact)
 	TwoPhaseFileHeader hdr;
 	TransactionId *children;
 	RelFileLocator *commitrels;
+	ForkBitmap	   *commitforks;
 
 	xl_xact_stats_item *abortstats = NULL;
 	xl_xact_stats_item *commitstats = NULL;
@@ -1114,7 +1115,8 @@ StartPrepare(GlobalTransaction gxact)
 	hdr.prepared_at = gxact->prepared_at;
 	hdr.owner = gxact->owner;
 	hdr.nsubxacts = xactGetCommittedChildren(&children);
-	hdr.ncommitrels = smgrGetCommitPendingDeletes(&commitrels);
+	hdr.ncommitrels = smgrGetCommitPendingDeletes(&commitrels, &commitforks);
+	hdr.comhasforks = (commitforks != NULL);
 	hdr.ncommitstats =
 		pgstat_get_transactional_drops(true, &commitstats);
 	hdr.nabortstats =
@@ -1143,6 +1145,12 @@ 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.ncommitstats > 0)
 	{
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index c1acb41d24a..6ba9dc97aeb 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -1347,7 +1347,7 @@ RecordTransactionCommit(void)
 		LogLogicalInvalidations();
 
 	/* Get data needed for commit record */
-	nrels = smgrGetCommitPendingDeletes(&rels);
+	nrels = smgrGetCommitPendingDeletes(&rels, &forks);
 	nchildren = xactGetCommittedChildren(&children);
 	ndroppedstats = pgstat_get_transactional_drops(true, &droppedstats);
 	if (XLogStandbyInfoActive())
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 279b1f7917f..10ab5baf97a 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -64,6 +64,7 @@ int			wal_skip_threshold = 2048;	/* in kilobytes */
 typedef struct PendingRelDelete
 {
 	RelFileLocator rlocator;	/* relation that may need to be deleted */
+	ForkBitmap	forks;			/* fork bitmap */
 	ProcNumber	procNumber;		/* INVALID_PROC_NUMBER if not a temp rel */
 	int			nestLevel;		/* xact nesting level of request */
 	struct PendingRelDelete *next;	/* linked-list link */
@@ -257,6 +258,7 @@ RelationDropStorage(Relation rel)
 	pending = (PendingRelDelete *)
 		MemoryContextAlloc(TopMemoryContext, sizeof(PendingRelDelete));
 	pending->rlocator = rel->rd_locator;
+	pending->forks	= FORKBITMAP_ALLFORKS();
 	pending->procNumber = rel->rd_backend;
 	pending->nestLevel = GetCurrentTransactionNestLevel();
 	pending->next = pendingDeletes;
@@ -306,6 +308,8 @@ RelationPreserveStorageOnCommit(RelFileLocator rlocator)
 		next = pending->next;
 		if (RelFileLocatorEquals(rlocator, pending->rlocator))
 		{
+			Assert(pending->forks == FORKBITMAP_ALLFORKS());
+
 			/* unlink and delete list entry */
 			if (prev)
 				prev->next = next;
@@ -677,8 +681,9 @@ SerializePendingSyncs(Size maxSize, char *startAddress)
 
 	/* remove deleted rnodes */
 	for (delete = pendingDeletes; delete != NULL; delete = delete->next)
-		(void) hash_search(tmphash, &delete->rlocator,
-						   HASH_REMOVE, NULL);
+		if (delete->forks == FORKBITMAP_ALLFORKS())
+			(void) hash_search(tmphash, &delete->rlocator,
+							   HASH_REMOVE, NULL);
 
 	hash_seq_init(&scan, tmphash);
 	while ((src = (RelFileLocator *) hash_seq_search(&scan)))
@@ -730,6 +735,7 @@ smgrDoPendingDeletes(bool isCommit)
 	int			nrels = 0,
 				maxrels = 0;
 	SMgrRelation *srels = NULL;
+	ForkBitmap	 *forks = NULL;
 
 	prev = NULL;
 	for (pending = pendingDeletes; pending != NULL; pending = next)
@@ -752,6 +758,8 @@ smgrDoPendingDeletes(bool isCommit)
 			{
 				SMgrRelation srel;
 
+				Assert(pending->forks == FORKBITMAP_ALLFORKS());
+
 				srel = smgropen(pending->rlocator, pending->procNumber);
 
 				/* allocate the initial array, or extend it, if needed */
@@ -764,8 +772,26 @@ smgrDoPendingDeletes(bool isCommit)
 				{
 					maxrels *= 2;
 					srels = repalloc(srels, sizeof(SMgrRelation) * maxrels);
+
+					/* expand forks array if any */
+					if (forks)
+						forks = repalloc(forks, sizeof(ForkBitmap) * maxrels);
 				}
 
+				/* Create forks array on encountering partial forks. */
+				Assert((pending->forks & ~FORKBITMAP_ALLFORKS()) == 0);
+				if (!forks && pending->forks != FORKBITMAP_ALLFORKS())
+				{
+					forks = palloc(sizeof(ForkBitmap) * maxrels);
+
+					/* fill in the past elements */
+					for (int i = 0 ; i < nrels ; i++)
+						forks[i] = FORKBITMAP_ALLFORKS();
+				}
+
+				if (forks)
+					forks[nrels] = pending->forks;
+
 				srels[nrels++] = srel;
 			}
 			/* must explicitly free the list entry */
@@ -776,12 +802,15 @@ smgrDoPendingDeletes(bool isCommit)
 
 	if (nrels > 0)
 	{
-		smgrdounlinkall(srels, NULL, nrels, false);
+		smgrdounlinkall(srels, forks, nrels, false);
 
 		for (int i = 0; i < nrels; i++)
 			smgrclose(srels[i]);
 
 		pfree(srels);
+
+		if (forks)
+			pfree(forks);
 	}
 }
 
@@ -940,34 +969,53 @@ smgrDoPendingSyncs(bool isCommit, bool isParallelWorker)
  * by upper-level transactions.
  */
 int
-smgrGetCommitPendingDeletes(RelFileLocator **ptr)
+smgrGetCommitPendingDeletes(RelFileLocator **ptr, ForkBitmap **fptr)
 {
 	int			nestLevel = GetCurrentTransactionNestLevel();
 	int			nrels;
+	bool		hasforks = false;
 	RelFileLocator *rptr;
+	ForkBitmap	   *rfptr = NULL;
 	PendingRelDelete *pending;
 
 	nrels = 0;
 	for (pending = pendingDeletes; pending != NULL; pending = pending->next)
 	{
-		if (pending->nestLevel >= nestLevel
-			&& pending->procNumber == INVALID_PROC_NUMBER)
+		Assert((pending->forks & ~FORKBITMAP_ALLFORKS()) == 0);
+
+		if (pending->nestLevel >= nestLevel)
+		{
 			nrels++;
+
+			if (pending->forks != FORKBITMAP_ALLFORKS())
+				hasforks = true;
+		}
 	}
 	if (nrels == 0)
 	{
 		*ptr = NULL;
+		*fptr = NULL;
 		return 0;
 	}
 	rptr = (RelFileLocator *) palloc(nrels * sizeof(RelFileLocator));
 	*ptr = rptr;
+
+	if (hasforks)
+		rfptr = (ForkBitmap *) palloc(nrels * sizeof(ForkBitmap));
+	*fptr = rfptr;
+
 	for (pending = pendingDeletes; pending != NULL; pending = pending->next)
 	{
-		if (pending->nestLevel >= nestLevel
-			&& pending->procNumber == INVALID_PROC_NUMBER)
+		if (pending->nestLevel >= nestLevel)
 		{
 			*rptr = pending->rlocator;
 			rptr++;
+
+			if (rfptr)
+			{
+				*rfptr = pending->forks;
+				rfptr++;
+			}
 		}
 	}
 	return nrels;
diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h
index 19b02d84a5f..a1abd614cdc 100644
--- a/src/include/catalog/storage.h
+++ b/src/include/catalog/storage.h
@@ -44,7 +44,8 @@ extern void RestorePendingSyncs(char *startAddress);
  */
 extern void smgrDoPendingDeletes(bool isCommit);
 extern void smgrDoPendingSyncs(bool isCommit, bool isParallelWorker);
-extern int	smgrGetCommitPendingDeletes(RelFileLocator **ptr);
+extern int	smgrGetCommitPendingDeletes(RelFileLocator **ptr,
+										ForkBitmap **fptr);
 extern void AtSubCommit_smgr(void);
 extern void AtSubAbort_smgr(void);
 extern void PostPrepare_smgr(void);
-- 
2.43.5

