*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.179 2005/03/10 23:21:22 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.180 2005/03/17 23:44:26 neilc Exp $
*
*-------------------------------------------------------------------------
*/
#include "optimizer/subselect.h"
#include "optimizer/tlist.h"
#include "optimizer/var.h"
-#include "parser/analyze.h"
#include "parser/parsetree.h"
#include "parser/parse_expr.h"
#include "parser/parse_oper.h"
MemSet(&agg_counts, 0, sizeof(AggClauseCounts));
- /* Preprocess targetlist in case we are inside an INSERT/UPDATE. */
- tlist = preprocess_targetlist(tlist,
- parse->commandType,
- parse->resultRelation,
- parse->rtable);
-
- /*
- * Add TID targets for rels selected FOR UPDATE (should this be
- * done in preprocess_targetlist?). The executor uses the TID to
- * know which rows to lock, much as for UPDATE or DELETE.
- */
- if (parse->rowMarks)
- {
- ListCell *l;
-
- /*
- * We've got trouble if the FOR UPDATE appears inside
- * grouping, since grouping renders a reference to individual
- * tuple CTIDs invalid. This is also checked at parse time,
- * but that's insufficient because of rule substitution, query
- * pullup, etc.
- */
- CheckSelectForUpdate(parse);
-
- /*
- * Currently the executor only supports FOR UPDATE at top
- * level
- */
- if (PlannerQueryLevel > 1)
- ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
- errmsg("SELECT FOR UPDATE is not allowed in subqueries")));
-
- foreach(l, parse->rowMarks)
- {
- Index rti = lfirst_int(l);
- char *resname;
- Resdom *resdom;
- Var *var;
- TargetEntry *ctid;
-
- resname = (char *) palloc(32);
- snprintf(resname, 32, "ctid%u", rti);
- resdom = makeResdom(list_length(tlist) + 1,
- TIDOID,
- -1,
- resname,
- true);
-
- var = makeVar(rti,
- SelfItemPointerAttributeNumber,
- TIDOID,
- -1,
- 0);
-
- ctid = makeTargetEntry(resdom, (Expr *) var);
- tlist = lappend(tlist, ctid);
- }
- }
+ /* Preprocess targetlist */
+ tlist = preprocess_targetlist(parse, tlist);
/*
* Generate appropriate target list for subplan; may be different
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.72 2004/12/31 22:00:20 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.73 2005/03/17 23:44:52 neilc Exp $
*
*-------------------------------------------------------------------------
*/
#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
#include "optimizer/prep.h"
+#include "optimizer/subselect.h"
+#include "parser/analyze.h"
#include "parser/parsetree.h"
#include "parser/parse_coerce.h"
* Returns the new targetlist.
*/
List *
-preprocess_targetlist(List *tlist,
- int command_type,
- Index result_relation,
- List *range_table)
+preprocess_targetlist(Query *parse, List *tlist)
{
+ int result_relation = parse->resultRelation;
+ List *range_table = parse->rtable;
+ CmdType command_type = parse->commandType;
+
/*
* Sanity check: if there is a result relation, it'd better be a real
* relation not a subquery. Else parser or rewriter messed up.
tlist = lappend(tlist, makeTargetEntry(resdom, (Expr *) var));
}
+ /*
+ * Add TID targets for rels selected FOR UPDATE. The executor
+ * uses the TID to know which rows to lock, much as for UPDATE or
+ * DELETE.
+ */
+ if (parse->rowMarks)
+ {
+ ListCell *l;
+
+ /*
+ * We've got trouble if the FOR UPDATE appears inside
+ * grouping, since grouping renders a reference to individual
+ * tuple CTIDs invalid. This is also checked at parse time,
+ * but that's insufficient because of rule substitution, query
+ * pullup, etc.
+ */
+ CheckSelectForUpdate(parse);
+
+ /*
+ * Currently the executor only supports FOR UPDATE at top
+ * level
+ */
+ if (PlannerQueryLevel > 1)
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("SELECT FOR UPDATE is not allowed in subqueries")));
+
+ foreach(l, parse->rowMarks)
+ {
+ Index rti = lfirst_int(l);
+ char *resname;
+ Resdom *resdom;
+ Var *var;
+ TargetEntry *ctid;
+
+ resname = (char *) palloc(32);
+ snprintf(resname, 32, "ctid%u", rti);
+ resdom = makeResdom(list_length(tlist) + 1,
+ TIDOID,
+ -1,
+ resname,
+ true);
+
+ var = makeVar(rti,
+ SelfItemPointerAttributeNumber,
+ TIDOID,
+ -1,
+ 0);
+
+ ctid = makeTargetEntry(resdom, (Expr *) var);
+ tlist = lappend(tlist, ctid);
+ }
+ }
+
return tlist;
}
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.47 2004/12/31 22:03:36 pgsql Exp $
+ * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.48 2005/03/17 23:45:09 neilc Exp $
*
*-------------------------------------------------------------------------
*/
/*
* prototypes for preptlist.c
*/
-extern List *preprocess_targetlist(List *tlist, int command_type,
- Index result_relation, List *range_table);
+extern List *preprocess_targetlist(Query *parse, List *tlist);
/*
* prototypes for prepunion.c