Dept of better ideas: refrain from creating the planner's placeholder_list

[postgresql] / src / backend / optimizer / prep / prepunion.c

diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 0efd150f6bf096730a50587294bd3766958fe12c..dd7f2f28e0adfdc32b6d3b0c9fd9f054a5528ed3 100644 (file)
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.159 2008/10/21 20:42:53 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.160 2008/10/22 20:17:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1599,26 +1599,10 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
                                                                                   context->child_relid);
                return (Node *) phv;
        }
-       if (IsA(node, PlaceHolderInfo))
-       {
-               /* Copy the PlaceHolderInfo node with correct mutation of subnodes */
-               PlaceHolderInfo *phinfo;
-
-               phinfo = (PlaceHolderInfo *) expression_tree_mutator(node,
-                                                                                         adjust_appendrel_attrs_mutator,
-                                                                                                                        (void *) context);
-               /* now fix PlaceHolderInfo's relid sets */
-               phinfo->ph_eval_at = adjust_relid_set(phinfo->ph_eval_at,
-                                                                                         context->parent_relid,
-                                                                                         context->child_relid);
-               phinfo->ph_needed = adjust_relid_set(phinfo->ph_needed,
-                                                                                        context->parent_relid,
-                                                                                        context->child_relid);
-               return (Node *) phinfo;
-       }
-       /* Shouldn't need to handle other planner auxiliary nodes here */
+       /* Shouldn't need to handle planner auxiliary nodes here */
        Assert(!IsA(node, SpecialJoinInfo));
        Assert(!IsA(node, AppendRelInfo));
+       Assert(!IsA(node, PlaceHolderInfo));
 
        /*
         * We have to process RestrictInfo nodes specially.