Ensure that the phrels sets of PlaceHolderVars appearing in an AppendRelInfo's

tglsfdc · tglsfdc · commit 0d7099d2f032 · 2008-11-11T19:05:21.000Z
translated_vars list get updated when pulling up an appendrel member.  It's
not clear that this really matters at present, since relatively little gets
done with the outputs of an appendrel child relation; but it probably will
come back to bite us sometime if we leave them with the wrong values.
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.59 2008/11/11 18:13:32 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.60 2008/11/11 19:05:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -709,10 +709,9 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
 	 * insert_targetlist_placeholders() will be adjusted, so having created
 	 * them with the subquery's varno is correct.
 	 *
-	 * Likewise, relids appearing in AppendRelInfo nodes have to be fixed (but
-	 * we took care of their translated_vars lists above).	We already checked
-	 * that this won't require introducing multiple subrelids into the
-	 * single-slot AppendRelInfo structs.
+	 * Likewise, relids appearing in AppendRelInfo nodes have to be fixed.
+	 * We already checked that this won't require introducing multiple
+	 * subrelids into the single-slot AppendRelInfo structs.
 	 */
 	if (parse->hasSubLinks || root->glob->lastPHId != 0 ||
 		root->append_rel_list)
@@ -1679,7 +1678,8 @@ substitute_multiple_relids(Node *node, int varno, Relids subrelids)
  *
  * When we pull up a subquery, any AppendRelInfo references to the subquery's
  * RT index have to be replaced by the substituted relid (and there had better
- * be only one).
+ * be only one).  We also need to apply substitute_multiple_relids to their
+ * translated_vars lists, since those might contain PlaceHolderVars.
  *
  * We assume we may modify the AppendRelInfo nodes in-place.
  */
@@ -1708,6 +1708,10 @@ fix_append_rel_relids(List *append_rel_list, int varno, Relids subrelids)
 				subvarno = bms_singleton_member(subrelids);
 			appinfo->child_relid = subvarno;
 		}
+
+		/* Also finish fixups for its translated vars */
+		substitute_multiple_relids((Node *) appinfo->translated_vars,
+								   varno, subrelids);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*`
`18`	`18`	`* IDENTIFICATION`
`19`		`- * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.59 2008/11/11 18:13:32 tgl Exp $`
	`19`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.60 2008/11/11 19:05:21 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -709,10 +709,9 @@ pull_up_simple_subquery(PlannerInfo root, Node jtnode, RangeTblEntry *rte,`
`709`	`709`	`* insert_targetlist_placeholders() will be adjusted, so having created`
`710`	`710`	`* them with the subquery's varno is correct.`
`711`	`711`	`*`
`712`		`- * Likewise, relids appearing in AppendRelInfo nodes have to be fixed (but`
`713`		`- * we took care of their translated_vars lists above). We already checked`
`714`		`- * that this won't require introducing multiple subrelids into the`
`715`		`- * single-slot AppendRelInfo structs.`
	`712`	`+ * Likewise, relids appearing in AppendRelInfo nodes have to be fixed.`
	`713`	`+ * We already checked that this won't require introducing multiple`
	`714`	`+ * subrelids into the single-slot AppendRelInfo structs.`
`716`	`715`	`*/`
`717`	`716`	`if (parse->hasSubLinks \|\| root->glob->lastPHId != 0 \|\|`
`718`	`717`	`root->append_rel_list)`
`@@ -1679,7 +1678,8 @@ substitute_multiple_relids(Node *node, int varno, Relids subrelids)`
`1679`	`1678`	`*`
`1680`	`1679`	`* When we pull up a subquery, any AppendRelInfo references to the subquery's`
`1681`	`1680`	`* RT index have to be replaced by the substituted relid (and there had better`
`1682`		`- * be only one).`
	`1681`	`+ * be only one). We also need to apply substitute_multiple_relids to their`
	`1682`	`+ * translated_vars lists, since those might contain PlaceHolderVars.`
`1683`	`1683`	`*`
`1684`	`1684`	`* We assume we may modify the AppendRelInfo nodes in-place.`
`1685`	`1685`	`*/`
`@@ -1708,6 +1708,10 @@ fix_append_rel_relids(List *append_rel_list, int varno, Relids subrelids)`
`1708`	`1708`	`subvarno = bms_singleton_member(subrelids);`
`1709`	`1709`	`appinfo->child_relid = subvarno;`
`1710`	`1710`	`}`
	`1711`	`+`
	`1712`	`+ /* Also finish fixups for its translated vars */`
	`1713`	`+ substitute_multiple_relids((Node *) appinfo->translated_vars,`
	`1714`	`+ varno, subrelids);`
`1711`	`1715`	`}`
`1712`	`1716`	`}`
`1713`	`1717`