diff options
Diffstat (limited to 'src/backend/optimizer/prep/prepunion.c')
| -rw-r--r-- | src/backend/optimizer/prep/prepunion.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 492492b9f75..fb4fd3e1d34 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.77 2002/09/02 02:47:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.78 2002/09/04 20:31:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -63,8 +63,8 @@ static List *generate_setop_tlist(List *colTypes, int flag, List *input_tlist, List *refnames_tlist); static List *generate_append_tlist(List *colTypes, bool flag, - List *input_plans, - List *refnames_tlist); + List *input_plans, + List *refnames_tlist); static Node *adjust_inherited_attrs_mutator(Node *node, adjust_inherited_attrs_context *context); @@ -172,8 +172,9 @@ recurse_set_operations(Node *setOp, Query *parse, * This would fail if the Vars generated by generate_setop_tlist() * were not exactly equal() to the corresponding tlist entries of * the subplan. However, since the subplan was generated by - * generate_union_plan() or generate_nonunion_plan(), and hence its - * tlist was generated by generate_append_tlist(), this will work. + * generate_union_plan() or generate_nonunion_plan(), and hence + * its tlist was generated by generate_append_tlist(), this will + * work. */ if (flag >= 0 || !tlist_same_datatypes(plan->targetlist, colTypes, junkOK)) @@ -485,15 +486,15 @@ generate_append_tlist(List *colTypes, bool flag, /* * First extract typmods to use. * - * If the inputs all agree on type and typmod of a particular column, - * use that typmod; else use -1. + * If the inputs all agree on type and typmod of a particular column, use + * that typmod; else use -1. */ colTypmods = (int32 *) palloc(length(colTypes) * sizeof(int32)); foreach(planl, input_plans) { - Plan *subplan = (Plan *) lfirst(planl); - List *subtlist; + Plan *subplan = (Plan *) lfirst(planl); + List *subtlist; curColType = colTypes; colindex = 0; @@ -796,8 +797,8 @@ adjust_inherited_attrs_mutator(Node *node, var->varno = context->new_rt_index; if (var->varattno > 0) { - char *attname = get_attname(context->old_relid, - var->varattno); + char *attname = get_attname(context->old_relid, + var->varattno); var->varattno = get_attnum(context->new_relid, attname); if (var->varattno == InvalidAttrNumber) @@ -819,10 +820,10 @@ adjust_inherited_attrs_mutator(Node *node, if (IsA(node, JoinExpr)) { /* Copy the JoinExpr node with correct mutation of subnodes */ - JoinExpr *j; + JoinExpr *j; j = (JoinExpr *) expression_tree_mutator(node, - adjust_inherited_attrs_mutator, + adjust_inherited_attrs_mutator, (void *) context); /* now fix JoinExpr's rtindex */ if (j->rtindex == context->old_rt_index) |