From 90e04bab39c59aa441a8a5e94022c6074e8cd2d6 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Sat, 24 Apr 2010 16:20:32 +0000 Subject: [PATCH] Patch revoked because of objections. --- src/backend/utils/cache/lsyscache.c | 17 +---------------- src/include/utils/lsyscache.h | 8 +------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 891abf422b..cc33c459a2 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.169 2010/04/23 22:23:39 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.170 2010/04/24 16:20:32 sriggs Exp $ * * NOTES * Eventually, the index information should go through here, too. @@ -38,9 +38,6 @@ /* Hook for plugins to get control in get_attavgwidth() */ get_attavgwidth_hook_type get_attavgwidth_hook = NULL; -/* Hook for plugins to get control in get_func_cost and get_func_rows */ -get_func_cost_hook_type get_func_cost_hook = NULL; -get_func_rows_hook_type get_func_rows_hook = NULL; /* ---------- AMOP CACHES ---------- */ @@ -1412,12 +1409,6 @@ get_func_cost(Oid funcid) HeapTuple tp; float4 result; - if (get_func_cost_hook) - { - result = (*get_func_cost_hook) (funcid); - if (result > (float4) 0) - return result; - } tp = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid)); if (!HeapTupleIsValid(tp)) elog(ERROR, "cache lookup failed for function %u", funcid); @@ -1437,12 +1428,6 @@ get_func_rows(Oid funcid) HeapTuple tp; float4 result; - if (get_func_rows_hook) - { - result = (*get_func_rows_hook) (funcid); - if (result > (float4) 0) - return result; - } tp = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid)); if (!HeapTupleIsValid(tp)) elog(ERROR, "cache lookup failed for function %u", funcid); diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index e25a4d9475..b16ab8680a 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.132 2010/04/23 22:23:39 sriggs Exp $ + * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.133 2010/04/24 16:20:32 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -30,12 +30,6 @@ typedef enum IOFuncSelector typedef int32 (*get_attavgwidth_hook_type) (Oid relid, AttrNumber attnum); extern PGDLLIMPORT get_attavgwidth_hook_type get_attavgwidth_hook; -/* Hook for plugins to get control in get_func_cost and get_func_rows */ -typedef float4 (*get_func_cost_hook_type) (Oid funcid); -extern PGDLLIMPORT get_func_cost_hook_type get_func_cost_hook; -typedef float4 (*get_func_rows_hook_type) (Oid funcid); -extern PGDLLIMPORT get_func_rows_hook_type get_func_rows_hook; - extern bool op_in_opfamily(Oid opno, Oid opfamily); extern int get_op_opfamily_strategy(Oid opno, Oid opfamily); extern void get_op_opfamily_properties(Oid opno, Oid opfamily,