Fix inconsistent code with shared invalidations of snapshots

michaelpq · michaelpq · commit 7bf20c1b8a14 · 2020-12-28T22:17:16.000+09:00
The code in charge of processing a single invalidation message has been using since 568d413 the structure for relation mapping messages. This had fortunately no consequence as both locate the database ID at the same location, but it could become a problem in the future if this area of the code changes. Author: Konstantin Knizhnik Discussion: https://postgr.es/m/8044c223-4d3a-2cdb-42bf-29940840ce94@postgrespro.ru Backpatch-through: 9.5
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
@@ -609,9 +609,9 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 	else if (msg->id == SHAREDINVALSNAPSHOT_ID)
 	{
 		/* We only care about our own database and shared catalogs */
-		if (msg->rm.dbId == InvalidOid)
+		if (msg->sn.dbId == InvalidOid)
 			InvalidateCatalogSnapshot();
-		else if (msg->rm.dbId == MyDatabaseId)
+		else if (msg->sn.dbId == MyDatabaseId)
 			InvalidateCatalogSnapshot();
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -609,9 +609,9 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)`
`609`	`609`	`else if (msg->id == SHAREDINVALSNAPSHOT_ID)`
`610`	`610`	`{`
`611`	`611`	`/* We only care about our own database and shared catalogs */`
`612`		`- if (msg->rm.dbId == InvalidOid)`
	`612`	`+ if (msg->sn.dbId == InvalidOid)`
`613`	`613`	`InvalidateCatalogSnapshot();`
`614`		`- else if (msg->rm.dbId == MyDatabaseId)`
	`614`	`+ else if (msg->sn.dbId == MyDatabaseId)`
`615`	`615`	`InvalidateCatalogSnapshot();`
`616`	`616`	`}`
`617`	`617`	`else`