Fix another place that assumed 'x = lcons(y, z)' would not have any

tglsfdc · tglsfdc · commit 41accb0e1a15 · 2004-05-29T05:55:13.000Z
side-effect on the original list z.  I fear we have a few more of these
to track down yet :-(.
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.136 2004/05/26 04:41:33 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.137 2004/05/29 05:55:13 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -864,15 +864,14 @@ fireRIRrules(Query *parsetree, List *activeRIRs)
 		 */
 		if (locks != NIL)
 		{
-			List	   *newActiveRIRs;
 			ListCell   *l;
 
 			if (oidMember(RelationGetRelid(rel), activeRIRs))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
 						 errmsg("infinite recursion detected in rules for relation \"%s\"",
 								RelationGetRelationName(rel))));
-			newActiveRIRs = lconso(RelationGetRelid(rel), activeRIRs);
+			activeRIRs = lconso(RelationGetRelid(rel), activeRIRs);
 
 			foreach(l, locks)
 			{
@@ -884,8 +883,10 @@ fireRIRrules(Query *parsetree, List *activeRIRs)
 											  rule->attrno == -1,
 											  rel,
 											  relIsUsed,
-											  newActiveRIRs);
+											  activeRIRs);
 			}
+
+			activeRIRs = list_delete_first(activeRIRs);
 		}
 
 		heap_close(rel, NoLock);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.136 2004/05/26 04:41:33 neilc Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.137 2004/05/29 05:55:13 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -864,15 +864,14 @@ fireRIRrules(Query parsetree, List activeRIRs)`
`864`	`864`	`*/`
`865`	`865`	`if (locks != NIL)`
`866`	`866`	`{`
`867`		`- List *newActiveRIRs;`
`868`	`867`	`ListCell *l;`
`869`	`868`
`870`	`869`	`if (oidMember(RelationGetRelid(rel), activeRIRs))`
`871`	`870`	`ereport(ERROR,`
`872`	`871`	`(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
`873`	`872`	`errmsg("infinite recursion detected in rules for relation \"%s\"",`
`874`	`873`	`RelationGetRelationName(rel))));`
`875`		`- newActiveRIRs = lconso(RelationGetRelid(rel), activeRIRs);`
	`874`	`+ activeRIRs = lconso(RelationGetRelid(rel), activeRIRs);`
`876`	`875`
`877`	`876`	`foreach(l, locks)`
`878`	`877`	`{`
`@@ -884,8 +883,10 @@ fireRIRrules(Query parsetree, List activeRIRs)`
`884`	`883`	`rule->attrno == -1,`
`885`	`884`	`rel,`
`886`	`885`	`relIsUsed,`
`887`		`- newActiveRIRs);`
	`886`	`+ activeRIRs);`
`888`	`887`	`}`
	`888`	`+`
	`889`	`+ activeRIRs = list_delete_first(activeRIRs);`
`889`	`890`	`}`
`890`	`891`
`891`	`892`	`heap_close(rel, NoLock);`