query_tree_mutator should copy RangeTblEntry nodes even when it's not

tglsfdc · tglsfdc · commit 2d83e7c73ccf · 2003-12-09T01:56:20.000Z
planning to modify them itself.  Otherwise we end up with shared RTE
substructure, which breaks inheritance_planner because the rte-&gt;inh
flag needs to be independent in each copied subquery.  Per bug report
from Chris Piker.
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.155 2003/11/29 19:51:51 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.156 2003/12/09 01:56:20 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -2960,36 +2960,31 @@ query_tree_mutator(Query *query,
 		RangeTblEntry *rte = (RangeTblEntry *) lfirst(rt);
 		RangeTblEntry *newrte;
 
+		FLATCOPY(newrte, rte, RangeTblEntry);
 		switch (rte->rtekind)
 		{
 			case RTE_RELATION:
 			case RTE_SPECIAL:
-				/* nothing to do, don't bother to make a copy */
+				/* we don't bother to copy eref, aliases, etc; OK? */
 				break;
 			case RTE_SUBQUERY:
 				if (!(flags & QTW_IGNORE_RT_SUBQUERIES))
 				{
-					FLATCOPY(newrte, rte, RangeTblEntry);
 					CHECKFLATCOPY(newrte->subquery, rte->subquery, Query);
 					MUTATE(newrte->subquery, newrte->subquery, Query *);
-					rte = newrte;
 				}
 				break;
 			case RTE_JOIN:
 				if (!(flags & QTW_IGNORE_JOINALIASES))
 				{
-					FLATCOPY(newrte, rte, RangeTblEntry);
 					MUTATE(newrte->joinaliasvars, rte->joinaliasvars, List *);
-					rte = newrte;
 				}
 				break;
 			case RTE_FUNCTION:
-				FLATCOPY(newrte, rte, RangeTblEntry);
 				MUTATE(newrte->funcexpr, rte->funcexpr, Node *);
-				rte = newrte;
 				break;
 		}
-		FastAppend(&newrt, rte);
+		FastAppend(&newrt, newrte);
 	}
 	query->rtable = FastListValue(&newrt);
 	return query;

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/optimizer/util/clauses.c,v 1.155 2003/11/29 19:51:51 pgsql Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.156 2003/12/09 01:56:20 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* HISTORY`
`14`	`14`	`* AUTHOR DATE MAJOR EVENT`
`@@ -2960,36 +2960,31 @@ query_tree_mutator(Query *query,`
`2960`	`2960`	`RangeTblEntry rte = (RangeTblEntry ) lfirst(rt);`
`2961`	`2961`	`RangeTblEntry *newrte;`
`2962`	`2962`
	`2963`	`+ FLATCOPY(newrte, rte, RangeTblEntry);`
`2963`	`2964`	`switch (rte->rtekind)`
`2964`	`2965`	`{`
`2965`	`2966`	`case RTE_RELATION:`
`2966`	`2967`	`case RTE_SPECIAL:`
`2967`		`- /* nothing to do, don't bother to make a copy */`
	`2968`	`+ /* we don't bother to copy eref, aliases, etc; OK? */`
`2968`	`2969`	`break;`
`2969`	`2970`	`case RTE_SUBQUERY:`
`2970`	`2971`	`if (!(flags & QTW_IGNORE_RT_SUBQUERIES))`
`2971`	`2972`	`{`
`2972`		`- FLATCOPY(newrte, rte, RangeTblEntry);`
`2973`	`2973`	`CHECKFLATCOPY(newrte->subquery, rte->subquery, Query);`
`2974`	`2974`	`MUTATE(newrte->subquery, newrte->subquery, Query *);`
`2975`		`- rte = newrte;`
`2976`	`2975`	`}`
`2977`	`2976`	`break;`
`2978`	`2977`	`case RTE_JOIN:`
`2979`	`2978`	`if (!(flags & QTW_IGNORE_JOINALIASES))`
`2980`	`2979`	`{`
`2981`		`- FLATCOPY(newrte, rte, RangeTblEntry);`
`2982`	`2980`	`MUTATE(newrte->joinaliasvars, rte->joinaliasvars, List *);`
`2983`		`- rte = newrte;`
`2984`	`2981`	`}`
`2985`	`2982`	`break;`
`2986`	`2983`	`case RTE_FUNCTION:`
`2987`		`- FLATCOPY(newrte, rte, RangeTblEntry);`
`2988`	`2984`	`MUTATE(newrte->funcexpr, rte->funcexpr, Node *);`
`2989`		`- rte = newrte;`
`2990`	`2985`	`break;`
`2991`	`2986`	`}`
`2992`		`- FastAppend(&newrt, rte);`
	`2987`	`+ FastAppend(&newrt, newrte);`
`2993`	`2988`	`}`
`2994`	`2989`	`query->rtable = FastListValue(&newrt);`
`2995`	`2990`	`return query;`