aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2009-12-01 02:31:13 +0000
committerBruce Momjian <bruce@momjian.us>2009-12-01 02:31:13 +0000
commitef51395e24c7452a9a50e3576b52fb64602f8cad (patch)
tree6d349d86f08cb0f30fc3c71434f82ad2049495f2 /src
parentd85cb27293a2bafb2f6f8c5d965cc8af33c4bf48 (diff)
downloadpostgresql-ef51395e24c7452a9a50e3576b52fb64602f8cad.tar.gz
postgresql-ef51395e24c7452a9a50e3576b52fb64602f8cad.zip
Revert due to Tom's concerns:
Add ProcessUtility_hook() to handle all DDL to contrib/pg_stat_statements.
Diffstat (limited to 'src')
-rw-r--r--src/backend/tcop/utility.c23
-rw-r--r--src/include/tcop/utility.h11
2 files changed, 2 insertions, 32 deletions
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 67333b1796a..f4263d39e65 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.319 2009/12/01 01:08:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.320 2009/12/01 02:31:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,9 +58,6 @@
#include "utils/syscache.h"
-/* Hooks for plugins to get control in ProcessUtility() */
-ProcessUtility_hook_type ProcessUtility_hook = NULL;
-
/*
* Verify user has ownership of specified relation, else ereport.
*
@@ -247,10 +244,6 @@ check_xact_readonly(Node *parsetree)
* completionTag is only set nonempty if we want to return a nondefault status.
*
* completionTag may be NULL if caller doesn't want a status string.
- *
- * We provide a function hook variable that lets loadable plugins
- * get control when ProcessUtility is called. Such a plugin would
- * normally call standard_ProcessUtility().
*/
void
ProcessUtility(Node *parsetree,
@@ -267,20 +260,6 @@ ProcessUtility(Node *parsetree,
if (completionTag)
completionTag[0] = '\0';
- if (ProcessUtility_hook)
- (*ProcessUtility_hook) (parsetree, queryString, params, isTopLevel, dest, completionTag);
- else
- standard_ProcessUtility(parsetree, queryString, params, isTopLevel, dest, completionTag);
-}
-
-void
-standard_ProcessUtility(Node *parsetree,
- const char *queryString,
- ParamListInfo params,
- bool isTopLevel,
- DestReceiver *dest,
- char *completionTag)
-{
switch (nodeTag(parsetree))
{
/*
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index ce3ee1fb055..271a97d690a 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.36 2009/12/01 01:08:46 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.37 2009/12/01 02:31:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,18 +17,9 @@
#include "tcop/tcopprot.h"
-/* Hook for plugins to get control in ProcessUtility() */
-typedef void (*ProcessUtility_hook_type) (Node *parsetree,
- const char *queryString, ParamListInfo params, bool isTopLevel,
- DestReceiver *dest, char *completionTag);
-extern PGDLLIMPORT ProcessUtility_hook_type ProcessUtility_hook;
-
extern void ProcessUtility(Node *parsetree, const char *queryString,
ParamListInfo params, bool isTopLevel,
DestReceiver *dest, char *completionTag);
-extern void standard_ProcessUtility(Node *parsetree, const char *queryString,
- ParamListInfo params, bool isTopLevel,
- DestReceiver *dest, char *completionTag);
extern bool UtilityReturnsTuples(Node *parsetree);