Call union_planner() instead of planner().

vadim4o · vadim4o · commit 91840733243f · 1998-02-13T03:39:26.000Z
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.18 1998/01/15 18:59:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.19 1998/02/13 03:39:26 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -129,14 +129,14 @@ plan_union_queries(Query *parse)
 		List *hold_unionClause = parse->unionClause;
 
 		parse->unionClause = NIL;	/* prevent recursion */
-		union_plans = lcons(planner(parse), NIL);
+		union_plans = lcons(union_planner(parse), NIL);
 		union_rts = lcons(parse->rtable, NIL);
 
 		foreach(ulist, hold_unionClause)
 		{
 			Query *union_query = lfirst(ulist);
 
-			union_plans = lappend(union_plans, planner(union_query));
+			union_plans = lappend(union_plans, union_planner(union_query));
 			union_rts = lappend(union_rts, union_query->rtable);
 		}
 	}
@@ -159,15 +159,15 @@ plan_union_queries(Query *parse)
 		 *	Recursion, but UNION only.
 		 *	The last one is a UNION, so it will not come here in recursion,
 		 */
-		union_plans = lcons(planner(parse), NIL);
+		union_plans = lcons(union_planner(parse), NIL);
 		union_rts = lcons(parse->rtable, NIL);
 
 		/* Append the remainging UNION ALLs */
 		foreach(ulist, unionall_queries)
 		{
 			Query	*unionall_query = lfirst(ulist);
 
-			union_plans = lappend(union_plans, planner(unionall_query));
+			union_plans = lappend(union_plans, union_planner(unionall_query));
 			union_rts = lappend(union_rts, unionall_query->rtable);
 		}
 	}
@@ -276,7 +276,7 @@ plan_inherit_query(List *relids,
 							  relid,
 							  new_root);
 
-		union_plans = lappend(union_plans, planner(new_root));
+		union_plans = lappend(union_plans, union_planner(new_root));
 		union_rtentries = lappend(union_rtentries, new_rt_entry);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.18 1998/01/15 18:59:53 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.19 1998/02/13 03:39:26 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -129,14 +129,14 @@ plan_union_queries(Query *parse)`
`129`	`129`	`List *hold_unionClause = parse->unionClause;`
`130`	`130`
`131`	`131`	`parse->unionClause = NIL; /* prevent recursion */`
`132`		`- union_plans = lcons(planner(parse), NIL);`
	`132`	`+ union_plans = lcons(union_planner(parse), NIL);`
`133`	`133`	`union_rts = lcons(parse->rtable, NIL);`
`134`	`134`
`135`	`135`	`foreach(ulist, hold_unionClause)`
`136`	`136`	`{`
`137`	`137`	`Query *union_query = lfirst(ulist);`
`138`
`139`		`- union_plans = lappend(union_plans, planner(union_query));`
	`139`	`+ union_plans = lappend(union_plans, union_planner(union_query));`
`140`	`140`	`union_rts = lappend(union_rts, union_query->rtable);`
`141`	`141`	`}`
`142`	`142`	`}`
`@@ -159,15 +159,15 @@ plan_union_queries(Query *parse)`
`159`	`159`	`* Recursion, but UNION only.`
`160`	`160`	`* The last one is a UNION, so it will not come here in recursion,`
`161`	`161`	`*/`
`162`		`- union_plans = lcons(planner(parse), NIL);`
	`162`	`+ union_plans = lcons(union_planner(parse), NIL);`
`163`	`163`	`union_rts = lcons(parse->rtable, NIL);`
`164`	`164`
`165`	`165`	`/* Append the remainging UNION ALLs */`
`166`	`166`	`foreach(ulist, unionall_queries)`
`167`	`167`	`{`
`168`	`168`	`Query *unionall_query = lfirst(ulist);`
`169`	`169`
`170`		`- union_plans = lappend(union_plans, planner(unionall_query));`
	`170`	`+ union_plans = lappend(union_plans, union_planner(unionall_query));`
`171`	`171`	`union_rts = lappend(union_rts, unionall_query->rtable);`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -276,7 +276,7 @@ plan_inherit_query(List *relids,`
`276`	`276`	`relid,`
`277`	`277`	`new_root);`
`278`	`278`
`279`		`- union_plans = lappend(union_plans, planner(new_root));`
	`279`	`+ union_plans = lappend(union_plans, union_planner(new_root));`
`280`	`280`	`union_rtentries = lappend(union_rtentries, new_rt_entry);`
`281`	`281`	`}`
`282`	`282`