Fix cosmetic blemishes involving rd_createSubid.

nmisch · nmisch · commit d60ef94d7639 · 2020-03-21T09:38:26.000-07:00
Remove an obsolete comment from AtEOXact_cleanup(). Restore formatting of a comment in struct RelationData, mangled by the pgindent run in commit 9af4159. Back-patch to 9.5 (all supported versions), because another fix stacks on this.
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -3035,10 +3035,7 @@ AtEOXact_cleanup(Relation relation, bool isCommit)
 	 *
 	 * During commit, reset the flag to zero, since we are now out of the
 	 * creating transaction.  During abort, simply delete the relcache entry
-	 * --- it isn't interesting any longer.  (NOTE: if we have forgotten the
-	 * new-ness of a new relation due to a forced cache flush, the entry will
-	 * get deleted anyway by shared-cache-inval processing of the aborted
-	 * pg_class insertion.)
+	 * --- it isn't interesting any longer.
 	 */
 	if (relation->rd_createSubid != InvalidSubTransactionId)
 	{
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
@@ -64,7 +64,7 @@ typedef struct RelationData
 								 * rd_replidindex) */
 	bool		rd_statvalid;	/* is rd_statlist valid? */
 
-	/*
+	/*----------
 	 * rd_createSubid is the ID of the highest subtransaction the rel has
 	 * survived into; or zero if the rel was not created in the current top
 	 * transaction.  This can be now be relied on, whereas previously it could
@@ -74,8 +74,13 @@ typedef struct RelationData
 	 * have forgotten changing it). rd_newRelfilenodeSubid can be forgotten
 	 * when a relation has multiple new relfilenodes within a single
 	 * transaction, with one of them occurring in a subsequently aborted
-	 * subtransaction, e.g. BEGIN; TRUNCATE t; SAVEPOINT save; TRUNCATE t;
-	 * ROLLBACK TO save; -- rd_newRelfilenodeSubid is now forgotten
+	 * subtransaction, e.g.
+	 *		BEGIN;
+	 *		TRUNCATE t;
+	 *		SAVEPOINT save;
+	 *		TRUNCATE t;
+	 *		ROLLBACK TO save;
+	 *		-- rd_newRelfilenodeSubid is now forgotten
 	 */
 	SubTransactionId rd_createSubid;	/* rel was created in current xact */
 	SubTransactionId rd_newRelfilenodeSubid;	/* new relfilenode assigned in

Original file line number	Diff line number	Diff line change
`@@ -3035,10 +3035,7 @@ AtEOXact_cleanup(Relation relation, bool isCommit)`
`3035`	`3035`	`*`
`3036`	`3036`	`* During commit, reset the flag to zero, since we are now out of the`
`3037`	`3037`	`* creating transaction. During abort, simply delete the relcache entry`
`3038`		`- * --- it isn't interesting any longer. (NOTE: if we have forgotten the`
`3039`		`- * new-ness of a new relation due to a forced cache flush, the entry will`
`3040`		`- * get deleted anyway by shared-cache-inval processing of the aborted`
`3041`		`- * pg_class insertion.)`
	`3038`	`+ * --- it isn't interesting any longer.`
`3042`	`3039`	`*/`
`3043`	`3040`	`if (relation->rd_createSubid != InvalidSubTransactionId)`
`3044`	`3041`	`{`