Remove newly added useless assertion check

alvherre · alvherre · commit 21b3aa9c8faf · 2021-07-26T12:56:33.000-04:00
Coverity complained that my commit 80ba4bb added a dubious coding for a consistency check that there isn't more than one row for a certain tgrelid/tgparentid combination. But we don't check for that explicitly anywhere else, and if we were to do it, it should be a full shouldn't-happen elog not just an assert. It doesn't seem that this is very important anyway, so remove it. Discussion: https://postgr.es/m/1337562.1627224583@sss.pgh.pa.us
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
@@ -1615,7 +1615,6 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,
 	SysScanDesc tgscan;
 	ScanKeyData key;
 	HeapTuple	tuple;
-	int			found PG_USED_FOR_ASSERTS_ONLY = 0;
 
 	/*
 	 * Given a relation and the OID of a trigger on parent relation, find the
@@ -1636,8 +1635,6 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,
 		if (tgform->tgparentid != parentTriggerOid)
 			continue;			/* not our trigger */
 
-		Assert(found++ <= 0);
-
 		partitionRel = table_open(partitionId, NoLock);
 
 		/* Rename the trigger on this partition */
@@ -1658,6 +1655,9 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,
 			}
 		}
 		table_close(partitionRel, NoLock);
+
+		/* There should be at most one matching tuple */
+		break;
 	}
 	systable_endscan(tgscan);
 }

Original file line number	Diff line number	Diff line change
`@@ -1615,7 +1615,6 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,`
`1615`	`1615`	`SysScanDesc tgscan;`
`1616`	`1616`	`ScanKeyData key;`
`1617`	`1617`	`HeapTuple tuple;`
`1618`		`- int found PG_USED_FOR_ASSERTS_ONLY = 0;`
`1619`	`1618`
`1620`	`1619`	`/*`
`1621`	`1620`	`* Given a relation and the OID of a trigger on parent relation, find the`
`@@ -1636,8 +1635,6 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,`
`1636`	`1635`	`if (tgform->tgparentid != parentTriggerOid)`
`1637`	`1636`	`continue; /* not our trigger */`
`1638`	`1637`
`1639`		`- Assert(found++ <= 0);`
`1640`		`-`
`1641`	`1638`	`partitionRel = table_open(partitionId, NoLock);`
`1642`	`1639`
`1643`	`1640`	`/* Rename the trigger on this partition */`
`@@ -1658,6 +1655,9 @@ renametrig_partition(Relation tgrel, Oid partitionId, Oid parentTriggerOid,`
`1658`	`1655`	`}`
`1659`	`1656`	`}`
`1660`	`1657`	`table_close(partitionRel, NoLock);`
	`1658`	`+`
	`1659`	`+ /* There should be at most one matching tuple */`
	`1660`	`+ break;`
`1661`	`1661`	`}`
`1662`	`1662`	`systable_endscan(tgscan);`
`1663`	`1663`	`}`