> 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
This commit is contained in:
Bruce Momjian 2002-09-20 03:45:08 +00:00
parent 708a000efe
commit a834cbe1e9
2 changed files with 6 additions and 13 deletions

View File

@ -6,7 +6,7 @@
* Copyright (c) 2002, PostgreSQL Global Development Group * Copyright (c) 2002, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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); Query *query = (Query *) lfirst(query_list_item);
Plan *plan; Plan *plan;
/* We can't generate plans for utility statements. */ plan = pg_plan_query(query);
if (query->commandType == CMD_UTILITY)
plan = NULL;
else
{
/* Call the query planner to generate a plan. */
plan = planner(query);
}
plan_list = lappend(plan_list, plan); plan_list = lappend(plan_list, plan);
} }

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -486,7 +486,7 @@ pg_plan_query(Query *querytree)
if (Show_planner_stats) if (Show_planner_stats)
ResetUsage(); ResetUsage();
/* call that optimizer */ /* call the optimizer */
plan = planner(querytree); plan = planner(querytree);
if (Show_planner_stats) if (Show_planner_stats)
@ -1691,7 +1691,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); 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 */ #endif /* HAVE_GETRUSAGE */
bufusage = ShowBufferUsage(); bufusage = ShowBufferUsage();
appendStringInfo(&str, "! postgres usage stats:\n%s", bufusage); appendStringInfo(&str, "! buffer usage stats:\n%s", bufusage);
pfree(bufusage); pfree(bufusage);
/* remove trailing newline */ /* remove trailing newline */