From 46379d6e60f0f95e127a5045ca1fa74dfdc48a85 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 23 Jun 2007 22:12:52 +0000 Subject: Separate parse-analysis for utility commands out of parser/analyze.c (which now deals only in optimizable statements), and put that code into a new file parser/parse_utilcmd.c. This helps clarify and enforce the design rule that utility statements shouldn't be processed during the regular parse analysis phase; all interpretation of their meaning should happen after they are given to ProcessUtility to execute. (We need this because we don't retain any locks for a utility statement that's in a plan cache, nor have any way to detect that it's stale.) We are also able to simplify the API for parse_analyze() and related routines, because they will now always return exactly one Query structure. In passing, fix bug #3403 concerning trying to add a serial column to an existing temp table (this is largely Heikki's work, but we needed all that restructuring to make it safe). --- src/backend/parser/parse_node.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'src/backend/parser/parse_node.c') diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index a8dfa2666bb..a5e6026ebab 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -8,12 +8,13 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.97 2007/03/17 00:11:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.98 2007/06/23 22:12:51 tgl Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" +#include "access/heapam.h" #include "catalog/pg_type.h" #include "mb/pg_wchar.h" #include "nodes/makefuncs.h" @@ -27,9 +28,11 @@ #include "utils/varbit.h" -/* make_parsestate() - * Allocate and initialize a new ParseState. - * The CALLER is responsible for freeing the ParseState* returned. +/* + * make_parsestate + * Allocate and initialize a new ParseState. + * + * Caller should eventually release the ParseState via free_parsestate(). */ ParseState * make_parsestate(ParseState *parentParseState) @@ -52,6 +55,30 @@ make_parsestate(ParseState *parentParseState) return pstate; } +/* + * free_parsestate + * Release a ParseState and any subsidiary resources. + */ +void +free_parsestate(ParseState *pstate) +{ + /* + * Check that we did not produce too many resnos; at the very least we + * cannot allow more than 2^16, since that would exceed the range of a + * AttrNumber. It seems safest to use MaxTupleAttributeNumber. + */ + if (pstate->p_next_resno - 1 > MaxTupleAttributeNumber) + ereport(ERROR, + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("target lists can have at most %d entries", + MaxTupleAttributeNumber))); + + if (pstate->p_target_relation != NULL) + heap_close(pstate->p_target_relation, NoLock); + + pfree(pstate); +} + /* * parser_errposition -- cgit v1.2.3