diff options
Diffstat (limited to 'src/backend/utils')
45 files changed, 45 insertions, 160 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 0fa61196ea7..c3ac26dce4a 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.133 2006/04/30 21:15:33 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.134 2006/07/14 14:52:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,6 @@ #include "miscadmin.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/inval.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index 1cfb14b41f3..3fab490da88 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -6,18 +6,15 @@ * Copyright (c) 2003-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.19 2006/03/05 15:58:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.20 2006/07/14 14:52:23 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "catalog/pg_proc.h" -#include "catalog/pg_type.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" /*----------------------------------------------------------------------------- diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 78c71595758..58dfb0fc085 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.129 2006/07/11 16:35:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.130 2006/07/14 14:52:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,17 +17,13 @@ #include <ctype.h> #include "access/tupmacs.h" -#include "catalog/catalog.h" -#include "catalog/pg_type.h" #include "libpq/pqformat.h" #include "parser/parse_coerce.h" -#include "parser/parse_oper.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/memutils.h" -#include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index 1b6212317b2..0e30b99d47c 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -5,14 +5,13 @@ * Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/ascii.c,v 1.28 2006/07/11 16:35:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ascii.c,v 1.29 2006/07/14 14:52:23 momjian Exp $ * *----------------------------------------------------------------------- */ #include "postgres.h" #include "mb/pg_wchar.h" -#include "utils/builtins.h" #include "utils/ascii.h" static void pg_to_ascii(unsigned char *src, unsigned char *src_end, diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index a57cba0073a..76962bdcf6d 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,7 +9,7 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.67 2006/03/19 22:22:56 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.68 2006/07/14 14:52:23 momjian Exp $ */ #include "postgres.h" @@ -20,8 +20,6 @@ #include <locale.h> #include "libpq/pqformat.h" -#include "miscadmin.h" -#include "utils/builtins.h" #include "utils/cash.h" #include "utils/pg_locale.h" diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 510b54c1757..9efc7125b19 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.124 2006/03/05 15:58:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.125 2006/07/14 14:52:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,7 +27,6 @@ #include "utils/builtins.h" #include "utils/date.h" #include "utils/nabstime.h" -#include "utils/timestamp.h" /* * gcc's -ffast-math switch breaks routines that expect exact results from diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c index 051145f2376..7c13175e452 100644 --- a/src/backend/utils/adt/domains.c +++ b/src/backend/utils/adt/domains.c @@ -29,7 +29,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.1 2006/04/05 22:11:55 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.2 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,7 +37,6 @@ #include "commands/typecmds.h" #include "executor/executor.h" -#include "lib/stringinfo.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index f395b61e886..55e79e85ed8 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.126 2006/07/14 05:28:28 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.127 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,6 @@ #endif #include "catalog/pg_type.h" -#include "fmgr.h" #include "libpq/pqformat.h" #include "utils/array.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c index a90137db51e..22d9bc156f6 100644 --- a/src/backend/utils/adt/format_type.c +++ b/src/backend/utils/adt/format_type.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/format_type.c,v 1.43 2006/07/11 16:35:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/format_type.c,v 1.44 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,6 @@ #include "catalog/namespace.h" #include "catalog/pg_type.h" -#include "fmgr.h" #include "utils/builtins.h" #include "utils/datetime.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c index 9a303253749..f931658eaed 100644 --- a/src/backend/utils/adt/inet_net_ntop.c +++ b/src/backend/utils/adt/inet_net_ntop.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_ntop.c,v 1.22 2006/04/24 19:51:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_ntop.c,v 1.23 2006/07/14 14:52:24 momjian Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -29,7 +29,6 @@ static const char rcsid[] = "Id: inet_net_ntop.c,v 1.1.2.2 2004/03/09 09:17:27 m #include <arpa/inet.h> #include "utils/inet.h" -#include "utils/builtins.h" #define NS_IN6ADDRSZ 16 diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index e9239e317eb..23a22f9a0a9 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.21 2005/10/15 02:49:28 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.22 2006/07/14 14:52:24 momjian Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -31,7 +31,6 @@ static const char rcsid[] = "Id: inet_net_pton.c,v 1.4.2.3 2004/03/17 00:40:11 m #include <ctype.h> #include "utils/inet.h" -#include "utils/builtins.h" static int inet_net_pton_ipv4(const char *src, u_char *dst); diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 9e4f78f2f46..6d4eddc7bd8 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.22 2006/03/05 15:58:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.23 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include "funcapi.h" #include "access/heapam.h" #include "catalog/pg_type.h" -#include "storage/lock.h" #include "storage/proc.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index a51cd21c659..22c8af482c1 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.52 2006/07/13 16:49:16 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.53 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,6 @@ #include "access/xact.h" #include "catalog/pg_tablespace.h" -#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 6c177fd88d6..28dacfc01ce 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.147 2006/03/05 15:58:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.148 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,10 +22,8 @@ #include <time.h> #include <sys/time.h> -#include "access/xact.h" #include "libpq/pqformat.h" #include "miscadmin.h" -#include "pgtime.h" #include "utils/builtins.h" #include "utils/nabstime.h" diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index b30127fbc56..df6a022e98b 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.65 2006/03/05 15:58:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.66 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,7 +29,6 @@ #endif #include "utils/builtins.h" -#include "utils/pg_locale.h" #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 98ddd7e0546..4bb37bccd7c 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -8,20 +8,16 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.31 2006/07/11 17:26:59 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.32 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/xact.h" -#include "fmgr.h" #include "funcapi.h" #include "miscadmin.h" -#include "nodes/execnodes.h" #include "pgstat.h" #include "utils/builtins.h" -#include "utils/hsearch.h" #include "utils/inet.h" #include "libpq/ip.h" diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 6fbd00ddbde..a7d11eaa6d5 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.64 2006/07/11 17:26:59 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.65 2006/07/14 14:52:24 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -29,7 +29,6 @@ */ #include "postgres.h" -#include "mb/pg_wchar.h" #include "regex/regex.h" #include "utils/builtins.h" #include "utils/guc.h" diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 37bb0d929c3..fcf0f36b73b 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.98 2006/05/01 23:22:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.99 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,6 @@ #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "lib/stringinfo.h" #include "miscadmin.h" #include "parser/parse_type.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 1a114529682..8eac5b8578f 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.85 2006/03/05 15:58:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.86 2006/07/14 14:52:24 momjian Exp $ * * ---------- */ @@ -32,15 +32,10 @@ #include "postgres.h" -#include "catalog/pg_operator.h" #include "commands/trigger.h" #include "executor/spi_priv.h" -#include "optimizer/planmain.h" -#include "parser/parse_oper.h" -#include "rewrite/rewriteHandler.h" #include "utils/acl.h" #include "utils/fmgroids.h" -#include "utils/guc.h" #include "utils/lsyscache.h" #include "utils/typcache.h" #include "miscadmin.h" diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index f701da8582b..e5e54a67da5 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.16 2006/06/16 18:42:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.17 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,7 @@ #include <ctype.h> #include "access/heapam.h" -#include "access/htup.h" #include "catalog/pg_type.h" -#include "lib/stringinfo.h" #include "libpq/pqformat.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 49054882bc3..605efc60403 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -2,7 +2,7 @@ * ruleutils.c - Functions to convert stored expressions/querytrees * back to source text * - * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.227 2006/07/04 04:35:49 neilc Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.228 2006/07/14 14:52:24 momjian Exp $ **********************************************************************/ #include "postgres.h" @@ -12,22 +12,15 @@ #include "access/genam.h" #include "catalog/dependency.h" -#include "catalog/heap.h" -#include "catalog/index.h" #include "catalog/indexing.h" -#include "catalog/namespace.h" #include "catalog/pg_authid.h" -#include "catalog/pg_cast.h" #include "catalog/pg_constraint.h" #include "catalog/pg_depend.h" -#include "catalog/pg_index.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_trigger.h" #include "executor/spi.h" #include "funcapi.h" -#include "lib/stringinfo.h" -#include "miscadmin.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" #include "optimizer/tlist.h" @@ -36,12 +29,10 @@ #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_oper.h" -#include "parser/parse_type.h" #include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" #include "rewrite/rewriteSupport.h" -#include "utils/array.h" #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 69e102b6337..6e08518bc9b 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.208 2006/07/01 22:07:23 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.209 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -76,13 +76,7 @@ #include <ctype.h> #include <math.h> -#include "access/heapam.h" -#include "access/nbtree.h" -#include "access/tuptoaster.h" -#include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" -#include "catalog/pg_operator.h" -#include "catalog/pg_proc.h" #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" #include "mb/pg_wchar.h" @@ -92,18 +86,13 @@ #include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/plancat.h" -#include "optimizer/prep.h" #include "optimizer/restrictinfo.h" -#include "optimizer/tlist.h" #include "optimizer/var.h" #include "parser/parse_expr.h" -#include "parser/parse_func.h" -#include "parser/parse_oper.h" #include "parser/parsetree.h" #include "utils/builtins.h" #include "utils/date.h" #include "utils/datum.h" -#include "utils/int8.h" #include "utils/lsyscache.h" #include "utils/nabstime.h" #include "utils/pg_locale.h" diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index 2353c3db1fa..e0a67d340ef 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,18 +9,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.49 2006/03/05 15:58:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.50 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "catalog/pg_type.h" #include "libpq/pqformat.h" -#include "utils/array.h" -#include "utils/fmgroids.h" -#include "utils/memutils.h" #include "utils/varbit.h" #define HEXDIG(z) ((z)<10 ? ((z)+'0') : ((z)-10+'A')) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 23328e1e8c6..5124bee765c 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.117 2006/07/11 18:26:11 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.118 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,8 @@ #include "access/hash.h" -#include "catalog/pg_type.h" -#include "lib/stringinfo.h" #include "libpq/pqformat.h" -#include "miscadmin.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/fmgroids.h" #include "mb/pg_wchar.h" diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 7e22eb277c7..6215e3eda5a 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.149 2006/07/13 16:49:16 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.150 2006/07/14 14:52:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,14 +19,10 @@ #include "access/tupmacs.h" #include "access/tuptoaster.h" #include "catalog/pg_type.h" -#include "lib/stringinfo.h" #include "libpq/md5.h" #include "libpq/pqformat.h" -#include "mb/pg_wchar.h" -#include "miscadmin.h" #include "parser/scansup.h" #include "regex/regex.h" -#include "utils/array.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/pg_locale.h" diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index edd8eb06bd8..f78db61968e 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.130 2006/07/11 16:35:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.131 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,16 +18,13 @@ #include "access/hash.h" #include "access/heapam.h" #include "access/valid.h" -#include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_type.h" -#include "catalog/indexing.h" #include "miscadmin.h" #ifdef CATCACHE_STATS #include "storage/ipc.h" /* for on_proc_exit */ #endif #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/memutils.h" #include "utils/relcache.h" diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 86a9b530f86..247c6bf5a68 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -80,7 +80,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.76 2006/03/05 15:58:45 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.77 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -92,7 +92,6 @@ #include "miscadmin.h" #include "storage/sinval.h" #include "storage/smgr.h" -#include "utils/catcache.h" #include "utils/inval.h" #include "utils/memutils.h" #include "utils/relcache.h" diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index a52366c5347..93fa1f029f6 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,17 +7,15 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.134 2006/04/05 22:11:55 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.135 2006/07/14 14:52:25 momjian Exp $ * * NOTES * Eventually, the index information should go through here, too. *------------------------------------------------------------------------- */ #include "postgres.h" -#include "miscadmin.h" #include "access/hash.h" -#include "access/tupmacs.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_namespace.h" @@ -29,7 +27,6 @@ #include "nodes/makefuncs.h" #include "utils/array.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/datum.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 88fb44456c1..0fe1f29b251 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.245 2006/07/13 16:49:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.246 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,16 +34,13 @@ #include "access/heapam.h" #include "access/reloptions.h" #include "access/xact.h" -#include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/namespace.h" #include "catalog/pg_amop.h" #include "catalog/pg_amproc.h" #include "catalog/pg_attrdef.h" -#include "catalog/pg_attribute.h" #include "catalog/pg_authid.h" #include "catalog/pg_constraint.h" -#include "catalog/pg_index.h" #include "catalog/pg_namespace.h" #include "catalog/pg_opclass.h" #include "catalog/pg_proc.h" @@ -57,10 +54,8 @@ #include "storage/fd.h" #include "storage/smgr.h" #include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/fmgroids.h" #include "utils/inval.h" -#include "utils/lsyscache.h" #include "utils/memutils.h" #include "utils/relcache.h" #include "utils/resowner.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 819f15bf242..2eaa9ee0969 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.105 2006/07/11 18:26:11 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.106 2006/07/14 14:52:25 momjian Exp $ * * NOTES * These routines allow the parser/planner/executor to perform @@ -21,7 +21,6 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/transam.h" #include "catalog/indexing.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_amop.h" @@ -31,7 +30,6 @@ #include "catalog/pg_cast.h" #include "catalog/pg_conversion.h" #include "catalog/pg_database.h" -#include "catalog/pg_index.h" #include "catalog/pg_inherits.h" #include "catalog/pg_language.h" #include "catalog/pg_namespace.h" @@ -41,10 +39,7 @@ #include "catalog/pg_rewrite.h" #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" -#include "utils/builtins.h" -#include "utils/catcache.h" #include "utils/syscache.h" -#include "miscadmin.h" /*--------------------------------------------------------------------------- diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index 052aa24c8e8..ee91c9fe411 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -36,7 +36,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.20 2006/07/11 18:26:11 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.21 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,8 +48,6 @@ #include "catalog/pg_type.h" #include "commands/defrem.h" #include "utils/builtins.h" -#include "utils/catcache.h" -#include "utils/hsearch.h" #include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 4e8b50f58b6..e46d16fa55d 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.172 2006/07/13 16:49:17 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.173 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -67,7 +67,6 @@ #include "postmaster/syslogger.h" #include "storage/ipc.h" #include "tcop/tcopprot.h" -#include "utils/guc.h" #include "utils/memutils.h" #include "utils/ps_status.h" diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 75f9d0eaf1b..f98b9494231 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.68 2006/06/25 18:29:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.69 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,6 @@ #include "storage/shmem.h" #include "utils/dynahash.h" -#include "utils/hsearch.h" #include "utils/memutils.h" /* diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index da42eb660ed..ed0826e8e51 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/hashfn.c,v 1.26 2006/03/05 15:58:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/hash/hashfn.c,v 1.27 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include "access/hash.h" #include "nodes/bitmapset.h" -#include "utils/hsearch.h" /* diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index ab73f361f16..51054108767 100644 --- a/src/backend/utils/hash/pg_crc.c +++ b/src/backend/utils/hash/pg_crc.c @@ -19,13 +19,12 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.15 2006/03/05 15:58:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.16 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/pg_crc.h" /* diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c index 1a37d111414..8867ec3e015 100644 --- a/src/backend/utils/init/flatfiles.c +++ b/src/backend/utils/init/flatfiles.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.20 2006/07/13 16:49:18 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.21 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,11 +45,9 @@ #include "miscadmin.h" #include "storage/fd.h" #include "storage/pmsignal.h" -#include "utils/acl.h" #include "utils/builtins.h" #include "utils/flatfiles.h" #include "utils/resowner.h" -#include "utils/syscache.h" /* Actual names of the flat files (within $PGDATA) */ diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 43e4abbeb25..35d9da2a08a 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.154 2006/03/05 15:58:46 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.155 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,7 +30,6 @@ #endif #include "catalog/pg_authid.h" -#include "libpq/libpq-be.h" #include "miscadmin.h" #include "postmaster/autovacuum.h" #include "storage/fd.h" @@ -40,7 +39,6 @@ #include "storage/procarray.h" #include "utils/builtins.h" #include "utils/guc.h" -#include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index 3760bd78cfe..1c23b107400 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,14 +2,13 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.30 2006/06/07 22:24:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.31 2006/07/14 14:52:25 momjian Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" #define Assert(condition) #else #include "postgres.h" -#include "miscadmin.h" #include "utils/builtins.h" #endif diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index a9003658b73..c45d3eb7781 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,14 +4,13 @@ * (currently mule internal code (mic) is used) * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.57 2006/07/11 17:04:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.58 2006/07/14 14:52:25 momjian Exp $ */ #include "postgres.h" #include "access/xact.h" #include "catalog/namespace.h" #include "mb/pg_wchar.h" -#include "miscadmin.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/syscache.h" diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 796401a1de0..f1bc6e11c48 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.327 2006/07/13 16:49:18 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.328 2006/07/14 14:52:25 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -29,17 +29,12 @@ #include "access/twophase.h" #include "access/xact.h" #include "catalog/namespace.h" -#include "catalog/pg_type.h" #include "commands/async.h" #include "commands/vacuum.h" #include "commands/variable.h" -#include "executor/executor.h" -#include "fmgr.h" #include "funcapi.h" #include "libpq/auth.h" -#include "libpq/pqcomm.h" #include "libpq/pqformat.h" -#include "mb/pg_wchar.h" #include "miscadmin.h" #include "optimizer/cost.h" #include "optimizer/geqo.h" @@ -54,15 +49,10 @@ #include "postmaster/bgwriter.h" #include "postmaster/postmaster.h" #include "postmaster/syslogger.h" -#include "storage/bufmgr.h" #include "storage/fd.h" #include "storage/freespace.h" -#include "storage/lock.h" -#include "storage/proc.h" #include "tcop/tcopprot.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/guc.h" #include "utils/guc_tables.h" #include "utils/memutils.h" #include "utils/pg_locale.h" diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c index 65fe96312ac..a0c1082db26 100644 --- a/src/backend/utils/misc/help_config.c +++ b/src/backend/utils/misc/help_config.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.16 2006/03/05 15:58:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.17 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include <limits.h> #include <unistd.h> -#include "utils/guc.h" #include "utils/guc_tables.h" #include "utils/help_config.h" diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 1aa633b6878..f6480f87732 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -14,14 +14,13 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.57 2006/03/05 15:58:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.58 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "nodes/memnodes.h" #include "utils/memutils.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index fe9ae72c636..1be86efe2f3 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.89 2006/07/13 16:49:18 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.90 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,13 +22,10 @@ #include "access/xact.h" #include "catalog/pg_type.h" #include "commands/portalcmds.h" -#include "executor/executor.h" #include "funcapi.h" #include "miscadmin.h" #include "utils/builtins.h" -#include "utils/hsearch.h" #include "utils/memutils.h" -#include "utils/portal.h" /* * Estimate of the maximum number of open portals a user would have, diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index 346975332ef..490f36c297c 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -14,15 +14,13 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.21 2006/07/11 17:26:59 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.22 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/gistscan.h" #include "access/hash.h" -#include "storage/bufmgr.h" #include "storage/proc.h" #include "utils/memutils.h" #include "utils/resowner.h" diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 67c2e9ab5db..7d503f244fb 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -91,7 +91,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.67 2006/06/27 16:53:02 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.68 2006/07/14 14:52:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -103,7 +103,6 @@ #include "catalog/pg_amop.h" #include "catalog/pg_operator.h" #include "miscadmin.h" -#include "utils/catcache.h" #include "utils/datum.h" #include "utils/logtape.h" #include "utils/lsyscache.h" |