In PrepareToInvalidateCacheTuple, don't force initialization of catalog

tglsfdc · tglsfdc · commit 649e856c33c1 · 2008-03-05T17:01:26.000Z
caches that we don't actually need to touch.  This saves some trivial
number of cycles and avoids certain cases of deadlock when doing concurrent
VACUUM FULL on system catalogs.  Per report from Gavin Roy.

Backpatch to 8.2.  In earlier versions, CatalogCacheInitializeCache didn't
lock the relation so there's no deadlock risk (though that certainly had
plenty of risks of its own).
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.140 2008/01/01 19:45:53 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.141 2008/03/05 17:01:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1781,13 +1781,13 @@ PrepareToInvalidateCacheTuple(Relation relation,
 
 	for (ccp = CacheHdr->ch_caches; ccp; ccp = ccp->cc_next)
 	{
+		if (ccp->cc_reloid != reloid)
+			continue;
+
 		/* Just in case cache hasn't finished initialization yet... */
 		if (ccp->cc_tupdesc == NULL)
 			CatalogCacheInitializeCache(ccp);
 
-		if (ccp->cc_reloid != reloid)
-			continue;
-
 		(*function) (ccp->id,
 					 CatalogCacheComputeTupleHashValue(ccp, tuple),
 					 &tuple->t_self,

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.140 2008/01/01 19:45:53 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.141 2008/03/05 17:01:26 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1781,13 +1781,13 @@ PrepareToInvalidateCacheTuple(Relation relation,`
`1781`	`1781`
`1782`	`1782`	`for (ccp = CacheHdr->ch_caches; ccp; ccp = ccp->cc_next)`
`1783`	`1783`	`{`
	`1784`	`+ if (ccp->cc_reloid != reloid)`
	`1785`	`+ continue;`
	`1786`	`+`
`1784`	`1787`	`/* Just in case cache hasn't finished initialization yet... */`
`1785`	`1788`	`if (ccp->cc_tupdesc == NULL)`
`1786`	`1789`	`CatalogCacheInitializeCache(ccp);`
`1787`	`1790`
`1788`		`- if (ccp->cc_reloid != reloid)`
`1789`		`- continue;`
`1790`		`-`
`1791`	`1791`	`(*function) (ccp->id,`
`1792`	`1792`	`CatalogCacheComputeTupleHashValue(ccp, tuple),`
`1793`	`1793`	`&tuple->t_self,`