diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-23 22:12:52 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-06-23 22:12:52 +0000 |
| commit | 46379d6e60f0f95e127a5045ca1fa74dfdc48a85 (patch) | |
| tree | 7d6fe8004575203b40a38184c154dc7f34a20345 /src/backend/optimizer | |
| parent | ec0bb02db8452d4098023f82b100ba68d8f7dfab (diff) | |
| download | postgresql-46379d6e60f0f95e127a5045ca1fa74dfdc48a85.tar.gz postgresql-46379d6e60f0f95e127a5045ca1fa74dfdc48a85.zip | |
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).
Diffstat (limited to 'src/backend/optimizer')
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 2cf0ffd28b0..41215446a35 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.246 2007/06/11 01:16:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.247 2007/06/23 22:12:50 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -2910,7 +2910,6 @@ inline_function(Oid funcid, Oid result_type, List *args, MemoryContext mycxt; ErrorContextCallback sqlerrcontext; List *raw_parsetree_list; - List *querytree_list; Query *querytree; Node *newexpr; int *usecounts; @@ -2986,13 +2985,8 @@ inline_function(Oid funcid, Oid result_type, List *args, if (list_length(raw_parsetree_list) != 1) goto fail; - querytree_list = parse_analyze(linitial(raw_parsetree_list), src, - argtypes, funcform->pronargs); - - if (list_length(querytree_list) != 1) - goto fail; - - querytree = (Query *) linitial(querytree_list); + querytree = parse_analyze(linitial(raw_parsetree_list), src, + argtypes, funcform->pronargs); /* * The single command must be a simple "SELECT expression". @@ -3025,7 +3019,7 @@ inline_function(Oid funcid, Oid result_type, List *args, * no rewriting was needed; that's probably not important, but let's be * careful. */ - if (check_sql_fn_retval(funcid, result_type, querytree_list, NULL)) + if (check_sql_fn_retval(funcid, result_type, list_make1(querytree), NULL)) goto fail; /* reject whole-tuple-result cases */ /* |