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

[postgresql] / src / backend / rewrite / rewriteManip.c

diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 8ab486bfc2dc04bee9f7e56bb0b2adf572cd0fcc..0322c58f3f02a687f40394f9d477f63976832012 100644 (file)
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.116 2008/10/21 20:42:53 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.117 2008/10/22 20:17:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -298,19 +298,10 @@ OffsetVarNodes_walker(Node *node, OffsetVarNodes_context *context)
                }
                /* fall through to examine children */
        }
-       if (IsA(node, PlaceHolderInfo))
-       {
-               PlaceHolderInfo *phinfo = (PlaceHolderInfo *) node;
+       /* Shouldn't need to handle other planner auxiliary nodes here */
+       Assert(!IsA(node, SpecialJoinInfo));
+       Assert(!IsA(node, PlaceHolderInfo));
 
-               if (context->sublevels_up == 0)
-               {
-                       phinfo->ph_eval_at = offset_relid_set(phinfo->ph_eval_at,
-                                                                                                 context->offset);
-                       phinfo->ph_needed = offset_relid_set(phinfo->ph_needed,
-                                                                                                context->offset);
-               }
-               /* fall through to examine children */
-       }
        if (IsA(node, Query))
        {
                /* Recurse into subselects */
@@ -489,21 +480,10 @@ ChangeVarNodes_walker(Node *node, ChangeVarNodes_context *context)
                }
                /* fall through to examine children */
        }
-       if (IsA(node, PlaceHolderInfo))
-       {
-               PlaceHolderInfo *phinfo = (PlaceHolderInfo *) node;
+       /* Shouldn't need to handle other planner auxiliary nodes here */
+       Assert(!IsA(node, SpecialJoinInfo));
+       Assert(!IsA(node, PlaceHolderInfo));
 
-               if (context->sublevels_up == 0)
-               {
-                       phinfo->ph_eval_at = adjust_relid_set(phinfo->ph_eval_at,
-                                                                                                 context->rt_index,
-                                                                                                 context->new_index);
-                       phinfo->ph_needed = adjust_relid_set(phinfo->ph_needed,
-                                                                                                context->rt_index,
-                                                                                                context->new_index);
-               }
-               /* fall through to examine children */
-       }
        if (IsA(node, Query))
        {
                /* Recurse into subselects */