diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-09-20 03:45:08 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-09-20 03:45:08 +0000 |
| commit | a834cbe1e91f496145373b18014e181e15cbd0d5 (patch) | |
| tree | a6af7dd55895dc8559c0c02b5ec4705150060bbd /src | |
| parent | 708a000efea1d0cff59d76c809b4b066a9aca937 (diff) | |
| download | postgresql-a834cbe1e91f496145373b18014e181e15cbd0d5.tar.gz postgresql-a834cbe1e91f496145373b18014e181e15cbd0d5.zip | |
> I'm not sure why NDirectFileRead/NDirectFileWrite are unused at the
> moment, but they used to be used; I think the correct response is to
> put back the missing counter increments, not rip out the counters.
Ok, fair enough. It's worth noting that they've been broken for a
while -- for example, the HashJoin counter increments were broken when
you comitted r1.20 of executor/nodeHashJoin.c in May of '99.
I've attached a revised patch that doesn't remove the counters (but
doesn't increment them either: I'm not sure of all the places where
the counter should be incremented).
Neil Conway
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/prepare.c | 11 | ||||
| -rw-r--r-- | src/backend/tcop/postgres.c | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index 1d2e42b8ce9..5581e64cdb5 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -6,7 +6,7 @@ * Copyright (c) 2002, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.3 2002/09/14 19:59:20 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.4 2002/09/20 03:45:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,14 +76,7 @@ PrepareQuery(PrepareStmt *stmt) Query *query = (Query *) lfirst(query_list_item); Plan *plan; - /* We can't generate plans for utility statements. */ - if (query->commandType == CMD_UTILITY) - plan = NULL; - else - { - /* Call the query planner to generate a plan. */ - plan = planner(query); - } + plan = pg_plan_query(query); plan_list = lappend(plan_list, plan); } diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index cd5f76512a3..0b713f25a48 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.292 2002/09/16 01:24:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.293 2002/09/20 03:45:08 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -486,7 +486,7 @@ pg_plan_query(Query *querytree) if (Show_planner_stats) ResetUsage(); - /* call that optimizer */ + /* call the optimizer */ plan = planner(querytree); if (Show_planner_stats) @@ -1691,7 +1691,7 @@ PostgresMain(int argc, char *argv[], const char *username) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.292 $ $Date: 2002/09/16 01:24:41 $\n"); + puts("$Revision: 1.293 $ $Date: 2002/09/20 03:45:08 $\n"); } /* @@ -2080,7 +2080,7 @@ ShowUsage(const char *title) #endif /* HAVE_GETRUSAGE */ bufusage = ShowBufferUsage(); - appendStringInfo(&str, "! postgres usage stats:\n%s", bufusage); + appendStringInfo(&str, "! buffer usage stats:\n%s", bufusage); pfree(bufusage); /* remove trailing newline */ |