database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Rename pg_plan and pg_eval to be more meaningful.

Browse Source
This commit is contained in:
Bruce Momjian 1997-12-11 17:36:58 +00:00
parent 645cc13276
commit c60f70b53f
11 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/catalog/heap.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.40 1997/12/01 21:00:35 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.41 1997/12/11 17:35:59 momjian Exp $
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
* heap_create() - Create an uncataloged heap relation * heap_create() - Create an uncataloged heap relation
@ -1510,7 +1510,7 @@ start:;
sprintf(str, "select %s%s from %.*s", attrdef->adsrc, cast, sprintf(str, "select %s%s from %.*s", attrdef->adsrc, cast,
NAMEDATALEN, rel->rd_rel->relname.data); NAMEDATALEN, rel->rd_rel->relname.data);
setheapoverride(true); setheapoverride(true);
planTree_list = (List *) pg_plan(str, NULL, 0, &queryTree_list, None); planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None);
setheapoverride(false); setheapoverride(false);
query = (Query *) (queryTree_list->qtrees[0]); query = (Query *) (queryTree_list->qtrees[0]);
@ -1580,7 +1580,7 @@ StoreRelCheck(Relation rel, ConstrCheck *check)
sprintf(str, "select 1 from %.*s where %s", sprintf(str, "select 1 from %.*s where %s",
NAMEDATALEN, rel->rd_rel->relname.data, check->ccsrc); NAMEDATALEN, rel->rd_rel->relname.data, check->ccsrc);
setheapoverride(true); setheapoverride(true);
planTree_list = (List *) pg_plan(str, NULL, 0, &queryTree_list, None); planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None);
setheapoverride(false); setheapoverride(false);
query = (Query *) (queryTree_list->qtrees[0]); query = (Query *) (queryTree_list->qtrees[0]);

4
src/backend/catalog/pg_proc.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.10 1997/11/25 21:58:48 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.11 1997/12/11 17:36:01 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -215,7 +215,7 @@ ProcedureCreate(char *procedureName,
if (strcmp(languageName, "sql") == 0) if (strcmp(languageName, "sql") == 0)
{ {
plan_list = pg_plan(prosrc, typev, parameterCount, plan_list = pg_parse_and_plan(prosrc, typev, parameterCount,
&querytree_list, dest); &querytree_list, dest);
/* typecheck return value */ /* typecheck return value */

6
src/backend/commands/_deadcode/version.c
View File

@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.8 1997/11/25 21:59:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.9 1997/12/11 17:36:08 momjian Exp $
* *
* NOTES * NOTES
* At the point the version is defined, 2 physical relations are created * At the point the version is defined, 2 physical relations are created
@ -95,7 +95,7 @@ eval_as_new_xact(char *query)
* CommitTransactionCommand(); StartTransactionCommand(); * CommitTransactionCommand(); StartTransactionCommand();
*/ */
CommandCounterIncrement(); CommandCounterIncrement();
pg_eval(query, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(query, (char **) NULL, (Oid *) NULL, 0);
} }
#endif #endif
@ -157,7 +157,7 @@ VersionCreate(char *vname, char *bname)
sprintf(query_buf, "SELECT * INTO TABLE %s from %s where 1 =2", sprintf(query_buf, "SELECT * INTO TABLE %s from %s where 1 =2",
vname, bname); vname, bname);
pg_eval(query_buf, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(query_buf, (char **) NULL, (Oid *) NULL, 0);
/* /*
* Creating the ``v_added'' relation * Creating the ``v_added'' relation

6
src/backend/commands/dbcommands.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.2 1997/11/24 05:32:18 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.3 1997/12/11 17:36:04 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -95,7 +95,7 @@ createdb(char *dbname, char *dbpath)
sprintf(buf, "insert into pg_database (datname, datdba, datpath)" sprintf(buf, "insert into pg_database (datname, datdba, datpath)"
" values (\'%s\', \'%d\', \'%s\');", dbname, user_id, loc); " values (\'%s\', \'%d\', \'%s\');", dbname, user_id, loc);
pg_eval(buf, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(buf, (char **) NULL, (Oid *) NULL, 0);
} }
void void
@ -133,7 +133,7 @@ destroydb(char *dbname)
*/ */
sprintf(buf, "delete from pg_database where pg_database.oid = \'%d\'::oid", sprintf(buf, "delete from pg_database where pg_database.oid = \'%d\'::oid",
db_id); db_id);
pg_eval(buf, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(buf, (char **) NULL, (Oid *) NULL, 0);
/* /*
* remove the data directory. If the DELETE above failed, this will * remove the data directory. If the DELETE above failed, this will

12
src/backend/commands/user.c
View File

@ -1,7 +1,7 @@
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* user.c-- * user.c--
* use pg_eval to create a new user in the catalog * use pg_exec_query to create a new user in the catalog
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
@ -43,7 +43,7 @@ void UpdatePgPwdFile(char* sql) {
filename = crypt_getpwdfilename(); filename = crypt_getpwdfilename();
sprintf(sql, "copy %s to '%s' using delimiters '#'", UserRelationName, filename); sprintf(sql, "copy %s to '%s' using delimiters '#'", UserRelationName, filename);
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0); pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
} }
/*--------------------------------------------------------------------- /*---------------------------------------------------------------------
@ -147,7 +147,7 @@ void DefineUser(CreateUserStmt *stmt) {
} }
strcat(sql_end, ")"); strcat(sql_end, ")");
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0); pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
/* Add the stuff here for groups. /* Add the stuff here for groups.
*/ */
@ -250,7 +250,7 @@ extern void AlterUser(AlterUserStmt *stmt) {
if (sql_end != sql) { if (sql_end != sql) {
sql_end += strlen(sql_end); sql_end += strlen(sql_end);
sprintf(sql_end, " where usename = '%s'", stmt->user); sprintf(sql_end, " where usename = '%s'", stmt->user);
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0); pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
} }
/* do the pg_group stuff here */ /* do the pg_group stuff here */
@ -346,7 +346,7 @@ extern void RemoveUser(char* user) {
elog(NOTICE, "Dropping database %s", dbase[ndbase]); elog(NOTICE, "Dropping database %s", dbase[ndbase]);
sprintf(sql, "drop database %s", dbase[ndbase]); sprintf(sql, "drop database %s", dbase[ndbase]);
pfree((void*)dbase[ndbase]); pfree((void*)dbase[ndbase]);
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0); pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
} }
if (dbase) if (dbase)
pfree((void*)dbase); pfree((void*)dbase);
@ -369,7 +369,7 @@ extern void RemoveUser(char* user) {
/* Remove the user from the pg_user table /* Remove the user from the pg_user table
*/ */
sprintf(sql, "delete from %s where usename = '%s'", UserRelationName, user); sprintf(sql, "delete from %s where usename = '%s'", UserRelationName, user);
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0); pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
UpdatePgPwdFile(sql); UpdatePgPwdFile(sql);

4
src/backend/executor/functions.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.13 1997/11/25 21:59:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.14 1997/12/11 17:36:16 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -113,7 +113,7 @@ init_execution_state(FunctionCachePtr fcache,
planTree_list = (List *) planTree_list = (List *)
pg_plan(fcache->src, fcache->argOidVect, nargs, &queryTree_list, None); pg_parse_and_plan(fcache->src, fcache->argOidVect, nargs, &queryTree_list, None);
for (i = 0; i < queryTree_list->len; i++) for (i = 0; i < queryTree_list->len; i++)
{ {

2
src/backend/executor/spi.c
View File

@ -640,7 +640,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan * plan)
argtypes = plan->argtypes; argtypes = plan->argtypes;
} }
ptlist = planTree_list = (List *) ptlist = planTree_list = (List *)
pg_plan(src, argtypes, nargs, &queryTree_list, None); pg_parse_and_plan(src, argtypes, nargs, &queryTree_list, None);
_SPI_current->qtlist = queryTree_list; _SPI_current->qtlist = queryTree_list;

4
src/backend/optimizer/path/xfunc.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.7 1997/11/25 21:59:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.8 1997/12/11 17:36:29 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -534,7 +534,7 @@ xfunc_func_expense(LispValue node, LispValue args)
nargs = proc->pronargs; nargs = proc->pronargs;
if (nargs > 0) if (nargs > 0)
argOidVect = proc->proargtypes; argOidVect = proc->proargtypes;
planlist = (List) pg_plan(pq_src, argOidVect, nargs, planlist = (List) pg_parse_and_plan(pq_src, argOidVect, nargs,
&parseTree_list, None); &parseTree_list, None);
if (IsA(node, Func)) if (IsA(node, Func))
set_func_planlist((Func) node, planlist); set_func_planlist((Func) node, planlist);

4
src/backend/rewrite/rewriteDefine.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.8 1997/11/25 22:06:04 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.9 1997/12/11 17:36:38 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -136,7 +136,7 @@ InsertRule(char *rulname,
rulname, evtype, eventrel_oid, evslot_index, actionbuf, rulname, evtype, eventrel_oid, evslot_index, actionbuf,
qualbuf, is_instead); qualbuf, is_instead);
pg_eval(rulebuf, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(rulebuf, (char **) NULL, (Oid *) NULL, 0);
return (LastOidProcessed); return (LastOidProcessed);
} }

27
src/backend/tcop/postgres.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.55 1997/11/25 22:06:14 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.56 1997/12/11 17:36:42 momjian Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -395,7 +395,7 @@ ReadCommand(char *inBuf, bool multiplexedBackend)
} }
List * List *
pg_plan(char *query_string, /* string to execute */ pg_parse_and_plan(char *query_string, /* string to execute */
Oid *typev, /* argument types */ Oid *typev, /* argument types */
int nargs, /* number of arguments */ int nargs, /* number of arguments */
QueryTreeList **queryListP, /* pointer to the parse trees */ QueryTreeList **queryListP, /* pointer to the parse trees */
@ -537,7 +537,10 @@ pg_plan(char *query_string, /* string to execute */
if (ShowPlannerStats) if (ShowPlannerStats)
ResetUsage(); ResetUsage();
/* call that optimizer */
plan = planner(querytree); plan = planner(querytree);
if (ShowPlannerStats) if (ShowPlannerStats)
{ {
fprintf(stderr, "! Planner Stats:\n"); fprintf(stderr, "! Planner Stats:\n");
@ -580,7 +583,7 @@ pg_plan(char *query_string, /* string to execute */
} }
/* ---------------------------------------------------------------- /* ----------------------------------------------------------------
* pg_eval() * pg_exec_query()
* *
* Takes a querystring, runs the parser/utilities or * Takes a querystring, runs the parser/utilities or
* parser/planner/executor over it as necessary * parser/planner/executor over it as necessary
@ -597,13 +600,13 @@ pg_plan(char *query_string, /* string to execute */
*/ */
void void
pg_eval(char *query_string, char **argv, Oid *typev, int nargs) pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs)
{ {
pg_eval_dest(query_string, argv, typev, nargs, whereToSendOutput); pg_exec_query_dest(query_string, argv, typev, nargs, whereToSendOutput);
} }
void void
pg_eval_dest(char *query_string,/* string to execute */ pg_exec_query_dest(char *query_string,/* string to execute */
char **argv, /* arguments */ char **argv, /* arguments */
Oid *typev, /* argument types */ Oid *typev, /* argument types */
int nargs, /* number of arguments */ int nargs, /* number of arguments */
@ -617,9 +620,9 @@ pg_eval_dest(char *query_string,/* string to execute */
QueryTreeList *querytree_list; QueryTreeList *querytree_list;
/* plan the queries */ /* plan the queries */
plan_list = pg_plan(query_string, typev, nargs, &querytree_list, dest); plan_list = pg_parse_and_plan(query_string, typev, nargs, &querytree_list, dest);
/* pg_plan could have failed */ /* pg_parse_and_plan could have failed */
if (querytree_list == NULL) if (querytree_list == NULL)
return; return;
@ -668,7 +671,7 @@ pg_eval_dest(char *query_string,/* string to execute */
#ifdef INDEXSCAN_PATCH #ifdef INDEXSCAN_PATCH
/* /*
* Print moved in pg_plan. DZ - 27-8-1996 * Print moved in pg_parse_and_plan. DZ - 27-8-1996
*/ */
#else #else
/* ---------------- /* ----------------
@ -1340,7 +1343,7 @@ PostgresMain(int argc, char *argv[])
if (IsUnderPostmaster == false) if (IsUnderPostmaster == false)
{ {
puts("\nPOSTGRES backend interactive interface"); puts("\nPOSTGRES backend interactive interface");
puts("$Revision: 1.55 $ $Date: 1997/11/25 22:06:14 $"); puts("$Revision: 1.56 $ $Date: 1997/12/11 17:36:42 $");
} }
/* ---------------- /* ----------------
@ -1510,7 +1513,7 @@ PostgresMain(int argc, char *argv[])
} }
StartTransactionCommand(); StartTransactionCommand();
pg_eval(parser_input, (char **) NULL, (Oid *) NULL, 0); pg_exec_query(parser_input, (char **) NULL, (Oid *) NULL, 0);
if (ShowStats) if (ShowStats)
ShowUsage(); ShowUsage();
@ -1540,7 +1543,7 @@ PostgresMain(int argc, char *argv[])
* (3) commit the current transaction * (3) commit the current transaction
* *
* Note: if we had an empty input buffer, then we didn't * Note: if we had an empty input buffer, then we didn't
* call pg_eval, so we don't bother to commit this transaction. * call pg_exec_query, so we don't bother to commit this transaction.
* ---------------- * ----------------
*/ */
if (!IsEmptyQuery) if (!IsEmptyQuery)

8
src/include/tcop/tcopprot.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: tcopprot.h,v 1.8 1997/11/25 22:07:10 momjian Exp $ * $Id: tcopprot.h,v 1.9 1997/12/11 17:36:58 momjian Exp $
* *
* OLD COMMENTS * OLD COMMENTS
* This file was created so that other c files could get the two * This file was created so that other c files could get the two
@ -23,11 +23,11 @@
#ifndef BOOTSTRAP_INCLUDE #ifndef BOOTSTRAP_INCLUDE
extern List * extern List *
pg_plan(char *query_string, Oid *typev, int nargs, pg_parse_and_plan(char *query_string, Oid *typev, int nargs,
QueryTreeList **queryListP, CommandDest dest); QueryTreeList **queryListP, CommandDest dest);
extern void pg_eval(char *query_string, char **argv, Oid *typev, int nargs); extern void pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs);
extern void extern void
pg_eval_dest(char *query_string, char **argv, Oid *typev, pg_exec_query_dest(char *query_string, char **argv, Oid *typev,
int nargs, CommandDest dest); int nargs, CommandDest dest);
#endif /* BOOTSTRAP_HEADER */ #endif /* BOOTSTRAP_HEADER */