> I'm not sure why NDirectFileRead/NDirectFileWrite are unused at the

bmomjian · bmomjian · commit a834cbe1e91f · 2002-09-20T03:45:08.000Z
&gt; moment, but they used to be used; I think the correct response is to
&gt; 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
diff --git 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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.292 2002/09/16 01:24:41 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.293 2002/09/20 03:45:08 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -486,7 +486,7 @@ pg_plan_query(Query *querytree)`
`486`	`486`	`if (Show_planner_stats)`
`487`	`487`	`ResetUsage();`
`488`	`488`
`489`		`- /* call that optimizer */`
	`489`	`+ /* call the optimizer */`
`490`	`490`	`plan = planner(querytree);`
`491`	`491`
`492`	`492`	`if (Show_planner_stats)`
`@@ -1691,7 +1691,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1691`	`1691`	`if (!IsUnderPostmaster)`
`1692`	`1692`	`{`
`1693`	`1693`	`puts("\nPOSTGRES backend interactive interface ");`
`1694`		`- puts("$Revision: 1.292 $ $Date: 2002/09/16 01:24:41 $\n");`
	`1694`	`+ puts("$Revision: 1.293 $ $Date: 2002/09/20 03:45:08 $\n");`
`1695`	`1695`	`}`
`1696`	`1696`
`1697`	`1697`	`/*`
`@@ -2080,7 +2080,7 @@ ShowUsage(const char *title)`
`2080`	`2080`	`#endif /* HAVE_GETRUSAGE */`
`2081`	`2081`
`2082`	`2082`	`bufusage = ShowBufferUsage();`
`2083`		`- appendStringInfo(&str, "! postgres usage stats:\n%s", bufusage);`
	`2083`	`+ appendStringInfo(&str, "! buffer usage stats:\n%s", bufusage);`
`2084`	`2084`	`pfree(bufusage);`
`2085`	`2085`
`2086`	`2086`	`/* remove trailing newline */`