Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c60f70b

Browse files
bmomjianbmomjian
committed
Rename pg_plan and pg_eval to be more meaningful.
1 parent 645cc13 commit c60f70b

File tree

11 files changed

+43
-40
lines changed

11 files changed

+43
-40
lines changed

‎src/backend/catalog/heap.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.40 1997/12/01 21:00:35 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.41 1997/12/11 17:35:59 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
* heap_create() - Create an uncataloged heap relation
@@ -1510,7 +1510,7 @@ start:;
15101510
sprintf(str, "select %s%s from %.*s", attrdef->adsrc, cast,
15111511
NAMEDATALEN, rel->rd_rel->relname.data);
15121512
setheapoverride(true);
1513-
planTree_list = (List *) pg_plan(str, NULL, 0, &queryTree_list, None);
1513+
planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None);
15141514
setheapoverride(false);
15151515
query = (Query *) (queryTree_list->qtrees[0]);
15161516

@@ -1580,7 +1580,7 @@ StoreRelCheck(Relation rel, ConstrCheck *check)
15801580
sprintf(str, "select 1 from %.*s where %s",
15811581
NAMEDATALEN, rel->rd_rel->relname.data, check->ccsrc);
15821582
setheapoverride(true);
1583-
planTree_list = (List *) pg_plan(str, NULL, 0, &queryTree_list, None);
1583+
planTree_list = (List *) pg_parse_and_plan(str, NULL, 0, &queryTree_list, None);
15841584
setheapoverride(false);
15851585
query = (Query *) (queryTree_list->qtrees[0]);
15861586

‎src/backend/catalog/pg_proc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.10 1997/11/25 21:58:48 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.11 1997/12/11 17:36:01 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -215,7 +215,7 @@ ProcedureCreate(char *procedureName,
215215

216216
if (strcmp(languageName, "sql") == 0)
217217
{
218-
plan_list = pg_plan(prosrc, typev, parameterCount,
218+
plan_list = pg_parse_and_plan(prosrc, typev, parameterCount,
219219
&querytree_list, dest);
220220

221221
/* typecheck return value */

‎src/backend/commands/_deadcode/version.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.8 1997/11/25 21:59:11 momjian Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.9 1997/12/11 17:36:08 momjian Exp $
1414
*
1515
* NOTES
1616
* At the point the version is defined, 2 physical relations are created
@@ -95,7 +95,7 @@ eval_as_new_xact(char *query)
9595
* CommitTransactionCommand(); StartTransactionCommand();
9696
*/
9797
CommandCounterIncrement();
98-
pg_eval(query, (char **) NULL, (Oid *) NULL, 0);
98+
pg_exec_query(query, (char **) NULL, (Oid *) NULL, 0);
9999
}
100100

101101
#endif
@@ -157,7 +157,7 @@ VersionCreate(char *vname, char *bname)
157157
sprintf(query_buf, "SELECT * INTO TABLE %s from %s where 1 =2",
158158
vname, bname);
159159

160-
pg_eval(query_buf, (char **) NULL, (Oid *) NULL, 0);
160+
pg_exec_query(query_buf, (char **) NULL, (Oid *) NULL, 0);
161161

162162
/*
163163
* Creating the ``v_added'' relation

‎src/backend/commands/dbcommands.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.2 1997/11/24 05:32:18 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.3 1997/12/11 17:36:04 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -95,7 +95,7 @@ createdb(char *dbname, char *dbpath)
9595
sprintf(buf, "insert into pg_database (datname, datdba, datpath)"
9696
" values (\'%s\', \'%d\', \'%s\');", dbname, user_id, loc);
9797

98-
pg_eval(buf, (char **) NULL, (Oid *) NULL, 0);
98+
pg_exec_query(buf, (char **) NULL, (Oid *) NULL, 0);
9999
}
100100

101101
void
@@ -133,7 +133,7 @@ destroydb(char *dbname)
133133
*/
134134
sprintf(buf, "delete from pg_database where pg_database.oid = \'%d\'::oid",
135135
db_id);
136-
pg_eval(buf, (char **) NULL, (Oid *) NULL, 0);
136+
pg_exec_query(buf, (char **) NULL, (Oid *) NULL, 0);
137137

138138
/*
139139
* remove the data directory. If the DELETE above failed, this will

‎src/backend/commands/user.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*-------------------------------------------------------------------------
22
*
33
* user.c--
4-
* use pg_eval to create a new user in the catalog
4+
* use pg_exec_query to create a new user in the catalog
55
*
66
* Copyright (c) 1994, Regents of the University of California
77
*
@@ -43,7 +43,7 @@ void UpdatePgPwdFile(char* sql) {
4343

4444
filename = crypt_getpwdfilename();
4545
sprintf(sql, "copy %s to '%s' using delimiters '#'", UserRelationName, filename);
46-
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0);
46+
pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
4747
}
4848

4949
/*---------------------------------------------------------------------
@@ -147,7 +147,7 @@ void DefineUser(CreateUserStmt *stmt) {
147147
}
148148
strcat(sql_end, ")");
149149

150-
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0);
150+
pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
151151

152152
/* Add the stuff here for groups.
153153
*/
@@ -250,7 +250,7 @@ extern void AlterUser(AlterUserStmt *stmt) {
250250
if (sql_end != sql) {
251251
sql_end += strlen(sql_end);
252252
sprintf(sql_end, " where usename = '%s'", stmt->user);
253-
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0);
253+
pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
254254
}
255255

256256
/* do the pg_group stuff here */
@@ -346,7 +346,7 @@ extern void RemoveUser(char* user) {
346346
elog(NOTICE, "Dropping database %s", dbase[ndbase]);
347347
sprintf(sql, "drop database %s", dbase[ndbase]);
348348
pfree((void*)dbase[ndbase]);
349-
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0);
349+
pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
350350
}
351351
if (dbase)
352352
pfree((void*)dbase);
@@ -369,7 +369,7 @@ extern void RemoveUser(char* user) {
369369
/* Remove the user from the pg_user table
370370
*/
371371
sprintf(sql, "delete from %s where usename = '%s'", UserRelationName, user);
372-
pg_eval(sql, (char**)NULL, (Oid*)NULL, 0);
372+
pg_exec_query(sql, (char**)NULL, (Oid*)NULL, 0);
373373

374374
UpdatePgPwdFile(sql);
375375

‎src/backend/executor/functions.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.13 1997/11/25 21:59:19 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.14 1997/12/11 17:36:16 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -113,7 +113,7 @@ init_execution_state(FunctionCachePtr fcache,
113113

114114

115115
planTree_list = (List *)
116-
pg_plan(fcache->src, fcache->argOidVect, nargs, &queryTree_list, None);
116+
pg_parse_and_plan(fcache->src, fcache->argOidVect, nargs, &queryTree_list, None);
117117

118118
for (i = 0; i < queryTree_list->len; i++)
119119
{

‎src/backend/executor/spi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan * plan)
640640
argtypes = plan->argtypes;
641641
}
642642
ptlist = planTree_list = (List *)
643-
pg_plan(src, argtypes, nargs, &queryTree_list, None);
643+
pg_parse_and_plan(src, argtypes, nargs, &queryTree_list, None);
644644

645645
_SPI_current->qtlist = queryTree_list;
646646

‎src/backend/optimizer/path/xfunc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.7 1997/11/25 21:59:50 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.8 1997/12/11 17:36:29 momjian Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -534,7 +534,7 @@ xfunc_func_expense(LispValue node, LispValue args)
534534
nargs = proc->pronargs;
535535
if (nargs > 0)
536536
argOidVect = proc->proargtypes;
537-
planlist = (List) pg_plan(pq_src, argOidVect, nargs,
537+
planlist = (List) pg_parse_and_plan(pq_src, argOidVect, nargs,
538538
&parseTree_list, None);
539539
if (IsA(node, Func))
540540
set_func_planlist((Func) node, planlist);

‎src/backend/rewrite/rewriteDefine.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.8 1997/11/25 22:06:04 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.9 1997/12/11 17:36:38 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -136,7 +136,7 @@ InsertRule(char *rulname,
136136
rulname, evtype, eventrel_oid, evslot_index, actionbuf,
137137
qualbuf, is_instead);
138138

139-
pg_eval(rulebuf, (char **) NULL, (Oid *) NULL, 0);
139+
pg_exec_query(rulebuf, (char **) NULL, (Oid *) NULL, 0);
140140

141141
return (LastOidProcessed);
142142
}

‎src/backend/tcop/postgres.c

+15-12
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.55 1997/11/25 22:06:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.56 1997/12/11 17:36:42 momjian Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -395,7 +395,7 @@ ReadCommand(char *inBuf, bool multiplexedBackend)
395395
}
396396

397397
List *
398-
pg_plan(char *query_string, /* string to execute */
398+
pg_parse_and_plan(char *query_string, /* string to execute */
399399
Oid *typev, /* argument types */
400400
int nargs, /* number of arguments */
401401
QueryTreeList **queryListP, /* pointer to the parse trees */
@@ -537,7 +537,10 @@ pg_plan(char *query_string, /* string to execute */
537537

538538
if (ShowPlannerStats)
539539
ResetUsage();
540+
541+
/* call that optimizer */
540542
plan = planner(querytree);
543+
541544
if (ShowPlannerStats)
542545
{
543546
fprintf(stderr, "! Planner Stats:\n");
@@ -580,7 +583,7 @@ pg_plan(char *query_string, /* string to execute */
580583
}
581584

582585
/* ----------------------------------------------------------------
583-
* pg_eval()
586+
* pg_exec_query()
584587
*
585588
* Takes a querystring, runs the parser/utilities or
586589
* parser/planner/executor over it as necessary
@@ -597,13 +600,13 @@ pg_plan(char *query_string, /* string to execute */
597600
*/
598601

599602
void
600-
pg_eval(char *query_string, char **argv, Oid *typev, int nargs)
603+
pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs)
601604
{
602-
pg_eval_dest(query_string, argv, typev, nargs, whereToSendOutput);
605+
pg_exec_query_dest(query_string, argv, typev, nargs, whereToSendOutput);
603606
}
604607

605608
void
606-
pg_eval_dest(char *query_string,/* string to execute */
609+
pg_exec_query_dest(char *query_string,/* string to execute */
607610
char **argv, /* arguments */
608611
Oid *typev, /* argument types */
609612
int nargs, /* number of arguments */
@@ -617,9 +620,9 @@ pg_eval_dest(char *query_string,/* string to execute */
617620
QueryTreeList *querytree_list;
618621

619622
/* plan the queries */
620-
plan_list = pg_plan(query_string, typev, nargs, &querytree_list, dest);
623+
plan_list = pg_parse_and_plan(query_string, typev, nargs, &querytree_list, dest);
621624

622-
/* pg_plan could have failed */
625+
/* pg_parse_and_plan could have failed */
623626
if (querytree_list == NULL)
624627
return;
625628

@@ -668,7 +671,7 @@ pg_eval_dest(char *query_string,/* string to execute */
668671
#ifdef INDEXSCAN_PATCH
669672

670673
/*
671-
* Print moved in pg_plan. DZ - 27-8-1996
674+
* Print moved in pg_parse_and_plan. DZ - 27-8-1996
672675
*/
673676
#else
674677
/* ----------------
@@ -1340,7 +1343,7 @@ PostgresMain(int argc, char *argv[])
13401343
if (IsUnderPostmaster == false)
13411344
{
13421345
puts("\nPOSTGRES backend interactive interface");
1343-
puts("$Revision: 1.55 $ $Date: 1997/11/25 22:06:14 $");
1346+
puts("$Revision: 1.56 $ $Date: 1997/12/11 17:36:42 $");
13441347
}
13451348

13461349
/* ----------------
@@ -1510,7 +1513,7 @@ PostgresMain(int argc, char *argv[])
15101513
}
15111514
StartTransactionCommand();
15121515

1513-
pg_eval(parser_input, (char **) NULL, (Oid *) NULL, 0);
1516+
pg_exec_query(parser_input, (char **) NULL, (Oid *) NULL, 0);
15141517

15151518
if (ShowStats)
15161519
ShowUsage();
@@ -1540,7 +1543,7 @@ PostgresMain(int argc, char *argv[])
15401543
* (3) commit the current transaction
15411544
*
15421545
* Note: if we had an empty input buffer, then we didn't
1543-
* call pg_eval, so we don't bother to commit this transaction.
1546+
* call pg_exec_query, so we don't bother to commit this transaction.
15441547
* ----------------
15451548
*/
15461549
if (!IsEmptyQuery)

‎src/include/tcop/tcopprot.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: tcopprot.h,v 1.8 1997/11/25 22:07:10 momjian Exp $
9+
* $Id: tcopprot.h,v 1.9 1997/12/11 17:36:58 momjian Exp $
1010
*
1111
* OLD COMMENTS
1212
* This file was created so that other c files could get the two
@@ -23,11 +23,11 @@
2323

2424
#ifndef BOOTSTRAP_INCLUDE
2525
extern List *
26-
pg_plan(char *query_string, Oid *typev, int nargs,
26+
pg_parse_and_plan(char *query_string, Oid *typev, int nargs,
2727
QueryTreeList **queryListP, CommandDest dest);
28-
extern void pg_eval(char *query_string, char **argv, Oid *typev, int nargs);
28+
extern void pg_exec_query(char *query_string, char **argv, Oid *typev, int nargs);
2929
extern void
30-
pg_eval_dest(char *query_string, char **argv, Oid *typev,
30+
pg_exec_query_dest(char *query_string, char **argv, Oid *typev,
3131
int nargs, CommandDest dest);
3232

3333
#endif /* BOOTSTRAP_HEADER */

0 commit comments

Comments
 (0)