From a71802e12ec04fed791ea47f24ea30e0f5d9f5c2 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 16 Jul 1999 05:00:38 +0000 Subject: [PATCH] Final cleanup. --- src/backend/access/common/heaptuple.c | 3 +- src/backend/access/common/indextuple.c | 3 +- src/backend/access/common/tupdesc.c | 3 +- src/backend/access/gist/gist.c | 3 +- src/backend/access/gist/gistget.c | 1 + src/backend/access/gist/gistscan.c | 3 +- src/backend/access/hash/hash.c | 9 ++-- src/backend/access/hash/hashovfl.c | 3 +- src/backend/access/hash/hashpage.c | 5 +- src/backend/access/hash/hashsearch.c | 3 +- src/backend/access/hash/hashutil.c | 3 +- src/backend/access/heap/heapam.c | 13 ++--- src/backend/access/heap/hio.c | 4 +- src/backend/access/heap/stats.c | 3 +- src/backend/access/index/genam.c | 4 +- src/backend/access/index/indexam.c | 4 +- src/backend/access/index/istrat.c | 4 +- src/backend/access/nbtree/nbtinsert.c | 5 +- src/backend/access/nbtree/nbtpage.c | 10 ++-- src/backend/access/nbtree/nbtree.c | 18 +++---- src/backend/access/nbtree/nbtsearch.c | 3 +- src/backend/access/nbtree/nbtsort.c | 3 +- src/backend/access/nbtree/nbtutils.c | 3 +- src/backend/access/rtree/rtget.c | 3 +- src/backend/access/rtree/rtproc.c | 3 +- src/backend/access/rtree/rtree.c | 11 +++-- src/backend/access/rtree/rtscan.c | 3 +- src/backend/access/rtree/rtstrat.c | 4 +- src/backend/access/transam/transsup.c | 4 +- src/backend/access/transam/xact.c | 10 ++-- src/backend/bootstrap/bootparse.y | 4 +- src/backend/bootstrap/bootscanner.l | 39 +++++++-------- src/backend/bootstrap/bootstrap.c | 6 ++- src/backend/catalog/aclchk.c | 8 ++-- src/backend/catalog/catalog.c | 10 ++-- src/backend/catalog/heap.c | 5 +- src/backend/catalog/index.c | 13 ++--- src/backend/catalog/pg_aggregate.c | 9 ++-- src/backend/catalog/pg_operator.c | 5 +- src/backend/catalog/pg_proc.c | 5 +- src/backend/catalog/pg_type.c | 3 +- src/backend/commands/_deadcode/recipe.c | 20 ++++---- src/backend/commands/async.c | 6 +-- src/backend/commands/cluster.c | 14 +++--- src/backend/commands/command.c | 10 ++-- src/backend/commands/copy.c | 23 ++++----- src/backend/commands/creatinh.c | 10 ++-- src/backend/commands/dbcommands.c | 4 +- src/backend/commands/define.c | 16 +++---- src/backend/commands/explain.c | 10 ++-- src/backend/commands/indexcmds.c | 12 ++--- src/backend/commands/remove.c | 3 +- src/backend/commands/rename.c | 14 +++--- src/backend/commands/sequence.c | 4 +- src/backend/commands/trigger.c | 10 ++-- src/backend/commands/user.c | 8 ++-- src/backend/commands/vacuum.c | 5 +- src/backend/commands/variable.c | 13 +++-- src/backend/commands/view.c | 8 ++-- src/backend/executor/_deadcode/nodeTee.c | 16 +++---- src/backend/executor/execAmi.c | 38 +++++++-------- src/backend/executor/execFlatten.c | 4 +- src/backend/executor/execMain.c | 21 ++++---- src/backend/executor/execProcnode.c | 26 +++++----- src/backend/executor/execQual.c | 4 +- src/backend/executor/execTuples.c | 5 +- src/backend/executor/execUtils.c | 4 +- src/backend/executor/functions.c | 11 ++--- src/backend/executor/nodeAgg.c | 4 +- src/backend/executor/nodeAppend.c | 4 +- src/backend/executor/nodeHashjoin.c | 2 +- src/backend/executor/nodeIndexscan.c | 16 +++---- src/backend/executor/nodeMaterial.c | 6 +-- src/backend/executor/nodeMergejoin.c | 8 ++-- src/backend/executor/nodeNestloop.c | 4 +- src/backend/executor/nodeSeqscan.c | 8 ++-- src/backend/executor/nodeSort.c | 4 +- src/backend/executor/nodeSubplan.c | 2 +- src/backend/executor/nodeUnique.c | 6 +-- src/backend/lib/fstack.c | 4 +- src/backend/lib/hasht.c | 4 +- src/backend/libpq/auth.c | 11 ++--- src/backend/libpq/be-dumpdata.c | 8 ++-- src/backend/libpq/be-fsstubs.c | 6 +-- src/backend/libpq/be-pqexec.c | 5 +- src/backend/libpq/crypt.c | 9 ++-- src/backend/libpq/hba.c | 4 +- src/backend/libpq/password.c | 12 +++-- src/backend/libpq/portal.c | 2 +- src/backend/libpq/portalbuf.c | 2 +- src/backend/libpq/pqcomm.c | 17 +++---- src/backend/libpq/pqformat.c | 6 ++- src/backend/libpq/pqsignal.c | 6 +-- src/backend/nodes/copyfuncs.c | 5 +- src/backend/nodes/equalfuncs.c | 5 +- src/backend/nodes/outfuncs.c | 18 ++++--- src/backend/nodes/print.c | 4 +- src/backend/nodes/read.c | 3 +- src/backend/nodes/readfuncs.c | 8 ++-- src/backend/optimizer/geqo/geqo_copy.c | 4 +- src/backend/optimizer/geqo/geqo_cx.c | 6 +-- src/backend/optimizer/geqo/geqo_erx.c | 6 +-- src/backend/optimizer/geqo/geqo_eval.c | 14 +++--- src/backend/optimizer/geqo/geqo_main.c | 8 +--- src/backend/optimizer/geqo/geqo_misc.c | 6 +-- src/backend/optimizer/geqo/geqo_mutation.c | 8 +--- src/backend/optimizer/geqo/geqo_ox1.c | 8 +--- src/backend/optimizer/geqo/geqo_ox2.c | 8 +--- src/backend/optimizer/geqo/geqo_params.c | 17 +++---- src/backend/optimizer/geqo/geqo_pmx.c | 8 +--- src/backend/optimizer/geqo/geqo_pool.c | 8 +--- src/backend/optimizer/geqo/geqo_px.c | 8 +--- .../optimizer/geqo/geqo_recombination.c | 8 +--- src/backend/optimizer/geqo/geqo_selection.c | 8 +--- src/backend/optimizer/geqo/minspantree.c | 14 ++---- src/backend/optimizer/path/_deadcode/xfunc.c | 4 +- src/backend/optimizer/path/allpaths.c | 12 ++--- src/backend/optimizer/path/clausesel.c | 4 +- src/backend/optimizer/path/costsize.c | 6 +-- src/backend/optimizer/path/hashutils.c | 4 +- src/backend/optimizer/path/indxpath.c | 10 ++-- src/backend/optimizer/path/joinpath.c | 6 +-- src/backend/optimizer/path/joinrels.c | 6 +-- src/backend/optimizer/path/mergeutils.c | 4 +- src/backend/optimizer/path/orindxpath.c | 12 ++--- src/backend/optimizer/path/pathkeys.c | 8 ++-- src/backend/optimizer/path/prune.c | 4 +- src/backend/optimizer/plan/createplan.c | 20 ++++---- src/backend/optimizer/plan/initsplan.c | 21 ++++---- src/backend/optimizer/plan/planmain.c | 10 ++-- src/backend/optimizer/plan/planner.c | 28 +++++------ src/backend/optimizer/plan/setrefs.c | 7 ++- src/backend/optimizer/plan/subselect.c | 6 +-- src/backend/optimizer/prep/prepqual.c | 6 +-- src/backend/optimizer/prep/preptlist.c | 18 +++---- src/backend/optimizer/prep/prepunion.c | 12 ++--- src/backend/optimizer/util/clauses.c | 9 ++-- src/backend/optimizer/util/indexnode.c | 4 +- src/backend/optimizer/util/joininfo.c | 4 +- src/backend/optimizer/util/pathnode.c | 10 ++-- src/backend/optimizer/util/plancat.c | 15 +++--- src/backend/optimizer/util/restrictinfo.c | 6 +-- src/backend/optimizer/util/tlist.c | 10 ++-- src/backend/parser/analyze.c | 8 ++-- src/backend/parser/gram.y | 16 +++---- src/backend/parser/parse_agg.c | 6 +-- src/backend/parser/parse_clause.c | 8 ++-- src/backend/parser/parse_coerce.c | 8 ++-- src/backend/parser/parse_expr.c | 4 +- src/backend/parser/parse_func.c | 6 +-- src/backend/parser/parse_node.c | 6 +-- src/backend/parser/parse_oper.c | 6 +-- src/backend/parser/parse_relation.c | 6 +-- src/backend/parser/parse_target.c | 4 +- src/backend/parser/parser.c | 3 +- src/backend/parser/scan.l | 6 +-- src/backend/port/dynloader/freebsd.h | 4 +- src/backend/port/dynloader/hpux.c | 5 +- src/backend/port/dynloader/linux.c | 3 +- src/backend/port/dynloader/ultrix4.c | 5 +- src/backend/port/isinf.c | 3 +- src/backend/port/snprintf.c | 4 +- src/backend/postmaster/postmaster.c | 48 ++++++++++--------- src/backend/rewrite/locks.c | 10 ++-- src/backend/rewrite/rewriteHandler.c | 28 +++++------ src/backend/rewrite/rewriteManip.c | 10 ++-- src/backend/rewrite/rewriteRemove.c | 6 +-- src/backend/rewrite/rewriteSupport.c | 6 +-- src/backend/storage/buffer/buf_init.c | 15 +++--- src/backend/storage/buffer/bufmgr.c | 9 ++-- src/backend/storage/buffer/freelist.c | 3 +- src/backend/storage/buffer/localbuf.c | 6 +-- src/backend/storage/ipc/ipci.c | 6 +-- src/backend/storage/ipc/spin.c | 7 +-- src/backend/storage/large_object/inv_api.c | 10 ++-- src/backend/storage/lmgr/lmgr.c | 4 +- src/backend/storage/lmgr/lock.c | 6 +-- src/backend/storage/lmgr/multi.c | 6 +-- src/backend/storage/lmgr/proc.c | 5 +- src/backend/storage/smgr/md.c | 4 +- src/backend/tcop/dest.c | 7 +-- src/backend/tcop/fastpath.c | 15 +++--- src/backend/tcop/postgres.c | 25 ++++------ src/backend/tcop/pquery.c | 6 +-- src/backend/tcop/utility.c | 33 ++++++------- src/backend/tioga/tgRecipe.c | 4 +- src/backend/utils/adt/acl.c | 8 ++-- src/backend/utils/adt/arrayfuncs.c | 14 +++--- src/backend/utils/adt/cash.c | 3 +- src/backend/utils/adt/char.c | 4 +- src/backend/utils/adt/chunk.c | 19 ++++---- src/backend/utils/adt/date.c | 5 +- src/backend/utils/adt/dt.c | 6 +-- src/backend/utils/adt/int.c | 5 +- src/backend/utils/adt/like.c | 4 +- src/backend/utils/adt/nabstime.c | 7 +-- src/backend/utils/adt/name.c | 2 +- src/backend/utils/adt/not_in.c | 2 +- src/backend/utils/adt/numutils.c | 8 ++-- src/backend/utils/adt/oid.c | 2 +- src/backend/utils/adt/regexp.c | 4 +- src/backend/utils/adt/regproc.c | 10 ++-- src/backend/utils/adt/selfuncs.c | 10 ++-- src/backend/utils/adt/sets.c | 4 +- src/backend/utils/adt/timestamp.c | 2 +- src/backend/utils/adt/varchar.c | 5 +- src/backend/utils/adt/varlena.c | 4 +- src/backend/utils/cache/catcache.c | 10 ++-- src/backend/utils/cache/fcache.c | 20 ++++---- src/backend/utils/cache/inval.c | 7 ++- 210 files changed, 833 insertions(+), 907 deletions(-) diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 950a7f6030..576e0f4e25 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.55 1999/07/15 23:02:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.56 1999/07/16 04:58:21 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -23,6 +23,7 @@ #include "catalog/pg_type.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 8ed3adcd15..be7e250dd8 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.35 1999/07/15 23:02:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.36 1999/07/16 04:58:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "catalog/pg_type.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index 99f867c968..f8b4147b33 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.52 1999/07/15 23:02:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.53 1999/07/16 04:58:22 momjian Exp $ * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be @@ -27,6 +27,7 @@ #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 934d7e5911..8dab9755cc 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -13,16 +13,17 @@ #include "postgres.h" -#include "catalog/pg_index.h" #include "access/genam.h" #include "access/gist.h" #include "access/gistscan.h" #include "access/heapam.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "executor/executor.h" #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 26736686e6..f35a0f7cd3 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -17,6 +17,7 @@ #include "executor/execdebug.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 9bc3acc719..c455309443 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -12,11 +12,12 @@ #include "postgres.h" +#include "access/genam.h" #include "access/gist.h" #include "access/gistscan.h" -#include "access/genam.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index def7ce8394..74fa62931e 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.28 1999/07/15 23:02:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.29 1999/07/16 04:58:24 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -17,14 +17,15 @@ #include "postgres.h" -#include "access/hash.h" -#include "executor/executor.h" -#include "access/heapam.h" #include "access/genam.h" +#include "access/hash.h" +#include "access/heapam.h" #include "catalog/index.h" +#include "executor/executor.h" #include "miscadmin.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index d6eb973654..fd4d814cc9 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.22 1999/07/15 23:02:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.23 1999/07/16 04:58:25 momjian Exp $ * * NOTES * Overflow pages look like ordinary relation pages. @@ -19,6 +19,7 @@ #include "access/hash.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index 083fbcb13b..d0c1a30062 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.22 1999/07/15 23:02:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.23 1999/07/16 04:58:25 momjian Exp $ * * NOTES * Postgres hash pages look like ordinary relation pages. The opaque @@ -25,11 +25,12 @@ #include "postgres.h" +#include "access/genam.h" #include "access/hash.h" #include "miscadmin.h" -#include "access/genam.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index 2253fc56db..a405279d0c 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.19 1999/07/15 23:02:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.20 1999/07/16 04:58:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "access/hash.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index b544034241..8ddfd22f6e 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.19 1999/07/15 23:02:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.20 1999/07/16 04:58:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "access/iqual.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 5437921e86..ca97ce4657 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.50 1999/07/15 23:02:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.51 1999/07/16 04:58:26 momjian Exp $ * * * INTERFACE ROUTINES @@ -76,16 +76,17 @@ #include "postgres.h" #include "access/heapam.h" -#include "miscadmin.h" -#include "utils/relcache.h" -#include "access/valid.h" #include "access/hio.h" -#include "storage/smgr.h" +#include "access/valid.h" #include "catalog/catalog.h" -#include "utils/inval.h" +#include "miscadmin.h" +#include "storage/smgr.h" #include "utils/builtins.h" +#include "utils/inval.h" +#include "utils/relcache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index e5e476d5f0..481692dea0 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -7,15 +7,15 @@ * * * IDENTIFICATION - * $Id: hio.c,v 1.24 1999/07/15 23:02:57 momjian Exp $ + * $Id: hio.c,v 1.25 1999/07/16 04:58:27 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/hio.h" #include "access/heapam.h" +#include "access/hio.h" /* * amputunique - place tuple at tid diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c index 6b5d50e50c..d5fd03382a 100644 --- a/src/backend/access/heap/stats.c +++ b/src/backend/access/heap/stats.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.19 1999/07/15 23:02:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.20 1999/07/16 04:58:27 momjian Exp $ * * NOTES * initam should be moved someplace else. @@ -23,6 +23,7 @@ #include "access/heapam.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index 60b9599f12..cf2db25065 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.19 1999/07/15 23:02:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.20 1999/07/16 04:58:27 momjian Exp $ * * NOTES * many of the old access method routines have been turned into @@ -45,10 +45,10 @@ */ #include "postgres.h" - #include "access/genam.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 00d5fdf21a..869e5e1e69 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.34 1999/07/15 23:02:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.35 1999/07/16 04:58:28 momjian Exp $ * * INTERFACE ROUTINES * index_open - open an index relation by relationId @@ -66,8 +66,8 @@ #include "postgres.h" #include "access/genam.h" -#include "utils/relcache.h" #include "access/heapam.h" +#include "utils/relcache.h" /* ---------------- * undefine macros we aren't going to use that would otherwise diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c index ad0215dfb4..1cdaadbc0c 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,14 +8,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.34 1999/07/15 22:38:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.35 1999/07/16 04:58:28 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "miscadmin.h" #include "access/heapam.h" #include "access/istrat.h" #include "catalog/catname.h" @@ -23,6 +22,7 @@ #include "catalog/pg_amproc.h" #include "catalog/pg_index.h" #include "catalog/pg_operator.h" +#include "miscadmin.h" #include "utils/syscache.h" #ifdef USE_ASSERT_CHECKING diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 14ef86accf..23954d7fed 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -7,17 +7,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.46 1999/07/15 23:03:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.47 1999/07/16 04:58:29 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/nbtree.h" #include "access/heapam.h" +#include "access/nbtree.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index e43110a8c2..6bdcd43cb5 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.28 1999/07/15 23:03:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.29 1999/07/16 04:58:29 momjian Exp $ * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque @@ -23,15 +23,15 @@ #include #include "postgres.h" - -#include "access/nbtree.h" -#include "miscadmin.h" - #ifndef HAVE_MEMMOVE +#include #else #include #endif +#include "access/nbtree.h" +#include "miscadmin.h" + #define BTREE_METAPAGE 0 #define BTREE_MAGIC 0x053162 diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index a483cd8985..a38160cc1e 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.43 1999/07/15 23:03:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.44 1999/07/16 04:58:30 momjian Exp $ * * NOTES * This file contains only the public interface routines. @@ -17,19 +17,19 @@ */ #include "postgres.h" - -#include "access/genam.h" -#include "access/nbtree.h" -#include "executor/executor.h" -#include "access/heapam.h" -#include "catalog/index.h" -#include "miscadmin.h" - #ifndef HAVE_MEMMOVE +#include #else #include #endif +#include "access/genam.h" +#include "access/heapam.h" +#include "access/nbtree.h" +#include "catalog/index.h" +#include "executor/executor.h" +#include "miscadmin.h" + #ifdef BTREE_BUILD_STATS #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS] #endif diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 0cb2850c4f..74c8b173fe 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.49 1999/07/15 23:03:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.50 1999/07/16 04:58:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "access/nbtree.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index 1a90f8322f..aeed3a29e4 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -5,7 +5,7 @@ * * * IDENTIFICATION - * $Id: nbtsort.c,v 1.43 1999/07/15 22:38:49 momjian Exp $ + * $Id: nbtsort.c,v 1.44 1999/07/16 04:58:30 momjian Exp $ * * NOTES * @@ -54,6 +54,7 @@ #include "access/nbtree.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 2a17881812..e4b3b2500a 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.30 1999/07/15 22:38:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.31 1999/07/16 04:58:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ extern int NIndexTupleProcessed; #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c index 0f1dba0383..539d4b212a 100644 --- a/src/backend/access/rtree/rtget.c +++ b/src/backend/access/rtree/rtget.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.17 1999/07/15 23:03:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.18 1999/07/16 04:58:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "access/rtree.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c index 49c7808c82..aa24c3546d 100644 --- a/src/backend/access/rtree/rtproc.c +++ b/src/backend/access/rtree/rtproc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.22 1999/07/15 23:03:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.23 1999/07/16 04:58:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "utils/builtins.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c index 5e5ede35e3..1d1891ecbb 100644 --- a/src/backend/access/rtree/rtree.c +++ b/src/backend/access/rtree/rtree.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.34 1999/07/15 23:03:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.35 1999/07/16 04:58:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,13 +15,14 @@ #include "postgres.h" #include "access/genam.h" -#include "catalog/index.h" -#include "access/rtree.h" -#include "utils/geo_decls.h" -#include "executor/executor.h" #include "access/heapam.h" +#include "access/rtree.h" +#include "catalog/index.h" +#include "executor/executor.h" +#include "utils/geo_decls.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c index a249a82152..6f08fa271d 100644 --- a/src/backend/access/rtree/rtscan.c +++ b/src/backend/access/rtree/rtscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.27 1999/07/15 23:03:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.28 1999/07/16 04:58:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "access/rtree.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c index b9489c7ebe..7e5ab2e1c1 100644 --- a/src/backend/access/rtree/rtstrat.c +++ b/src/backend/access/rtree/rtstrat.c @@ -7,15 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.13 1999/07/15 23:03:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.14 1999/07/16 04:58:32 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "access/rtree.h" #include "access/istrat.h" +#include "access/rtree.h" static StrategyNumber RelationGetRTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c index d874674a91..e5e4ca8198 100644 --- a/src/backend/access/transam/transsup.c +++ b/src/backend/access/transam/transsup.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.23 1999/07/15 23:03:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.24 1999/07/16 04:58:33 momjian Exp $ * * NOTES * This file contains support functions for the high @@ -18,8 +18,8 @@ #include "postgres.h" -#include "utils/bit.h" #include "access/xact.h" +#include "utils/bit.h" static XidStatus TransBlockGetXidStatus(Block tblock, TransactionId transactionId); diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 2059ec9b75..53f38d7996 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.45 1999/07/15 23:03:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.46 1999/07/16 04:58:33 momjian Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -144,14 +144,14 @@ */ #include "postgres.h" -#include "utils/inval.h" -#include "utils/portal.h" -#include "storage/proc.h" #include "catalog/heap.h" -#include "utils/relcache.h" #include "commands/async.h" #include "commands/sequence.h" #include "libpq/be-fsstubs.h" +#include "storage/proc.h" +#include "utils/inval.h" +#include "utils/portal.h" +#include "utils/relcache.h" extern bool SharedBufferChanged; diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index d1808bdbb2..b601d49cba 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.25 1999/05/10 00:44:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.26 1999/07/16 04:58:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,6 @@ #include "postgres.h" -#include "miscadmin.h" #include "access/attnum.h" #include "access/funcindex.h" @@ -34,6 +33,7 @@ #include "catalog/pg_attribute.h" #include "catalog/pg_class.h" #include "commands/defrem.h" +#include "miscadmin.h" #include "nodes/nodes.h" #include "nodes/parsenodes.h" #include "nodes/pg_list.h" diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l index 331e0f722d..d5a513d019 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.12 1999/02/13 23:14:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.13 1999/07/16 04:58:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,31 +17,32 @@ #include "postgres.h" -#include "storage/block.h" -#include "storage/off.h" -#include "storage/itemptr.h" -#include "catalog/pg_attribute.h" + + + #include "access/attnum.h" -#include "nodes/pg_list.h" -#include "access/tupdesc.h" -#include "access/itup.h" #include "access/funcindex.h" -#include "storage/fd.h" -#include "catalog/pg_am.h" -#include "catalog/pg_class.h" -#include "nodes/nodes.h" -#include "rewrite/prs2lock.h" +#include "access/htup.h" +#include "access/itup.h" #include "access/skey.h" #include "access/strat.h" -#include "utils/rel.h" +#include "access/tupdesc.h" #include "bootstrap/bootstrap.h" - -#include "nodes/primnodes.h" -#include "utils/nabstime.h" -#include "access/htup.h" +#include "catalog/pg_am.h" +#include "catalog/pg_attribute.h" +#include "catalog/pg_class.h" +#include "nodes/nodes.h" #include "nodes/parsenodes.h" - +#include "nodes/pg_list.h" +#include "nodes/primnodes.h" #include "parser/scansup.h" +#include "rewrite/prs2lock.h" +#include "storage/block.h" +#include "storage/fd.h" +#include "storage/itemptr.h" +#include "storage/off.h" +#include "utils/nabstime.h" +#include "utils/rel.h" #include "bootstrap_tokens.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 0603560b28..6253bf5cd5 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,7 +7,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.63 1999/07/16 03:12:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.64 1999/07/16 04:58:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,13 +18,13 @@ #include #include #ifdef __CYGWIN32__ +#include #endif #define BOOTSTRAP_INCLUDE /* mask out stuff in tcop/tcopprot.h */ #include "postgres.h" -#include "miscadmin.h" #include "access/genam.h" #include "access/heapam.h" @@ -33,12 +33,14 @@ #include "catalog/index.h" #include "catalog/pg_type.h" #include "libpq/pqsignal.h" +#include "miscadmin.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/portal.h" #ifndef HAVE_MEMMOVE +#include #endif #define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t)) diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index c791c4ff2b..e53599fc0a 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.24 1999/07/16 03:12:46 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.25 1999/07/16 04:58:35 momjian Exp $ * * NOTES * See acl.h. @@ -17,21 +17,21 @@ #include #include "postgres.h" -#include "utils/acl.h" #include "access/heapam.h" -#include "catalog/indexing.h" #include "catalog/catalog.h" #include "catalog/catname.h" +#include "catalog/indexing.h" #include "catalog/pg_aggregate.h" #include "catalog/pg_group.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_shadow.h" #include "catalog/pg_type.h" +#include "miscadmin.h" #include "parser/parse_agg.h" #include "parser/parse_func.h" +#include "utils/acl.h" #include "utils/syscache.h" -#include "miscadmin.h" static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode); diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 6026254aaa..abaa68f08e 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.23 1999/07/16 03:12:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.24 1999/07/16 04:58:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,12 +15,12 @@ #include "postgres.h" -#include "miscadmin.h" -#include "utils/syscache.h" +#include "access/transam.h" +#include "catalog/catalog.h" #include "catalog/catname.h" #include "catalog/pg_type.h" -#include "catalog/catalog.h" -#include "access/transam.h" +#include "miscadmin.h" +#include "utils/syscache.h" /* * relpath - path to the relation diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 4e4354b4ef..0ee9aa2cac 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.91 1999/07/15 22:38:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.92 1999/07/16 04:58:36 momjian Exp $ * * * INTERFACE ROUTINES @@ -42,8 +42,8 @@ #include "catalog/pg_relcheck.h" #include "commands/trigger.h" #include "optimizer/tlist.h" -#include "parser/parse_expr.h" #include "parser/parse_coerce.h" +#include "parser/parse_expr.h" #include "rewrite/rewriteRemove.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" @@ -53,6 +53,7 @@ #include "utils/temprel.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 8e87a966d5..e7763b045b 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.83 1999/07/15 22:38:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.84 1999/07/16 04:58:37 momjian Exp $ * * * INTERFACE ROUTINES @@ -19,6 +19,12 @@ */ #include "postgres.h" +#ifndef HAVE_MEMMOVE +#include +#else +#include +#endif + #include "access/genam.h" #include "access/heapam.h" #include "access/istrat.h" @@ -41,11 +47,6 @@ #include "utils/syscache.h" #include "utils/temprel.h" -#ifndef HAVE_MEMMOVE -#else -#include -#endif - /* * macros used in guessing how many tuples are on a page. */ diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index 7a11888813..b96df41154 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -7,21 +7,22 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.22 1999/07/15 23:03:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.23 1999/07/16 04:58:37 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/heapam.h" -#include "utils/builtins.h" #include "catalog/catname.h" -#include "utils/syscache.h" +#include "catalog/pg_aggregate.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "catalog/pg_aggregate.h" #include "miscadmin.h" +#include "utils/builtins.h" +#include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index e45b8143a8..06c558821f 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.39 1999/07/15 22:38:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.40 1999/07/16 04:58:37 momjian Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -21,12 +21,13 @@ #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "parser/parse_func.h" #include "miscadmin.h" +#include "parser/parse_func.h" #include "utils/builtins.h" #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index a0fca3ec7d..30902fbb91 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.31 1999/07/15 22:38:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.32 1999/07/16 04:58:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,15 +20,16 @@ #include "catalog/pg_type.h" #include "miscadmin.h" #include "optimizer/planner.h" +#include "parser/parse_type.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgrtab.h" #include "utils/lsyscache.h" #include "utils/sets.h" #include "utils/syscache.h" -#include "parser/parse_type.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index e1461bcb98..ac9d248ba8 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.38 1999/07/15 22:38:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.39 1999/07/16 04:58:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c index eba92e11e0..e390b03fe8 100644 --- a/src/backend/commands/_deadcode/recipe.c +++ b/src/backend/commands/_deadcode/recipe.c @@ -7,28 +7,28 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.6 1999/07/16 03:12:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.7 1999/07/16 04:58:42 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "nodes/parsenodes.h" -#include "nodes/plannodes.h" -#include "nodes/execnodes.h" -#include "nodes/makefuncs.h" #include "catalog/pg_type.h" #include "commands/recipe.h" +#include "executor/executor.h" #include "libpq/libpq-be.h" +#include "nodes/execnodes.h" +#include "nodes/makefuncs.h" +#include "nodes/parsenodes.h" +#include "nodes/plannodes.h" +#include "optimizer/planner.h" #include "parser/parse_node.h" -#include "utils/builtins.h" -#include "utils/relcache.h" #include "rewrite/rewriteHandler.h" #include "rewrite/rewriteManip.h" -#include "tcop/pquery.h" #include "tcop/dest.h" -#include "optimizer/planner.h" -#include "executor/executor.h" +#include "tcop/pquery.h" +#include "utils/builtins.h" +#include "utils/relcache.h" /* from tcop/postgres.c */ extern CommandDest whereToSendOutput; diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 24e5e86cd5..7fa337c196 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.50 1999/07/16 03:12:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.51 1999/07/16 04:58:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -85,17 +85,17 @@ #include "postgres.h" -#include "commands/async.h" #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_listener.h" +#include "commands/async.h" #include "lib/dllist.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "miscadmin.h" +#include "utils/ps_status.h" #include "utils/syscache.h" #include "utils/trace.h" -#include "utils/ps_status.h" /* stuff that we really ought not be touching directly :-( */ extern TransactionState CurrentTransactionState; diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index f1fbe35291..a02aba5fa0 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.42 1999/07/15 23:03:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.43 1999/07/16 04:58:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,19 +22,17 @@ #include "postgres.h" -#include "catalog/heap.h" -#include "access/heapam.h" #include "access/genam.h" -#include "utils/syscache.h" +#include "access/heapam.h" +#include "catalog/heap.h" #include "catalog/index.h" +#include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "commands/cluster.h" #include "commands/rename.h" -#include "utils/builtins.h" -#include "catalog/pg_proc.h" #include "optimizer/internal.h" -#ifndef NO_SECURITY -#endif /* !NO_SECURITY */ +#include "utils/builtins.h" +#include "utils/syscache.h" static Relation copy_heap(Oid OIDOldHeap); static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap); diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index c39db896e6..ef6f25efd4 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.50 1999/07/15 23:03:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.51 1999/07/16 04:58:38 momjian Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -20,23 +20,23 @@ * *------------------------------------------------------------------------- */ +#include #include "postgres.h" #include "access/heapam.h" -#include "catalog/indexing.h" #include "catalog/catalog.h" #include "catalog/catname.h" +#include "catalog/indexing.h" #include "catalog/pg_type.h" #include "commands/command.h" #include "executor/execdefs.h" #include "executor/executor.h" +#include "miscadmin.h" #include "optimizer/prep.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "utils/temprel.h" #include "utils/syscache.h" -#include "miscadmin.h" -#include +#include "utils/temprel.h" /* ---------------- * PortalExecutorHeapMemory stuff diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 196785265a..9d649fb145 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -6,34 +6,35 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.83 1999/07/15 23:03:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.84 1999/07/16 04:58:39 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include +#include #include "postgres.h" -#include "access/heapam.h" -#include "miscadmin.h" -#include "utils/builtins.h" -#include "utils/acl.h" -#include -#include "catalog/pg_index.h" -#include "utils/syscache.h" -#include "executor/executor.h" -#include "catalog/index.h" #include "access/genam.h" -#include "catalog/pg_type.h" +#include "access/heapam.h" #include "catalog/catname.h" +#include "catalog/index.h" +#include "catalog/pg_index.h" #include "catalog/pg_shadow.h" +#include "catalog/pg_type.h" #include "commands/copy.h" #include "commands/trigger.h" +#include "executor/executor.h" #include "libpq/libpq.h" +#include "miscadmin.h" +#include "utils/acl.h" +#include "utils/builtins.h" +#include "utils/syscache.h" #ifdef MULTIBYTE +#include "mb/pg_wchar.h" #endif #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index 64ed30974d..d5177d8662 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.43 1999/07/15 23:03:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.44 1999/07/16 04:58:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,14 +16,14 @@ #include "postgres.h" -#include "catalog/heap.h" -#include "commands/creatinh.h" #include "access/heapam.h" -#include "utils/syscache.h" #include "catalog/catname.h" -#include "catalog/pg_type.h" +#include "catalog/heap.h" #include "catalog/pg_inherits.h" #include "catalog/pg_ipl.h" +#include "catalog/pg_type.h" +#include "commands/creatinh.h" +#include "utils/syscache.h" /* ---------------- * local stuff diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 8a2b92344a..2e420d2f51 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.37 1999/07/16 03:12:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.38 1999/07/16 04:58:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,9 +22,9 @@ #include "catalog/catname.h" #include "catalog/pg_database.h" #include "catalog/pg_shadow.h" +#include "commands/dbcommands.h" #include "miscadmin.h" #include "tcop/tcopprot.h" -#include "commands/dbcommands.h" #include "utils/syscache.h" diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index 298c665569..5bf42d182e 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.32 1999/07/16 03:12:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.33 1999/07/16 04:58:40 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -42,17 +42,17 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_aggregate.h" +#include "catalog/pg_language.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" -#include "catalog/pg_type.h" -#include "catalog/pg_language.h" -#include "utils/syscache.h" -#include "fmgr.h" -#include "utils/builtins.h" -#include "commands/defrem.h" -#include "tcop/dest.h" #include "catalog/pg_shadow.h" +#include "catalog/pg_type.h" +#include "commands/defrem.h" +#include "fmgr.h" #include "optimizer/cost.h" +#include "tcop/dest.h" +#include "utils/builtins.h" +#include "utils/syscache.h" static char *defGetString(DefElem *def); static int defGetTypeLength(DefElem *def); diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index c4ccf2db0d..9e416b9f2b 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.c,v 1.40 1999/07/15 23:03:08 momjian Exp $ + * $Id: explain.c,v 1.41 1999/07/16 04:58:40 momjian Exp $ * */ #include @@ -12,13 +12,13 @@ #include "postgres.h" -#include "nodes/print.h" -#include "lib/stringinfo.h" #include "commands/explain.h" -#include "parser/parsetree.h" +#include "lib/stringinfo.h" +#include "nodes/print.h" #include "optimizer/planner.h" -#include "utils/relcache.h" +#include "parser/parsetree.h" #include "rewrite/rewriteHandler.h" +#include "utils/relcache.h" typedef struct ExplainState { diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 7932bcf6d6..6929720118 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.7 1999/07/16 03:12:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.8 1999/07/16 04:58:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,18 +17,18 @@ #include "access/genam.h" #include "access/heapam.h" -#include "utils/builtins.h" -#include "utils/syscache.h" #include "catalog/heap.h" #include "catalog/index.h" #include "catalog/pg_index.h" +#include "catalog/pg_opclass.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "catalog/pg_opclass.h" #include "commands/defrem.h" -#include "parser/parsetree.h" -#include "optimizer/prep.h" #include "optimizer/clauses.h" +#include "optimizer/prep.h" +#include "parser/parsetree.h" +#include "utils/builtins.h" +#include "utils/syscache.h" #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL) diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index e28156aaa8..0ae6b151ba 100644 --- a/src/backend/commands/remove.c +++ b/src/backend/commands/remove.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.34 1999/07/15 22:39:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.35 1999/07/16 04:58:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index c73dbe19a0..e27c06f2b3 100644 --- a/src/backend/commands/rename.c +++ b/src/backend/commands/rename.c @@ -7,10 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.29 1999/07/16 03:12:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.30 1999/07/16 04:58:40 momjian Exp $ * *------------------------------------------------------------------------- */ +#ifndef HAVE_MEMMOVE +#include +#else +#include +#endif + #include "postgres.h" #include "access/heapam.h" @@ -22,13 +28,7 @@ #include "commands/rename.h" #include "miscadmin.h" #include "optimizer/prep.h" -#ifndef NO_SECURITY #include "utils/acl.h" -#endif /* !NO_SECURITY */ -#ifndef HAVE_MEMMOVE -#else -#include -#endif /* * renameatt - changes the name of a attribute in a relation diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 4efc85c41a..548b3311a0 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -9,13 +9,13 @@ #include #include "postgres.h" -#include "miscadmin.h" #include "access/heapam.h" #include "commands/creatinh.h" #include "commands/sequence.h" -#include "utils/builtins.h" +#include "miscadmin.h" #include "utils/acl.h" +#include "utils/builtins.h" #define SEQ_MAGIC 0x1717 diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 6107c4bd6f..35b3356de4 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -8,6 +8,7 @@ #include #include "postgres.h" + #include "access/genam.h" #include "access/heapam.h" #include "catalog/catalog.h" @@ -17,15 +18,12 @@ #include "catalog/pg_proc.h" #include "catalog/pg_trigger.h" #include "commands/trigger.h" -#include "utils/inval.h" -#include "utils/builtins.h" -#include "utils/syscache.h" #include "executor/executor.h" - -#ifndef NO_SECURITY #include "miscadmin.h" #include "utils/acl.h" -#endif +#include "utils/builtins.h" +#include "utils/inval.h" +#include "utils/syscache.h" DLLIMPORT TriggerData *CurrentTriggerData = NULL; diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 152c57f752..63de3aa699 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: user.c,v 1.30 1999/07/15 23:03:08 momjian Exp $ + * $Id: user.c,v 1.31 1999/07/16 04:58:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,16 +18,16 @@ #include "postgres.h" -#include "miscadmin.h" +#include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_database.h" #include "catalog/pg_shadow.h" +#include "commands/user.h" #include "libpq/crypt.h" -#include "access/heapam.h" +#include "miscadmin.h" #include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/syscache.h" -#include "commands/user.h" static void CheckPgUserAclNotNull(void); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 2c8cf527ac..91ce729ebd 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.112 1999/07/15 22:39:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.113 1999/07/16 04:58:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #include "postgres.h" -#include "miscadmin.h" #include "access/genam.h" #include "access/heapam.h" #include "catalog/catalog.h" @@ -30,6 +29,7 @@ #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" #include "commands/vacuum.h" +#include "miscadmin.h" #include "parser/parse_oper.h" #include "storage/smgr.h" #include "utils/builtins.h" @@ -39,6 +39,7 @@ #include "utils/syscache.h" #ifndef HAVE_GETRUSAGE +#include "rusagestub.h" #else #include #include diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 094bec33e8..6669eb7440 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -2,7 +2,7 @@ * Routines for handling of 'SET var TO', * 'SHOW var' and 'RESET var' statements. * - * $Id: variable.c,v 1.23 1999/07/07 09:36:45 momjian Exp $ + * $Id: variable.c,v 1.24 1999/07/16 04:58:41 momjian Exp $ * */ @@ -10,16 +10,19 @@ #include #include #include + #include "postgres.h" -#include "miscadmin.h" -#include "commands/variable.h" -#include "utils/builtins.h" -#include "optimizer/internal.h" #include "access/xact.h" +#include "commands/variable.h" +#include "miscadmin.h" +#include "optimizer/internal.h" +#include "utils/builtins.h" #include "utils/tqual.h" + #ifdef MULTIBYTE #include "mb/pg_wchar.h" #endif + static bool show_date(void); static bool reset_date(void); static bool parse_date(const char *); diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index c71ee85b01..069d92237b 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: view.c,v 1.35 1999/07/15 23:03:08 momjian Exp $ + * $Id: view.c,v 1.36 1999/07/16 04:58:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,15 +14,15 @@ #include "postgres.h" -#include "catalog/heap.h" #include "access/xact.h" +#include "catalog/heap.h" +#include "commands/creatinh.h" +#include "commands/view.h" #include "parser/parse_relation.h" #include "parser/parse_type.h" #include "rewrite/rewriteDefine.h" #include "rewrite/rewriteManip.h" #include "rewrite/rewriteRemove.h" -#include "commands/creatinh.h" -#include "commands/view.h" /*--------------------------------------------------------------------- * DefineVirtualRelation diff --git a/src/backend/executor/_deadcode/nodeTee.c b/src/backend/executor/_deadcode/nodeTee.c index dfe9fae775..7cab4084a8 100644 --- a/src/backend/executor/_deadcode/nodeTee.c +++ b/src/backend/executor/_deadcode/nodeTee.c @@ -14,7 +14,7 @@ * ExecInitTee * ExecEndTee * - * $Id: nodeTee.c,v 1.4 1999/07/15 15:19:02 momjian Exp $ + * $Id: nodeTee.c,v 1.5 1999/07/16 04:58:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,16 +23,16 @@ #include #include "postgres.h" -#include "utils/relcache.h" -#include "storage/bufmgr.h" -#include "storage/smgr.h" -#include "optimizer/internal.h" -#include "executor/executor.h" -#include "executor/nodeTee.h" +#include "access/heapam.h" #include "catalog/catalog.h" #include "catalog/heap.h" +#include "executor/executor.h" +#include "executor/nodeTee.h" +#include "optimizer/internal.h" +#include "storage/bufmgr.h" +#include "storage/smgr.h" #include "tcop/pquery.h" -#include "access/heapam.h" +#include "utils/relcache.h" /* ------------------------------------------------------------------ * ExecInitTee diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index 0573d647ea..8a03d92aba 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execAmi.c,v 1.39 1999/07/16 03:12:50 momjian Exp $ + * $Id: execAmi.c,v 1.40 1999/07/16 04:58:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,28 +28,28 @@ #include "postgres.h" -#include "executor/executor.h" -#include "executor/nodeSeqscan.h" -#include "executor/nodeIndexscan.h" -#include "executor/nodeSort.h" -#include "executor/nodeMaterial.h" -#include "executor/nodeNestloop.h" -#include "executor/nodeHashjoin.h" -#include "executor/nodeHash.h" -#include "executor/nodeGroup.h" -#include "executor/nodeAgg.h" -#include "executor/nodeGroup.h" -#include "executor/nodeResult.h" -#include "executor/nodeUnique.h" -#include "executor/nodeMergejoin.h" -#include "executor/nodeAppend.h" -#include "executor/nodeSubplan.h" -#include "executor/execdebug.h" -#include "optimizer/internal.h" #include "access/genam.h" #include "access/heapam.h" #include "catalog/heap.h" +#include "executor/execdebug.h" +#include "executor/executor.h" +#include "executor/nodeAgg.h" +#include "executor/nodeAppend.h" +#include "executor/nodeGroup.h" +#include "executor/nodeGroup.h" +#include "executor/nodeHash.h" +#include "executor/nodeHashjoin.h" +#include "executor/nodeIndexscan.h" +#include "executor/nodeMaterial.h" +#include "executor/nodeMergejoin.h" +#include "executor/nodeNestloop.h" +#include "executor/nodeResult.h" +#include "executor/nodeSeqscan.h" +#include "executor/nodeSort.h" +#include "executor/nodeSubplan.h" +#include "executor/nodeUnique.h" +#include "optimizer/internal.h" static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys, bool isindex, ScanDirection dir, Snapshot snapshot); diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c index 8a8d049f31..1c377542b6 100644 --- a/src/backend/executor/execFlatten.c +++ b/src/backend/executor/execFlatten.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.10 1999/07/15 22:39:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.11 1999/07/16 04:58:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,8 +26,8 @@ * node does the actual flattening work. */ #include "postgres.h" -#include "executor/executor.h" #include "executor/execFlatten.h" +#include "executor/executor.h" #ifdef SETS_FIXED static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext, diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 8f1755356a..5459f06be8 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,26 +26,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.91 1999/07/16 03:12:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.92 1999/07/16 04:58:45 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "miscadmin.h" -#include "executor/executor.h" -#include "executor/execdefs.h" -#include "executor/execdebug.h" -#include "utils/builtins.h" -#include "utils/acl.h" -#include "utils/syscache.h" -#include "parser/parsetree.h" -/* #include "access/localam.h" */ -#include "optimizer/var.h" #include "access/heapam.h" #include "catalog/heap.h" #include "commands/trigger.h" +#include "executor/execdebug.h" +#include "executor/execdefs.h" +#include "executor/executor.h" +#include "miscadmin.h" +#include "optimizer/var.h" +#include "parser/parsetree.h" +#include "utils/acl.h" +#include "utils/builtins.h" +#include "utils/syscache.h" void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable, Query *parseTree); diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 1b693cbcaf..1b6d2bd842 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.14 1999/03/23 16:50:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.15 1999/07/16 04:58:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -74,23 +74,23 @@ */ #include "postgres.h" -#include "miscadmin.h" -#include "tcop/tcopprot.h" #include "executor/executor.h" -#include "executor/nodeResult.h" -#include "executor/nodeAppend.h" -#include "executor/nodeSeqscan.h" -#include "executor/nodeIndexscan.h" -#include "executor/nodeNestloop.h" -#include "executor/nodeMergejoin.h" -#include "executor/nodeMaterial.h" -#include "executor/nodeSort.h" -#include "executor/nodeUnique.h" -#include "executor/nodeGroup.h" #include "executor/nodeAgg.h" +#include "executor/nodeAppend.h" +#include "executor/nodeGroup.h" #include "executor/nodeHash.h" #include "executor/nodeHashjoin.h" +#include "executor/nodeIndexscan.h" +#include "executor/nodeMaterial.h" +#include "executor/nodeMergejoin.h" +#include "executor/nodeNestloop.h" +#include "executor/nodeResult.h" +#include "executor/nodeSeqscan.h" +#include "executor/nodeSort.h" #include "executor/nodeSubplan.h" +#include "executor/nodeUnique.h" +#include "miscadmin.h" +#include "tcop/tcopprot.h" /* ------------------------------------------------------------------------ * ExecInitNode diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index d5a218a7ce..3eb569acb6 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.55 1999/07/15 22:39:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.56 1999/07/16 04:58:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,9 +35,9 @@ #include "access/heapam.h" #include "catalog/pg_language.h" +#include "executor/execFlatten.h" #include "executor/execdebug.h" #include "executor/executor.h" -#include "executor/execFlatten.h" #include "executor/functions.h" #include "executor/nodeSubplan.h" #include "utils/builtins.h" diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index 33d7f0bd63..bebcb17a97 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.27 1999/07/15 22:39:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.28 1999/07/16 04:58:46 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -119,9 +119,8 @@ #include #include "postgres.h" - - #include "executor/executor.h" + #undef ExecStoreTuple #include "catalog/pg_type.h" diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 6d2fb86f45..4bacf3f7bd 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.47 1999/07/15 22:39:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.48 1999/07/16 04:58:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,9 +46,9 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "executor/execdebug.h" #include "executor/executor.h" -#include "catalog/pg_index.h" static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP, AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP); diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 1fbd578da8..0653c048b9 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,22 +8,21 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.28 1999/07/15 22:39:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.29 1999/07/16 04:58:48 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" - +#include "access/heapam.h" +#include "executor/execdefs.h" +#include "executor/executor.h" +#include "executor/functions.h" #include "tcop/pquery.h" #include "tcop/tcopprot.h" #include "tcop/utility.h" #include "utils/datum.h" -#include "access/heapam.h" -#include "executor/executor.h" -#include "executor/execdefs.h" -#include "executor/functions.h" #undef new diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index a8535b5a98..45196dfdf6 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -21,11 +21,11 @@ #include "access/heapam.h" #include "catalog/pg_aggregate.h" -#include "parser/parse_type.h" #include "executor/executor.h" #include "executor/nodeAgg.h" -#include "utils/syscache.h" #include "optimizer/clauses.h" +#include "parser/parse_type.h" +#include "utils/syscache.h" /* * AggFuncInfo - diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index d32ef03871..50346cd873 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.22 1999/07/16 03:12:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.23 1999/07/16 04:58:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -57,8 +57,8 @@ #include "access/heapam.h" -#include "executor/executor.h" #include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeAppend.h" #include "parser/parsetree.h" diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 39a0d65c79..fa46c603ec 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.24 1999/07/16 03:12:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.25 1999/07/16 04:58:49 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index f92acd97b3..0a35cf2cf8 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.39 1999/07/16 03:12:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.40 1999/07/16 04:58:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,17 +30,17 @@ */ #include "postgres.h" -#include "executor/executor.h" -#include "executor/execdebug.h" -#include "executor/nodeIndexscan.h" + +#include "access/genam.h" +#include "access/heapam.h" +#include "executor/execdebug.h" +#include "executor/executor.h" +#include "executor/nodeIndexscan.h" +#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "parser/parsetree.h" -#include "access/heapam.h" -#include "access/genam.h" -#include "nodes/nodeFuncs.h" - /* ---------------- * Misc stuff to move to executor.h soon -cim 6/5/90 * ---------------- diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index e99fb9d762..783dbc7b32 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.24 1999/07/16 03:12:53 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.25 1999/07/16 04:58:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,11 +21,11 @@ #include "postgres.h" +#include "access/heapam.h" +#include "catalog/heap.h" #include "executor/executor.h" #include "executor/nodeMaterial.h" -#include "catalog/heap.h" #include "optimizer/internal.h" -#include "access/heapam.h" /* ---------------------------------------------------------------- * ExecMaterial diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 4d0c3dae92..62b53af3c6 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.27 1999/05/25 16:08:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.28 1999/07/16 04:58:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -68,10 +68,10 @@ #include "access/heapam.h" #include "catalog/pg_operator.h" -#include "executor/executor.h" -#include "executor/execdefs.h" -#include "executor/nodeMergejoin.h" #include "executor/execdebug.h" +#include "executor/execdefs.h" +#include "executor/executor.h" +#include "executor/nodeMergejoin.h" #include "utils/lsyscache.h" #include "utils/psort.h" diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 6ee64a6063..a75e82c0b1 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.12 1999/07/15 22:39:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.13 1999/07/16 04:58:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,8 +19,8 @@ */ #include "postgres.h" -#include "executor/executor.h" #include "executor/execdebug.h" +#include "executor/executor.h" #include "executor/nodeNestloop.h" /* ---------------------------------------------------------------- diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index a45b7f347c..c83aa725a7 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.19 1999/07/15 22:39:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.20 1999/07/16 04:58:52 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,10 +24,10 @@ */ #include "postgres.h" -#include "executor/executor.h" -#include "executor/execdebug.h" -#include "executor/nodeSeqscan.h" #include "access/heapam.h" +#include "executor/execdebug.h" +#include "executor/executor.h" +#include "executor/nodeSeqscan.h" #include "parser/parsetree.h" static Oid InitScanRelation(SeqScan *node, EState *estate, diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index a198b8914a..311938a743 100644 --- a/src/backend/executor/nodeSort.c +++ b/src/backend/executor/nodeSort.c @@ -7,13 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.21 1999/07/15 22:39:10 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.22 1999/07/16 04:58:52 momjian Exp $ * *------------------------------------------------------------------------- */ -#include "postgres.h" #include +#include "postgres.h" #include "executor/executor.h" #include "executor/execdebug.h" #include "executor/nodeSort.h" diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 6c88bbe85e..e4e83d654a 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -14,9 +14,9 @@ #include "postgres.h" #include "access/heapam.h" -#include "tcop/pquery.h" #include "executor/executor.h" #include "executor/nodeSubplan.h" +#include "tcop/pquery.h" /* ---------------------------------------------------------------- * ExecSubPlan(node) diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index 1fd6644058..af07ab83c0 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.22 1999/07/16 03:12:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.23 1999/07/16 04:58:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,10 +26,10 @@ #include "postgres.h" -#include "executor/executor.h" -#include "executor/nodeUnique.h" #include "access/heapam.h" #include "access/printtup.h" +#include "executor/executor.h" +#include "executor/nodeUnique.h" /* ---------------------------------------------------------------- * ExecIdenticalTuples diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c index edc6c53268..a26ce75211 100644 --- a/src/backend/lib/fstack.c +++ b/src/backend/lib/fstack.c @@ -7,12 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.12 1999/07/15 23:03:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.13 1999/07/16 04:58:55 momjian Exp $ * *------------------------------------------------------------------------- */ -#include "postgres.h" +#include "postgres.h" #include "lib/fstack.h" /* diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c index 332a1b2948..51547d8a0c 100644 --- a/src/backend/lib/hasht.c +++ b/src/backend/lib/hasht.c @@ -8,14 +8,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.10 1999/07/15 23:03:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.11 1999/07/16 04:58:56 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/memutils.h" #include "lib/hasht.h" +#include "utils/memutils.h" /* ----------------------------------- * HashTableWalk diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 72ccd86657..24def9d755 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.38 1999/07/15 23:03:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.39 1999/07/16 04:58:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,14 +31,13 @@ #include #include "postgres.h" -#include "miscadmin.h" #include "libpq/auth.h" -#include "libpq/libpq.h" -#include "libpq/hba.h" -#include "libpq/password.h" #include "libpq/crypt.h" - +#include "libpq/hba.h" +#include "libpq/libpq.h" +#include "libpq/password.h" +#include "miscadmin.h" static void sendAuthRequest(Port *port, AuthRequest areq, PacketDoneProc handler); static int handle_done_auth(void *arg, PacketLen len, void *pkt); diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c index 5a0599bc12..b15eaad617 100644 --- a/src/backend/libpq/be-dumpdata.c +++ b/src/backend/libpq/be-dumpdata.c @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: be-dumpdata.c,v 1.28 1999/07/15 23:03:13 momjian Exp $ + * $Id: be-dumpdata.c,v 1.29 1999/07/16 04:58:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,11 +31,11 @@ #include "postgres.h" +#include "access/heapam.h" +#include "access/printtup.h" +#include "catalog/catalog.h" #include "lib/dllist.h" #include "libpq/libpq.h" -#include "access/heapam.h" -#include "catalog/catalog.h" -#include "access/printtup.h" /* ---------------- * backend portal stack for recursive PQexec calls diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 1ad0dbf92a..9f020bdea2 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.39 1999/07/16 03:12:55 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.40 1999/07/16 04:58:59 momjian Exp $ * * NOTES * This should be moved to a more appropriate place. It is here @@ -37,10 +37,10 @@ #include "postgres.h" -#include "libpq/libpq-fs.h" #include "catalog/pg_shadow.h" -#include "storage/large_object.h" #include "libpq/be-fsstubs.h" +#include "libpq/libpq-fs.h" +#include "storage/large_object.h" /* [PA] is Pascal André */ diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c index 6703b955bc..8131662a2a 100644 --- a/src/backend/libpq/be-pqexec.c +++ b/src/backend/libpq/be-pqexec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.22 1999/07/15 23:03:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.23 1999/07/16 04:59:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,12 @@ */ #include "postgres.h" +#include "libpq/libpq.h" #include "tcop/fastpath.h" #include "tcop/tcopprot.h" -#include "libpq/libpq.h" #include "utils/builtins.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index a1073fa357..c10efca9ff 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Dec 17, 1997 - Todd A. Brandys * Orignal Version Completed. * - * $Id: crypt.c,v 1.21 1999/07/15 22:39:14 momjian Exp $ + * $Id: crypt.c,v 1.22 1999/07/16 04:59:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,12 +20,13 @@ #include #include "postgres.h" -#include "miscadmin.h" -#include "utils/nabstime.h" -#include "storage/fd.h" #include "libpq/crypt.h" +#include "miscadmin.h" +#include "storage/fd.h" +#include "utils/nabstime.h" #ifdef HAVE_CRYPT_H +#include "crypt.h" #endif char **pwd_cache = NULL; diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 1067253b73..38c49bbf01 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -5,7 +5,7 @@ * wherein you authenticate a user by seeing what IP address the system * says he comes from and possibly using ident). * - * $Id: hba.c,v 1.45 1999/07/15 23:03:13 momjian Exp $ + * $Id: hba.c,v 1.46 1999/07/16 04:59:01 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,8 @@ #include #include "postgres.h" -#include "miscadmin.h" #include "libpq/libpq.h" +#include "miscadmin.h" /* Some standard C libraries, including GNU, have an isblank() function. Others, including Solaris, do not. So we have our own. diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c index aee994ce18..831e80c66a 100644 --- a/src/backend/libpq/password.c +++ b/src/backend/libpq/password.c @@ -1,19 +1,21 @@ /* * Copyright (c) 1994, Regents of the University of California * - * $Id: password.c,v 1.23 1999/07/15 23:03:14 momjian Exp $ + * $Id: password.c,v 1.24 1999/07/16 04:59:01 momjian Exp $ * */ -#include "postgres.h" -#include "miscadmin.h" -#include "libpq/password.h" -#include "libpq/libpq.h" #include #include +#include "postgres.h" #ifdef HAVE_CRYPT_H +#include "crypt.h" #endif +#include "libpq/libpq.h" +#include "libpq/password.h" +#include "miscadmin.h" + int verify_password(char *auth_arg, char *user, char *password) { diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c index eef88b37e4..f8a6db7358 100644 --- a/src/backend/libpq/portal.c +++ b/src/backend/libpq/portal.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.c,v 1.25 1999/07/16 03:12:56 momjian Exp $ + * $Id: portal.c,v 1.26 1999/07/16 04:59:02 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c index 2bdae59631..a9c3e9506b 100644 --- a/src/backend/libpq/portalbuf.c +++ b/src/backend/libpq/portalbuf.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.19 1999/07/16 03:12:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.20 1999/07/16 04:59:03 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 4a875bfbff..9e6b5e0882 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -28,7 +28,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.c,v 1.75 1999/07/16 03:12:57 momjian Exp $ + * $Id: pqcomm.c,v 1.76 1999/07/16 04:59:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -58,14 +58,7 @@ * *------------------------ */ -#include "postgres.h" - #include -#if defined(HAVE_STRING_H) -#include -#else -#include -#endif #include #include #include @@ -79,6 +72,14 @@ #include #include +#include "postgres.h" + +#if defined(HAVE_STRING_H) +#include +#else +#include +#endif + #include "libpq/libpq.h" #include "miscadmin.h" diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c index 16112bfdf0..7bb502b984 100644 --- a/src/backend/libpq/pqformat.c +++ b/src/backend/libpq/pqformat.c @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.c,v 1.5 1999/07/15 22:39:15 momjian Exp $ + * $Id: pqformat.c,v 1.6 1999/07/16 04:59:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,9 +45,11 @@ */ #include "postgres.h" -#include "libpq/pqformat.h" #include "libpq/libpq.h" +#include "libpq/pqformat.h" + #ifdef MULTIBYTE +#include "mb/pg_wchar.h" #endif #include #ifdef HAVE_ENDIAN_H diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index 0e667656cc..f5d9e0807d 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.12 1999/07/15 23:03:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.13 1999/07/16 04:59:04 momjian Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -37,10 +37,10 @@ * is to do signal-handler reinstallation, which doesn't work well * at all. * ------------------------------------------------------------------------*/ -#include "postgres.h" - #include +#include "postgres.h" + #include "libpq/pqsignal.h" pqsigfunc diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 4794c3d752..1e93c93e97 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.84 1999/07/15 22:39:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.85 1999/07/16 04:59:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,11 +16,10 @@ #include "postgres.h" - -#include "utils/syscache.h" #include "catalog/pg_type.h" #include "optimizer/planmain.h" #include "optimizer/subselect.h" +#include "utils/syscache.h" /* * listCopy diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 9eebf5cbeb..1ac318980b 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.41 1999/07/15 22:39:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.42 1999/07/16 04:59:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,8 @@ #include "postgres.h" -#include "nodes/relation.h" #include "nodes/plannodes.h" - +#include "nodes/relation.h" #include "utils/datum.h" static bool equali(List *a, List *b); diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index f73811431e..bdcd0dc39d 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: outfuncs.c,v 1.87 1999/07/15 15:19:08 momjian Exp $ + * $Id: outfuncs.c,v 1.88 1999/07/16 04:59:05 momjian Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -24,21 +24,19 @@ #include "access/heapam.h" #include "access/htup.h" -#include "utils/syscache.h" -#include "utils/lsyscache.h" +#include "catalog/pg_type.h" #include "fmgr.h" -#include "utils/datum.h" - -#include "nodes/nodes.h" +#include "lib/stringinfo.h" #include "nodes/execnodes.h" +#include "nodes/nodes.h" +#include "nodes/parsenodes.h" #include "nodes/pg_list.h" #include "nodes/plannodes.h" -#include "nodes/parsenodes.h" #include "nodes/primnodes.h" #include "nodes/relation.h" - -#include "catalog/pg_type.h" -#include "lib/stringinfo.h" +#include "utils/datum.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" #include "../parse.h" diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index 2dd2a5a574..bf3d584f8a 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.29 1999/07/15 22:39:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.30 1999/07/16 04:59:06 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -22,9 +22,9 @@ #include "access/printtup.h" #include "nodes/print.h" +#include "optimizer/clauses.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" -#include "optimizer/clauses.h" static char *plannode_type(Plan *p); diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c index 6da19489d0..d86450a942 100644 --- a/src/backend/nodes/read.c +++ b/src/backend/nodes/read.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.16 1999/07/15 15:19:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.17 1999/07/16 04:59:06 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -19,6 +19,7 @@ #include #include #include + #include "postgres.h" #include "nodes/pg_list.h" #include "nodes/readfuncs.h" diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index e479384e93..f085959821 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.67 1999/07/15 22:39:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.68 1999/07/16 04:59:06 momjian Exp $ * * NOTES * Most of the read functions for plan nodes are tested. (In fact, they @@ -29,12 +29,12 @@ #include "postgres.h" -#include "utils/lsyscache.h" -#include "catalog/pg_index.h" +#include "catalog/pg_index.h" #include "nodes/plannodes.h" -#include "nodes/relation.h" #include "nodes/readfuncs.h" +#include "nodes/relation.h" +#include "utils/lsyscache.h" /* ---------------- * node creator declarations diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c index 276a6cba44..d343591a5c 100644 --- a/src/backend/optimizer/geqo/geqo_copy.c +++ b/src/backend/optimizer/geqo/geqo_copy.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_copy.c,v 1.7 1999/07/15 22:39:18 momjian Exp $ + * $Id: geqo_copy.c,v 1.8 1999/07/16 04:59:06 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,6 @@ /*************************************************************/ #include "postgres.h" - - #include "optimizer/geqo_copy.h" /* geqo_copy diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 85cdcab638..fc7f72050b 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -6,7 +6,7 @@ * CX operator according to Oliver et al * (Proc 2nd Int'l Conf on GA's) * -* $Id: geqo_cx.c,v 1.8 1999/07/15 22:39:19 momjian Exp $ +* $Id: geqo_cx.c,v 1.9 1999/07/16 04:59:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -35,10 +35,6 @@ #include "postgres.h" - - - - #include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 5509775731..576ff5daa0 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -3,7 +3,7 @@ * geqo_erx.c * edge recombination crossover [ER] * -* $Id: geqo_erx.c,v 1.14 1999/07/15 22:39:19 momjian Exp $ +* $Id: geqo_erx.c,v 1.15 1999/07/16 04:59:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,10 +32,6 @@ #include "postgres.h" - - - - #include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index b1250a3ef8..31ffdb14d4 100644 --- a/src/backend/optimizer/geqo/geqo_eval.c +++ b/src/backend/optimizer/geqo/geqo_eval.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_eval.c,v 1.41 1999/07/15 22:39:20 momjian Exp $ + * $Id: geqo_eval.c,v 1.42 1999/07/16 04:59:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,9 @@ =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ -#include "postgres.h" - #include + +#include "postgres.h" #ifdef HAVE_LIMITS_H #include #ifndef MAXINT @@ -30,13 +30,11 @@ #include #endif - +#include "optimizer/cost.h" +#include "optimizer/geqo.h" +#include "optimizer/paths.h" #include "utils/portal.h" -#include "optimizer/paths.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo.h" /* * Variables set by geqo_eval_startup for use within a single GEQO run diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index b909e59d52..260f2d73ef 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_main.c,v 1.18 1999/07/15 22:39:20 momjian Exp $ + * $Id: geqo_main.c,v 1.19 1999/07/16 04:59:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,14 +22,10 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - - - - #include "optimizer/geqo.h" +#include "optimizer/geqo_misc.h" #include "optimizer/geqo_pool.h" #include "optimizer/geqo_selection.h" -#include "optimizer/geqo_misc.h" /* define edge recombination crossover [ERX] per default */ diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c index 3be437ffa9..21e438958b 100644 --- a/src/backend/optimizer/geqo/geqo_misc.c +++ b/src/backend/optimizer/geqo/geqo_misc.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.c,v 1.21 1999/07/15 22:39:20 momjian Exp $ + * $Id: geqo_misc.c,v 1.22 1999/07/16 04:59:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,10 +22,6 @@ #include #include "postgres.h" - - - - #include "optimizer/geqo_misc.h" static float avg_pool(Pool *pool); diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index 17dd57be42..037af7e305 100644 --- a/src/backend/optimizer/geqo/geqo_mutation.c +++ b/src/backend/optimizer/geqo/geqo_mutation.c @@ -4,7 +4,7 @@ * * TSP mutation routines * -* $Id: geqo_mutation.c,v 1.7 1999/07/15 22:39:20 momjian Exp $ +* $Id: geqo_mutation.c,v 1.8 1999/07/16 04:59:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -32,12 +32,8 @@ /*************************************************************/ #include "postgres.h" - - - - -#include "optimizer/geqo_random.h" #include "optimizer/geqo_mutation.h" +#include "optimizer/geqo_random.h" void geqo_mutation(Gene *tour, int num_gene) diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index 1c054b1de0..14c63551af 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -6,7 +6,7 @@ * OX1 operator according to Davis * (Proc Int'l Joint Conf on AI) * -* $Id: geqo_ox1.c,v 1.7 1999/07/15 22:39:20 momjian Exp $ +* $Id: geqo_ox1.c,v 1.8 1999/07/16 04:59:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,12 +34,8 @@ /*************************************************************/ #include "postgres.h" - - - - -#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" /* ox1 diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index c2cb2bf355..2270ac2aeb 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -6,7 +6,7 @@ * OX2 operator according to Syswerda * (The Genetic Algorithms Handbook, ed L Davis) * -* $Id: geqo_ox2.c,v 1.7 1999/07/15 22:39:21 momjian Exp $ +* $Id: geqo_ox2.c,v 1.8 1999/07/16 04:59:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,12 +34,8 @@ /*************************************************************/ #include "postgres.h" - - - - -#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" /* ox2 diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c index e9bb76a1f9..26b23f9791 100644 --- a/src/backend/optimizer/geqo/geqo_params.c +++ b/src/backend/optimizer/geqo/geqo_params.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * -* $Id: geqo_params.c,v 1.19 1999/07/15 15:19:13 momjian Exp $ +* $Id: geqo_params.c,v 1.20 1999/07/16 04:59:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,21 +26,16 @@ #include "postgres.h" #include "miscadmin.h" - #include "nodes/pg_list.h" -#include "nodes/relation.h" #include "nodes/primnodes.h" - - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" +#include "nodes/relation.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" #include "optimizer/geqo.h" - +#include "optimizer/geqo_gene.h" +#include "optimizer/internal.h" +#include "optimizer/pathnode.h" +#include "optimizer/paths.h" #include "storage/fd.h" diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index f63474c9b6..93e944c88a 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -6,7 +6,7 @@ * PMX operator according to Goldberg & Lingle * (Proc Int'l Conf on GA's) * -* $Id: geqo_pmx.c,v 1.8 1999/07/15 22:39:21 momjian Exp $ +* $Id: geqo_pmx.c,v 1.9 1999/07/16 04:59:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,12 +34,8 @@ /*************************************************************/ #include "postgres.h" - - - - -#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" /* pmx diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c index e44b282460..d1d413c695 100644 --- a/src/backend/optimizer/geqo/geqo_pool.c +++ b/src/backend/optimizer/geqo/geqo_pool.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.c,v 1.15 1999/07/15 22:39:21 momjian Exp $ + * $Id: geqo_pool.c,v 1.16 1999/07/16 04:59:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,9 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - - - - #include "optimizer/geqo.h" -#include "optimizer/geqo_pool.h" #include "optimizer/geqo_copy.h" +#include "optimizer/geqo_pool.h" #include "optimizer/geqo_recombination.h" diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index 2f04e7736a..0567cb11d2 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -6,7 +6,7 @@ * PX operator according to Syswerda * (The Genetic Algorithms Handbook, L Davis, ed) * -* $Id: geqo_px.c,v 1.8 1999/07/15 22:39:21 momjian Exp $ +* $Id: geqo_px.c,v 1.9 1999/07/16 04:59:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,12 +34,8 @@ /*************************************************************/ #include "postgres.h" - - - - -#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" /* px diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c index d9a2a9d9f9..6f74ce94eb 100644 --- a/src/backend/optimizer/geqo/geqo_recombination.c +++ b/src/backend/optimizer/geqo/geqo_recombination.c @@ -3,7 +3,7 @@ * geqo_recombination.c * misc recombination procedures * -* $Id: geqo_recombination.c,v 1.10 1999/07/15 22:39:21 momjian Exp $ +* $Id: geqo_recombination.c,v 1.11 1999/07/16 04:59:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,12 +19,8 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - - - - -#include "optimizer/geqo_recombination.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_recombination.h" /* diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index 092d7164b5..f4ea2739c4 100644 --- a/src/backend/optimizer/geqo/geqo_selection.c +++ b/src/backend/optimizer/geqo/geqo_selection.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_selection.c,v 1.9 1999/07/15 22:39:21 momjian Exp $ + * $Id: geqo_selection.c,v 1.10 1999/07/16 04:59:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -36,13 +36,9 @@ #include #include "postgres.h" - - - - -#include "optimizer/geqo_selection.h" #include "optimizer/geqo_copy.h" #include "optimizer/geqo_random.h" +#include "optimizer/geqo_selection.h" static int linear(int max, double bias); diff --git a/src/backend/optimizer/geqo/minspantree.c b/src/backend/optimizer/geqo/minspantree.c index 9da3bdc5e9..ae646c6180 100644 --- a/src/backend/optimizer/geqo/minspantree.c +++ b/src/backend/optimizer/geqo/minspantree.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION -* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.13 1999/07/15 15:19:15 momjian Exp $ +* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.14 1999/07/16 04:59:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,19 +16,13 @@ #include "postgres.h" + #include "nodes/pg_list.h" -#include "nodes/relation.h" #include "nodes/primnodes.h" - - +#include "nodes/relation.h" #include "optimizer/cost.h" - -/* - include "optimizer/geqo/tsp.h" - */ - -#include "optimizer/geqo/geqo_gene.h" #include "optimizer/geqo/geqo.h" +#include "optimizer/geqo/geqo_gene.h" /* * minspantree diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c index fbf07e1cf8..f6330a637b 100644 --- a/src/backend/optimizer/path/_deadcode/xfunc.c +++ b/src/backend/optimizer/path/_deadcode/xfunc.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.7 1999/07/16 03:13:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.8 1999/07/16 04:59:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,8 +20,8 @@ #include "postgres.h" -#include "access/htup.h" #include "access/heapam.h" +#include "access/htup.h" #include "catalog/pg_language.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 12a403dcd4..cf93248f91 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.48 1999/07/15 22:39:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.49 1999/07/16 04:59:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,15 +16,11 @@ #include "postgres.h" - -#include "optimizer/internal.h" - -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" #include "optimizer/cost.h" - - #include "optimizer/geqo.h" +#include "optimizer/internal.h" +#include "optimizer/pathnode.h" +#include "optimizer/paths.h" #ifdef GEQO bool _use_geqo_ = true; diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index ea218b1494..df0b4aabb4 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.22 1999/07/16 03:12:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.23 1999/07/16 04:59:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,10 @@ #include "catalog/pg_operator.h" #include "optimizer/clauses.h" -#include "optimizer/restrictinfo.h" #include "optimizer/cost.h" #include "optimizer/internal.h" #include "optimizer/plancat.h" +#include "optimizer/restrictinfo.h" #include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 863e1927ec..d313b6c4d2 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -7,15 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.42 1999/07/15 22:39:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.43 1999/07/16 04:59:14 momjian Exp $ * *------------------------------------------------------------------------- */ -#include "postgres.h" - #include +#include "postgres.h" #ifdef HAVE_LIMITS_H #include #ifndef MAXINT @@ -27,6 +26,7 @@ #endif #endif + #include "optimizer/cost.h" #include "optimizer/internal.h" #include "optimizer/tlist.h" diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c index d875931fda..d6456af6da 100644 --- a/src/backend/optimizer/path/hashutils.c +++ b/src/backend/optimizer/path/hashutils.c @@ -7,14 +7,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.17 1999/07/15 22:39:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.18 1999/07/16 04:59:14 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "optimizer/paths.h" #include "optimizer/clauses.h" +#include "optimizer/paths.h" static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list); diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index d6510c4212..2fc7d07060 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.60 1999/07/16 03:13:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.61 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,17 +24,17 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/restrictinfo.h" #include "optimizer/cost.h" #include "optimizer/keys.h" #include "optimizer/ordering.h" +#include "optimizer/pathnode.h" #include "optimizer/paths.h" #include "optimizer/plancat.h" -#include "optimizer/pathnode.h" -#include "parser/parsetree.h" +#include "optimizer/restrictinfo.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_oper.h" -#include "parser/parse_coerce.h" +#include "parser/parsetree.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index f0ad816271..9b5c226b55 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.40 1999/07/16 03:13:00 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.41 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,9 @@ -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" #include "optimizer/cost.h" +#include "optimizer/pathnode.h" +#include "optimizer/paths.h" static Path *best_innerjoin(List *join_paths, List *outer_relid); static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel, diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index aa558fef1d..9fba28759a 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.36 1999/07/15 22:39:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.37 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,10 @@ #include "optimizer/cost.h" -#include "optimizer/paths.h" -#include "optimizer/tlist.h" #include "optimizer/joininfo.h" #include "optimizer/pathnode.h" +#include "optimizer/paths.h" +#include "optimizer/tlist.h" static List *new_joininfo_list(List *joininfo_list, Relids join_relids); static bool nonoverlap_sets(List *s1, List *s2); diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c index 64f7ddd5db..1cc19693f8 100644 --- a/src/backend/optimizer/path/mergeutils.c +++ b/src/backend/optimizer/path/mergeutils.c @@ -7,16 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.23 1999/07/15 22:39:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.24 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "optimizer/paths.h" #include "optimizer/clauses.h" #include "optimizer/ordering.h" +#include "optimizer/paths.h" /* * group_clauses_by_order diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index 80f60d33bc..ceb8c3eb47 100644 --- a/src/backend/optimizer/path/orindxpath.c +++ b/src/backend/optimizer/path/orindxpath.c @@ -7,22 +7,22 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.27 1999/07/15 22:39:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.28 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" + + #include "nodes/nodeFuncs.h" - -#include "optimizer/internal.h" #include "optimizer/clauses.h" -#include "optimizer/restrictinfo.h" -#include "optimizer/paths.h" #include "optimizer/cost.h" +#include "optimizer/internal.h" +#include "optimizer/paths.h" #include "optimizer/plancat.h" - +#include "optimizer/restrictinfo.h" #include "parser/parsetree.h" diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index 89755d8a5c..cf9f87faf7 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -7,18 +7,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.11 1999/07/15 22:39:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.12 1999/07/16 04:59:15 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "optimizer/paths.h" -#include "optimizer/keys.h" -#include "optimizer/tlist.h" #include "optimizer/joininfo.h" +#include "optimizer/keys.h" #include "optimizer/ordering.h" +#include "optimizer/paths.h" +#include "optimizer/tlist.h" static int match_pathkey_joinkeys(List *pathkey, List *joinkeys, int outer_or_inner); diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c index a405ffeb5e..5b03249160 100644 --- a/src/backend/optimizer/path/prune.c +++ b/src/backend/optimizer/path/prune.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.41 1999/07/15 22:39:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.42 1999/07/16 04:59:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,8 +15,8 @@ #include "optimizer/cost.h" -#include "optimizer/paths.h" #include "optimizer/pathnode.h" +#include "optimizer/paths.h" diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 134b058654..e12ca3f60e 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.60 1999/07/15 23:03:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.61 1999/07/16 04:59:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,20 +16,16 @@ #include "postgres.h" -#include "utils/syscache.h" - -#include "nodes/nodeFuncs.h" - #include "nodes/makefuncs.h" - -#include "utils/lsyscache.h" - -#include "optimizer/restrictinfo.h" -#include "optimizer/cost.h" +#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" -#include "optimizer/planmain.h" -#include "optimizer/tlist.h" +#include "optimizer/cost.h" #include "optimizer/internal.h" +#include "optimizer/planmain.h" +#include "optimizer/restrictinfo.h" +#include "optimizer/tlist.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" #define NONAME_SORT 1 diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 14fe6865cf..2270a0e4ea 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -7,28 +7,23 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.33 1999/07/15 22:39:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.34 1999/07/16 04:59:19 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" - -#include "nodes/makefuncs.h" - - #include "catalog/pg_type.h" - -#include "utils/lsyscache.h" - -#include "optimizer/planmain.h" -#include "optimizer/joininfo.h" -#include "optimizer/pathnode.h" -#include "optimizer/tlist.h" -#include "optimizer/var.h" +#include "nodes/makefuncs.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" +#include "optimizer/joininfo.h" +#include "optimizer/pathnode.h" +#include "optimizer/planmain.h" +#include "optimizer/tlist.h" +#include "optimizer/var.h" +#include "utils/lsyscache.h" extern int Quiet; diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 35949ec953..76e010c9d2 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.39 1999/07/15 22:39:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.40 1999/07/16 04:59:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,11 +16,11 @@ #include "postgres.h" -#include "optimizer/planmain.h" -#include "optimizer/subselect.h" -#include "optimizer/prep.h" -#include "optimizer/paths.h" #include "optimizer/clauses.h" +#include "optimizer/paths.h" +#include "optimizer/planmain.h" +#include "optimizer/prep.h" +#include "optimizer/subselect.h" #include "optimizer/tlist.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 7655bbf5d3..218777fa4c 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.59 1999/07/15 22:39:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.60 1999/07/16 04:59:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,30 +16,24 @@ #include "postgres.h" -#include "nodes/makefuncs.h" -#include "catalog/pg_type.h" -#include "parser/parse_expr.h" - -#include "utils/lsyscache.h" +#include "access/genam.h" #include "access/heapam.h" - +#include "catalog/pg_type.h" +#include "executor/executor.h" +#include "nodes/makefuncs.h" +#include "optimizer/clauses.h" #include "optimizer/internal.h" +#include "optimizer/planmain.h" #include "optimizer/planner.h" #include "optimizer/prep.h" -#include "optimizer/planmain.h" #include "optimizer/subselect.h" - -/* DATA STRUCTURE CREATION/MANIPULATION ROUTINES */ -#include "optimizer/clauses.h" #include "optimizer/tlist.h" #include "optimizer/var.h" - -#include "executor/executor.h" - -#include "utils/builtins.h" -#include "utils/syscache.h" -#include "access/genam.h" +#include "parser/parse_expr.h" #include "parser/parse_oper.h" +#include "utils/builtins.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" static List *make_subplanTargetList(Query *parse, List *tlist, AttrNumber **groupColIdx); diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index daa26533ae..641241a7fd 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.52 1999/07/15 22:39:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.53 1999/07/16 04:59:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,14 +16,13 @@ #include "postgres.h" -#include "nodes/nodeFuncs.h" -#include "nodes/makefuncs.h" +#include "nodes/makefuncs.h" +#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" #include "optimizer/planmain.h" #include "optimizer/tlist.h" #include "optimizer/var.h" -#include "optimizer/tlist.h" static void set_join_tlist_references(Join *join); static void set_nonamescan_tlist_references(SeqScan *nonamescan); diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 9f1455eb9b..d0022b4cbc 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -6,7 +6,7 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.20 1999/07/15 22:39:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.21 1999/07/16 04:59:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,9 @@ #include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" -#include "optimizer/subselect.h" -#include "optimizer/planner.h" #include "optimizer/clauses.h" +#include "optimizer/planner.h" +#include "optimizer/subselect.h" int PlannerQueryLevel; /* level of current query */ List *PlannerInitPlan; /* init subplans for current query */ diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index d7ee69f855..990a643968 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.16 1999/07/15 22:39:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.17 1999/07/16 04:59:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,11 +15,11 @@ #include "postgres.h" -#include "nodes/makefuncs.h" + +#include "nodes/makefuncs.h" #include "optimizer/clauses.h" #include "optimizer/prep.h" - #include "utils/lsyscache.h" static Expr *pull_args(Expr *qual); diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index a9635368c8..a0df069b2f 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -7,24 +7,24 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.25 1999/07/16 03:13:03 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.26 1999/07/16 04:59:22 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" + + + + #include "catalog/pg_type.h" - #include "nodes/makefuncs.h" - -#include "utils/syscache.h" -#include "utils/lsyscache.h" - -#include "parser/parsetree.h" - -#include "optimizer/prep.h" #include "optimizer/clauses.h" +#include "optimizer/prep.h" +#include "parser/parsetree.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" static List *expand_targetlist(List *tlist, Oid relid, int command_type, Index result_relation); diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index b9dd4e39db..db928519e5 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.35 1999/07/15 22:39:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.36 1999/07/16 04:59:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,15 +17,15 @@ #include "postgres.h" -#include "parser/parsetree.h" -#include "parser/parse_clause.h" -#include "utils/lsyscache.h" -#include "optimizer/prep.h" #include "optimizer/plancat.h" -#include "optimizer/planner.h" #include "optimizer/planmain.h" +#include "optimizer/planner.h" +#include "optimizer/prep.h" +#include "parser/parse_clause.h" +#include "parser/parsetree.h" +#include "utils/lsyscache.h" static List *plan_inherit_query(Relids relids, Index rt_index, RangeTblEntry *rt_entry, Query *parse, List *tlist, diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index d5f1427638..84db3df008 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.39 1999/07/15 23:03:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.40 1999/07/16 04:59:23 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -19,16 +19,13 @@ #include "postgres.h" #include "catalog/pg_operator.h" -#include "nodes/plannodes.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" - - -#include "utils/lsyscache.h" - +#include "nodes/plannodes.h" #include "optimizer/clauses.h" #include "optimizer/internal.h" #include "optimizer/var.h" +#include "utils/lsyscache.h" static bool fix_opid_walker(Node *node, void *context); diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c index 65e1e5fed1..6d175d6c03 100644 --- a/src/backend/optimizer/util/indexnode.c +++ b/src/backend/optimizer/util/indexnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.18 1999/07/16 03:13:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.19 1999/07/16 04:59:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,8 +16,8 @@ #include "postgres.h" -#include "optimizer/plancat.h" #include "optimizer/pathnode.h" +#include "optimizer/plancat.h" static List *find_secondary_index(Query *root, Oid relid); diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 1df8113144..3420313c98 100644 --- a/src/backend/optimizer/util/joininfo.c +++ b/src/backend/optimizer/util/joininfo.c @@ -7,15 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.22 1999/07/15 22:39:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.23 1999/07/16 04:59:25 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "optimizer/joininfo.h" #include "optimizer/clauses.h" +#include "optimizer/joininfo.h" /* diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index c7a1e8f58a..3c9e0a4dc8 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.45 1999/07/16 03:13:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.46 1999/07/16 04:59:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,13 @@ #include "postgres.h" -#include "optimizer/pathnode.h" -#include "optimizer/restrictinfo.h" -#include "optimizer/plancat.h" + #include "optimizer/cost.h" #include "optimizer/keys.h" #include "optimizer/ordering.h" - +#include "optimizer/pathnode.h" +#include "optimizer/plancat.h" +#include "optimizer/restrictinfo.h" #include "parser/parsetree.h" static Path *better_path(Path *new_path, List *unique_paths, bool *is_new); diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index 0e42f1d925..73ba86e6a0 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.33 1999/07/16 03:13:05 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.34 1999/07/16 04:59:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,20 +16,21 @@ #include #include "postgres.h" -#include "access/heapam.h" -#include "access/genam.h" + + + +#include "access/genam.h" +#include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_amop.h" #include "catalog/pg_inherits.h" - -#include "parser/parsetree.h" - #include "optimizer/internal.h" #include "optimizer/plancat.h" - +#include "parser/parsetree.h" #include "utils/syscache.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c index e91057057a..12b95a61af 100644 --- a/src/backend/optimizer/util/restrictinfo.c +++ b/src/backend/optimizer/util/restrictinfo.c @@ -7,16 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.5 1999/07/15 22:39:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.6 1999/07/16 04:59:27 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "nodes/nodeFuncs.h" -#include "optimizer/internal.h" +#include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" +#include "optimizer/internal.h" #include "optimizer/restrictinfo.h" /* diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index fe4a68abea..e348fa1b0f 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -7,19 +7,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.35 1999/07/15 22:39:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.36 1999/07/16 04:59:27 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "nodes/nodeFuncs.h" -#include "optimizer/var.h" -#include "optimizer/tlist.h" -#include "optimizer/clauses.h" #include "nodes/makefuncs.h" +#include "nodes/nodeFuncs.h" +#include "optimizer/clauses.h" +#include "optimizer/tlist.h" +#include "optimizer/var.h" static Node *flatten_tlistentry(Node *tlistentry, List *flat_tlist); diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 68b38f1712..c2b3889a0d 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.c,v 1.113 1999/07/15 22:39:33 momjian Exp $ + * $Id: analyze.c,v 1.114 1999/07/16 04:59:28 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,16 +16,16 @@ #include #include "postgres.h" + #include "access/heapam.h" +#include "catalog/pg_type.h" #include "nodes/makefuncs.h" +#include "parse.h" #include "parser/analyze.h" #include "parser/parse_agg.h" #include "parser/parse_clause.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" -#include "catalog/pg_type.h" -#include "parse.h" - #include "utils/builtins.h" static Query *transformStmt(ParseState *pstate, Node *stmt); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index b649f9e781..5e048a737f 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.90 1999/07/15 15:19:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.91 1999/07/16 04:59:29 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -37,18 +37,18 @@ #include "postgres.h" #include "access/htup.h" +#include "access/xact.h" +#include "catalog/catname.h" +#include "catalog/pg_type.h" #include "nodes/parsenodes.h" #include "nodes/print.h" +#include "parser/analyze.h" #include "parser/gramparse.h" #include "parser/parse_type.h" -#include "utils/acl.h" -#include "catalog/catname.h" -#include "access/xact.h" -#include "storage/lmgr.h" -#include "utils/numeric.h" -#include "parser/analyze.h" -#include "catalog/pg_type.h" #include "storage/bufpage.h" +#include "storage/lmgr.h" +#include "utils/acl.h" +#include "utils/numeric.h" #ifdef MULTIBYTE #include "mb/pg_wchar.h" diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index e5b5ece549..7470476aaa 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.24 1999/07/15 22:39:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.25 1999/07/16 04:59:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,10 +19,10 @@ #include "catalog/pg_aggregate.h" #include "optimizer/clauses.h" #include "parser/parse_agg.h" -#include "parser/parse_expr.h" #include "parser/parse_coerce.h" -#include "utils/syscache.h" +#include "parser/parse_expr.h" #include "utils/lsyscache.h" +#include "utils/syscache.h" static bool contain_agg_clause(Node *clause); static bool contain_agg_clause_walker(Node *node, void *context); diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 7f0e1509bf..4fb6369951 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.39 1999/07/15 22:39:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.40 1999/07/16 04:59:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,14 +17,14 @@ #include "postgres.h" #include "access/heapam.h" +#include "nodes/relation.h" +#include "parse.h" #include "parser/parse_clause.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" -#include "parser/parse_coerce.h" -#include "nodes/relation.h" -#include "parse.h" #define ORDER_CLAUSE 0 diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 610dfa232d..c8208da3fc 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -7,19 +7,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.19 1999/07/15 22:39:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.20 1999/07/16 04:59:32 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "utils/builtins.h" + +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" - #include "parser/parse_func.h" #include "parser/parse_target.h" -#include "parser/parse_coerce.h" +#include "utils/builtins.h" #include "utils/syscache.h" Oid DemoteType(Oid inType); diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index bccad445b5..b3ec1f7935 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.51 1999/07/15 22:39:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.52 1999/07/16 04:59:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,11 @@ #include "parse.h" #include "parser/analyze.h" #include "parser/gramparse.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" -#include "parser/parse_coerce.h" #include "utils/builtins.h" static Node *parser_typecast(Value *expr, TypeName *typename, int32 atttypmod); diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 083e1c070b..1116304500 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.48 1999/07/15 22:39:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.49 1999/07/16 04:59:33 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,19 +19,19 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/indexing.h" +#include "catalog/pg_aggregate.h" #include "catalog/pg_inherits.h" #include "catalog/pg_proc.h" -#include "catalog/pg_aggregate.h" #include "lib/dllist.h" #include "miscadmin.h" #include "nodes/makefuncs.h" #include "nodes/relation.h" #include "parser/parse_agg.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" -#include "parser/parse_coerce.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 0e56276a0c..25c34a4e8a 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.26 1999/05/22 04:12:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.27 1999/07/16 04:59:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,15 +20,15 @@ #include "catalog/pg_type.h" #include "fmgr.h" #include "nodes/makefuncs.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_node.h" #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_type.h" -#include "parser/parse_coerce.h" #include "utils/builtins.h" -#include "utils/syscache.h" #include "utils/lsyscache.h" +#include "utils/syscache.h" static void disallow_setop(char *op, Type optype, Node *operand); static Node *make_operand(char *opname, diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 672ff26974..cfb822f40e 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.27 1999/07/15 22:39:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.28 1999/07/16 04:59:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,11 +18,11 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_operator.h" +#include "parser/parse_coerce.h" +#include "parser/parse_func.h" #include "parser/parse_oper.h" #include "parser/parse_type.h" -#include "parser/parse_coerce.h" #include "utils/syscache.h" -#include "parser/parse_func.h" static Oid *oper_select_candidate(int nargs, Oid *input_typeids, CandidateList candidates); diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 323334dddc..219d4ff35e 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.23 1999/07/15 15:19:32 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.24 1999/07/16 04:59:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,12 +19,12 @@ #include "access/htup.h" #include "catalog/pg_type.h" #include "nodes/makefuncs.h" -#include "parser/parse_relation.h" #include "parser/parse_coerce.h" +#include "parser/parse_relation.h" +#include "parser/parse_type.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "parser/parse_type.h" static void checkTargetTypes(ParseState *pstate, char *target_colname, char *refname, char *colname); diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 7c8e824858..4ebb28a05b 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.43 1999/07/15 22:39:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.44 1999/07/16 04:59:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,11 +17,11 @@ #include "postgres.h" #include "nodes/makefuncs.h" +#include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" -#include "parser/parse_coerce.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index bce28bd5af..50e633a750 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.40 1999/07/15 22:39:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.41 1999/07/16 04:59:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,7 +20,6 @@ #if defined(FLEX_SCANNER) extern void DeleteBuffer(void); - #endif /* FLEX_SCANNER */ char *parseString; /* the char* which holds the string to be diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 6389f0bfe4..881c7132c7 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.50 1999/07/08 00:00:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.51 1999/07/16 04:59:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -24,12 +24,12 @@ #include "postgres.h" #include "miscadmin.h" -#include "nodes/pg_list.h" #include "nodes/parsenodes.h" +#include "nodes/pg_list.h" +#include "parse.h" #include "parser/gramparse.h" #include "parser/keywords.h" #include "parser/scansup.h" -#include "parse.h" #include "utils/builtins.h" #ifdef YY_READ_BUF_SIZE diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index 782a0230a3..bea475689c 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: freebsd.h,v 1.4 1999/07/16 03:13:10 momjian Exp $ + * $Id: freebsd.h,v 1.5 1999/07/16 04:59:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,7 @@ #include #include -#include "link.h" +#include #include "postgres.h" diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c index 742b8c8e69..64a26c3e02 100644 --- a/src/backend/port/dynloader/hpux.c +++ b/src/backend/port/dynloader/hpux.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.9 1999/07/16 03:13:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.10 1999/07/16 04:59:37 momjian Exp $ * * NOTES * all functions are defined here -- it's impossible to trace the @@ -18,8 +18,9 @@ /* System includes */ #include #include -#include "dl.h" + #include "postgres.h" +#include "dl.h" #include "dynloader.h" #include "fmgr.h" #include "utils/dynamic_loader.h" diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 8639318223..8e042a24bd 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.13 1999/07/15 22:39:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.14 1999/07/16 04:59:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,7 @@ #include "postgres.h" #ifdef HAVE_DLD_H +#include "dld.h" #endif #ifdef NOT_USED diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c index 868bd21db0..b9b988de18 100644 --- a/src/backend/port/dynloader/ultrix4.c +++ b/src/backend/port/dynloader/ultrix4.c @@ -9,17 +9,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.7 1999/07/15 23:03:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.8 1999/07/16 04:59:38 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" #include "dl.h" -#include "utils/dynamic_loader.h" -#include "postgres.h" #include "fmgr.h" #include "port-protos.h" +#include "utils/dynamic_loader.h" extern char *pg_pathname; diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index a704c39bf4..80b05f7a74 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,4 +1,4 @@ -/* $Id: isinf.c,v 1.7 1999/07/15 22:39:38 momjian Exp $ */ +/* $Id: isinf.c,v 1.8 1999/07/16 04:59:35 momjian Exp $ */ #include @@ -26,6 +26,7 @@ isinf(double d) #if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D) #if HAVE_FP_CLASS_H +#include #endif int isinf(x) diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c index 8f41ece45b..17e8eb9a1d 100644 --- a/src/backend/port/snprintf.c +++ b/src/backend/port/snprintf.c @@ -31,8 +31,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifdef NOT_USED -#endif #include "postgres.h" @@ -79,7 +77,7 @@ typedef unsigned long ulong_long; * causing nast effects. **************************************************************/ -/*static char _id[] = "$Id: snprintf.c,v 1.23 1999/07/15 22:39:39 momjian Exp $";*/ +/*static char _id[] = "$Id: snprintf.c,v 1.24 1999/07/16 04:59:36 momjian Exp $";*/ static char *end; static int SnprfOverflow; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 2bf92b5f03..72a2cd9944 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.111 1999/07/16 03:13:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.112 1999/07/16 04:59:38 momjian Exp $ * * NOTES * @@ -38,32 +38,33 @@ #include #endif +#include "postgres.h" + #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 #endif -#include "postgres.h" +#if !defined(NO_UNISTD_H) +#include +#endif /* !NO_UNISTD_H */ #include #include #include #include -#if !defined(NO_UNISTD_H) -#include -#endif /* !NO_UNISTD_H */ -#include -#include -#include -#include -#include #ifdef HAVE_LIMITS_H #include #else #include #endif #include +#include +#include +#include +#include +#include #include #include @@ -77,24 +78,25 @@ #include "getopt.h" #endif -#include "storage/ipc.h" -#include "libpq/libpq.h" -#include "libpq/auth.h" -#include "libpq/pqcomm.h" -#include "libpq/pqsignal.h" -#include "libpq/crypt.h" -#include "miscadmin.h" -#include "version.h" -#include "lib/dllist.h" -#include "tcop/tcopprot.h" -#include "commands/async.h" -#include "nodes/nodes.h" -#include "storage/proc.h" #ifndef HAVE_GETHOSTNAME #include "port-protos.h" #endif + +#include "commands/async.h" +#include "lib/dllist.h" +#include "libpq/auth.h" +#include "libpq/crypt.h" +#include "libpq/libpq.h" +#include "libpq/pqcomm.h" +#include "libpq/pqsignal.h" +#include "miscadmin.h" +#include "nodes/nodes.h" #include "storage/fd.h" +#include "storage/ipc.h" +#include "storage/proc.h" +#include "tcop/tcopprot.h" #include "utils/trace.h" +#include "version.h" #if !defined(MAXINT) #define MAXINT INT_MAX diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c index e6cce0e336..c478a7face 100644 --- a/src/backend/rewrite/locks.c +++ b/src/backend/rewrite/locks.c @@ -6,19 +6,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.20 1999/07/16 03:13:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.21 1999/07/16 04:59:39 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" -#include "utils/syscache.h" -#include "rewrite/locks.h" #include "access/heapam.h" -#include "utils/syscache.h" +#include "catalog/pg_shadow.h" +#include "rewrite/locks.h" #include "utils/acl.h" #include "utils/builtins.h" -#include "catalog/pg_shadow.h" +#include "utils/syscache.h" +#include "utils/syscache.h" /* diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index d7e5dd3c74..2130cb7878 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -6,31 +6,31 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.52 1999/07/16 03:13:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.53 1999/07/16 04:59:40 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "miscadmin.h" -#include "parser/parse_type.h" -#include "parser/parsetree.h" -#include "parser/parse_relation.h" -#include "parser/parse_target.h" -#include "parser/analyze.h" -#include "optimizer/clauses.h" -#include "optimizer/prep.h" -#include "rewrite/rewriteManip.h" -#include "rewrite/locks.h" + #include "access/heapam.h" - -#include "utils/lsyscache.h" -#include "utils/acl.h" #include "catalog/pg_type.h" +#include "miscadmin.h" +#include "optimizer/clauses.h" +#include "optimizer/prep.h" +#include "parser/analyze.h" +#include "parser/parse_relation.h" +#include "parser/parse_target.h" +#include "parser/parse_type.h" +#include "parser/parsetree.h" +#include "rewrite/locks.h" +#include "rewrite/rewriteManip.h" +#include "utils/acl.h" +#include "utils/lsyscache.h" static RewriteInfo *gatherRewriteMeta(Query *parsetree, diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 283dd3f230..5d04add6fe 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -6,18 +6,18 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.36 1999/07/16 03:13:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.37 1999/07/16 04:59:40 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "parser/parsetree.h" -#include "utils/lsyscache.h" -#include "utils/builtins.h" -#include "rewrite/rewriteManip.h" #include "optimizer/clauses.h" +#include "parser/parsetree.h" +#include "rewrite/rewriteManip.h" +#include "utils/builtins.h" +#include "utils/lsyscache.h" static void ResolveNew(RewriteInfo *info, List *targetlist, Node **node, int sublevels_up); diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index aaad3102cf..b2fefcf20e 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.26 1999/07/16 03:13:23 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.27 1999/07/16 04:59:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,13 +17,13 @@ #include "postgres.h" + #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/pg_rewrite.h" -#include "utils/syscache.h" - #include "rewrite/rewriteRemove.h" #include "rewrite/rewriteSupport.h" +#include "utils/syscache.h" /*----------------------------------------------------------------------- * RewriteGetRuleEventRel diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 27c162b8fd..c8d9d023ef 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -7,20 +7,20 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.35 1999/07/16 03:13:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.36 1999/07/16 04:59:41 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" + #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/indexing.h" +#include "rewrite/rewriteSupport.h" #include "utils/catcache.h" #include "utils/syscache.h" -#include "rewrite/rewriteSupport.h" - /* * RuleIdGetActionInfo - * given a rule oid, look it up and return the rule-event-qual and diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index 39b4564d7f..4c007e0570 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.26 1999/07/16 03:13:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.27 1999/07/16 04:59:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,24 +19,23 @@ #include "postgres.h" -/* declarations split between these three files */ + +#include "catalog/catalog.h" +#include "executor/execdebug.h" +#include "miscadmin.h" #include "storage/buf.h" #include "storage/buf_internals.h" #include "storage/bufmgr.h" - #include "storage/fd.h" #include "storage/ipc.h" +#include "storage/lmgr.h" #include "storage/s_lock.h" #include "storage/shmem.h" -#include "storage/spin.h" #include "storage/smgr.h" -#include "storage/lmgr.h" -#include "miscadmin.h" +#include "storage/spin.h" #include "utils/builtins.h" #include "utils/hsearch.h" #include "utils/memutils.h" -#include "executor/execdebug.h" -#include "catalog/catalog.h" /* * if BMTRACE is defined, we trace the last 200 buffer allocations and diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 58b7e6c175..e0b441f295 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.59 1999/07/16 03:13:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.60 1999/07/16 04:59:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,14 +48,11 @@ #include #include "postgres.h" - -/* declarations split between these three files */ - +#include "executor/execdebug.h" +#include "miscadmin.h" #include "storage/s_lock.h" #include "storage/smgr.h" -#include "miscadmin.h" #include "utils/relcache.h" -#include "executor/execdebug.h" extern SPINLOCK BufMgrLock; extern long int ReadBufferCount; diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 13f79377b5..eed3129004 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.16 1999/07/15 22:39:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.17 1999/07/16 04:59:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,7 +26,6 @@ #include #include "postgres.h" - #include "storage/bufmgr.h" diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 8977534c49..81ffdb640c 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.24 1999/07/16 03:13:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.25 1999/07/16 04:59:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,11 +28,9 @@ #include "postgres.h" -/* declarations split between these three files */ - +#include "executor/execdebug.h" #include "storage/smgr.h" #include "utils/relcache.h" -#include "executor/execdebug.h" extern long int LocalBufferFlushCount; diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 31a4373b97..97bf1a3ee7 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.28 1999/07/16 03:13:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.29 1999/07/16 04:59:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,9 @@ #include "postgres.h" -#include "storage/sinval.h" -#include "storage/bufmgr.h" #include "miscadmin.h" +#include "storage/bufmgr.h" +#include "storage/sinval.h" /* * SystemPortAddressCreateMemoryKey diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c index c49ebc9194..4d9bd3f71b 100644 --- a/src/backend/storage/ipc/spin.c +++ b/src/backend/storage/ipc/spin.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.19 1999/07/15 22:39:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.20 1999/07/16 04:59:44 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,13 +26,14 @@ */ #include #include "postgres.h" -#include "storage/s_lock.h" -#include "storage/proc.h" #ifndef HAS_TEST_AND_SET #include #endif +#include "storage/proc.h" +#include "storage/s_lock.h" + /* globals used in this file */ IpcSemaphoreId SpinLockId; diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index cb3b3c5ffc..b6ba758849 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.55 1999/07/16 03:13:37 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.56 1999/07/16 04:59:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,11 +23,11 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/nbtree.h" -#include "catalog/catalog.h" /* for newoid() */ +#include "catalog/catalog.h" #include "catalog/heap.h" -#include "catalog/index.h" /* for index_create() */ -#include "catalog/pg_type.h" /* for INT4OID */ -#include "catalog/pg_opclass.h" /* for INT4_OPS_OID */ +#include "catalog/index.h" +#include "catalog/pg_opclass.h" +#include "catalog/pg_type.h" #include "libpq/libpq-fs.h" #include "miscadmin.h" #include "storage/large_object.h" diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 8087b3f4f3..032abac1ad 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.31 1999/07/16 03:13:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.32 1999/07/16 04:59:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,9 +25,9 @@ -#include "catalog/catalog.h" #include "access/transam.h" +#include "catalog/catalog.h" extern Oid MyDatabaseId; diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index e2c05594e0..711f56efb8 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.59 1999/07/16 03:13:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.60 1999/07/16 04:59:48 momjian Exp $ * * NOTES * Outside modules can create a lock table and acquire/release @@ -36,11 +36,11 @@ #include #include "postgres.h" +#include "access/xact.h" #include "miscadmin.h" #include "storage/proc.h" -#include "access/xact.h" -#include "utils/trace.h" #include "utils/ps_status.h" +#include "utils/trace.h" static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode); diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c index 03ae7e9ed6..d8897cd4d0 100644 --- a/src/backend/storage/lmgr/multi.c +++ b/src/backend/storage/lmgr/multi.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.31 1999/07/16 03:13:45 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.32 1999/07/16 04:59:48 momjian Exp $ * * NOTES: * (1) The lock.c module assumes that the caller here is doing @@ -23,11 +23,11 @@ #include #include #include "postgres.h" + +#include "miscadmin.h" #include "storage/lmgr.h" #include "storage/multilev.h" - #include "utils/rel.h" -#include "miscadmin.h" static bool MultiAcquire(LOCKMETHOD lockmethod, LOCKTAG *tag, LOCKMODE lockmode, PG_LOCK_LEVEL level); diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 5822ca4e06..2fca5a4e3e 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,7 +46,7 @@ * This is so that we can support more backends. (system-wide semaphore * sets run out pretty fast.) -ay 4/95 * - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $ */ #include #include @@ -66,6 +66,7 @@ /* In Ultrix, sem.h must be included after ipc.h */ #include + #include "storage/lmgr.h" #include "storage/proc.h" #include "utils/trace.h" diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index f96431d5a4..3c5dd55e79 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.49 1999/07/16 03:13:47 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.50 1999/07/16 04:59:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,9 @@ #include #include "postgres.h" -#include "miscadmin.h" #include "catalog/catalog.h" +#include "miscadmin.h" #include "storage/smgr.h" #undef DIAGNOSTIC diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index b82da2f350..2e76d7862e 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.34 1999/07/16 03:13:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.35 1999/07/16 04:59:51 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,12 +37,9 @@ #include "postgres.h" +#include "access/printtup.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" -#include "access/printtup.h" - - - static char CommandInfo[32] = {0}; diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 8461711fc9..fa7045a9d9 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.27 1999/07/16 03:13:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.28 1999/07/16 04:59:53 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -61,17 +61,14 @@ #include "postgres.h" - -#include "utils/builtins.h" -#include "tcop/fastpath.h" -#include "libpq/libpq.h" -#include "libpq/pqformat.h" - #include "access/xact.h" - -#include "utils/syscache.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" +#include "libpq/libpq.h" +#include "libpq/pqformat.h" +#include "tcop/fastpath.h" +#include "utils/builtins.h" +#include "utils/syscache.h" /* ---------------- diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 5cbc2ce277..73f7c943e5 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.122 1999/07/16 03:13:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.123 1999/07/16 04:59:53 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -25,6 +25,9 @@ #include #include #include + +#include "postgres.h" + #ifndef MAXHOSTNAMELEN #include #endif @@ -41,13 +44,11 @@ #ifdef __CYGWIN32__ #endif -#include "postgres.h" -#include "miscadmin.h" - #include "commands/async.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" +#include "miscadmin.h" #include "nodes/print.h" #include "optimizer/cost.h" #include "optimizer/planner.h" @@ -59,20 +60,12 @@ #include "tcop/utility.h" #include "utils/ps_status.h" #include "utils/temprel.h" -#include "../backend/parser/parse.h" - -#ifdef NOT_USED -#endif - -#ifdef NOT_USED -#endif - -#ifdef NOT_USED -#endif - #include "utils/trace.h" +#include "../backend/parser/parse.h" + #ifdef MULTIBYTE +#include "mb/pg_wchar.h" #endif /* @@ -1502,7 +1495,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[]) if (!IsUnderPostmaster) { puts("\nPOSTGRES backend interactive interface "); - puts("$Revision: 1.122 $ $Date: 1999/07/16 03:13:50 $\n"); + puts("$Revision: 1.123 $ $Date: 1999/07/16 04:59:53 $\n"); } /* ---------------- diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 57d897d3de..6e08ed82fe 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.25 1999/07/15 22:39:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.26 1999/07/16 04:59:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,10 +15,6 @@ #include "postgres.h" - - - - #include "executor/execdefs.h" #include "executor/executor.h" #include "tcop/pquery.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index e690148de9..8c1ac55614 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -9,43 +9,40 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.63 1999/07/15 22:39:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.64 1999/07/16 04:59:55 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" + #include "access/heapam.h" #include "catalog/catalog.h" #include "catalog/pg_type.h" - #include "commands/async.h" #include "commands/cluster.h" #include "commands/command.h" #include "commands/copy.h" #include "commands/creatinh.h" #include "commands/dbcommands.h" -#include "commands/sequence.h" #include "commands/defrem.h" -#include "commands/rename.h" -#include "commands/view.h" -#include "commands/vacuum.h" #include "commands/explain.h" -#include "commands/trigger.h" #include "commands/proclang.h" +#include "commands/rename.h" +#include "commands/sequence.h" +#include "commands/trigger.h" +#include "commands/vacuum.h" #include "commands/variable.h" +#include "commands/view.h" +#include "miscadmin.h" +#include "rewrite/rewriteDefine.h" +#include "rewrite/rewriteRemove.h" +#include "tcop/utility.h" +#include "utils/acl.h" +#include "utils/acl.h" +#include "utils/ps_status.h" +#include "utils/syscache.h" #include "../backend/parser/parse.h" -#include "utils/acl.h" -#include "rewrite/rewriteRemove.h" -#include "rewrite/rewriteDefine.h" -#include "tcop/utility.h" -#include "utils/ps_status.h" - -#ifndef NO_SECURITY -#include "miscadmin.h" -#include "utils/acl.h" -#include "utils/syscache.h" -#endif void DefineUser(CreateUserStmt *stmt, CommandDest); void AlterUser(AlterUserStmt *stmt, CommandDest); diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c index 933e176d59..8b77db4fa2 100644 --- a/src/backend/tioga/tgRecipe.c +++ b/src/backend/tioga/tgRecipe.c @@ -11,16 +11,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.13 1999/07/16 03:13:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.14 1999/07/16 04:59:57 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "tioga/tgRecipe.h" #include "catalog/catalog.h" +#include "tioga/tgRecipe.h" static Arr_TgString *TextArray2ArrTgString(char *str); diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index b1a5d8e1a0..9f64a77a3e 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.38 1999/07/15 23:03:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.39 1999/07/16 04:59:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,13 +15,13 @@ #include #include "postgres.h" -#include "utils/memutils.h" -#include "utils/acl.h" -#include "utils/syscache.h" #include "catalog/catalog.h" #include "catalog/pg_shadow.h" #include "catalog/pg_type.h" #include "miscadmin.h" +#include "utils/acl.h" +#include "utils/memutils.h" +#include "utils/syscache.h" static char *getid(char *s, char *n); static int32 aclitemeq(AclItem *a1, AclItem *a2); diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index ddbabadeda..8e09385ba4 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.45 1999/07/15 19:21:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.46 1999/07/16 05:00:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,16 +19,16 @@ #include "postgres.h" + #include "catalog/catalog.h" #include "catalog/pg_type.h" - -#include "utils/syscache.h" -#include "utils/memutils.h" -#include "storage/fd.h" #include "fmgr.h" -#include "utils/array.h" -#include "libpq/libpq-fs.h" #include "libpq/be-fsstubs.h" +#include "libpq/libpq-fs.h" +#include "storage/fd.h" +#include "utils/array.h" +#include "utils/memutils.h" +#include "utils/syscache.h" #define ASSGN "=" diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index 6cfa052055..df81756926 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. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.30 1999/07/15 15:20:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.31 1999/07/16 05:00:01 momjian Exp $ */ #include @@ -34,7 +34,6 @@ static const char *num_word(Cash value); #ifdef USE_LOCALE static struct lconv *lconvert = NULL; - #endif /* cash_in() diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 97f0c22f2a..cbef5655f0 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -8,14 +8,14 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.24 1999/07/15 15:20:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.25 1999/07/16 05:00:03 momjian Exp $ * *------------------------------------------------------------------------- */ #include /* for sprintf() */ #include #include "postgres.h" -#include "utils/builtins.h" /* where the declarations go */ +#include "utils/builtins.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index 815a263dda..0092400989 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.21 1999/07/15 23:03:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.22 1999/07/16 05:00:05 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,21 +15,20 @@ #include #include "postgres.h" -#include "fmgr.h" - -#include "catalog/pg_type.h" -#include "libpq/be-fsstubs.h" -#include "libpq/libpq-fs.h" -#include "optimizer/internal.h" -#include "utils/array.h" -#include "utils/memutils.h" - #ifndef HAVE_MEMMOVE #include "regex/utils.h" #else #include #endif +#include "catalog/pg_type.h" +#include "fmgr.h" +#include "libpq/be-fsstubs.h" +#include "libpq/libpq-fs.h" +#include "optimizer/internal.h" +#include "utils/array.h" +#include "utils/memutils.h" + #define INFTY 500000000 #define MANY 10000 #define MAXPAT 20 diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 2c352bcd80..e4255ebeb5 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.35 1999/07/16 03:13:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.36 1999/07/16 05:00:07 momjian Exp $ * * NOTES * This code is actually (almost) unused. @@ -31,14 +31,15 @@ #include #include "postgres.h" -#include "miscadmin.h" #ifdef HAVE_FLOAT_H #include #endif #ifdef HAVE_LIMITS_H #include #endif + #include "access/xact.h" +#include "miscadmin.h" #include "utils/builtins.h" #include "utils/dt.h" diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c index 6e6dc717eb..ba32e0a974 100644 --- a/src/backend/utils/adt/dt.c +++ b/src/backend/utils/adt/dt.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.74 1999/07/15 15:20:14 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.75 1999/07/16 05:00:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,7 @@ #include #include #include - #include "postgres.h" -#include "miscadmin.h" #ifdef HAVE_FLOAT_H #include #endif @@ -29,6 +27,8 @@ #ifndef USE_POSIX_TIME #include #endif + +#include "miscadmin.h" #include "utils/builtins.h" static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm); diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 394fae2757..1f971ff97a 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.25 1999/07/16 03:14:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.26 1999/07/16 05:00:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -30,11 +30,12 @@ */ #include #include + +#include "postgres.h" #ifdef HAVE_LIMITS_H #include #endif -#include "postgres.h" #include "utils/builtins.h" #ifndef SHRT_MAX diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index 44a767e1d2..9d13b2c42a 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -19,8 +19,8 @@ */ #include #include "postgres.h" -#include "utils/builtins.h" #include "mb/pg_wchar.h" +#include "utils/builtins.h" static int like(pg_wchar * text, pg_wchar * p); @@ -110,7 +110,7 @@ textnlike(struct varlena * s, struct varlena * p) } -/* $Revision: 1.28 $ +/* $Revision: 1.29 $ ** "like.c" A first attempt at a LIKE operator for Postgres95. ** ** Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986. diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index a50c2dc82f..13899777a4 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -4,7 +4,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nabstime.c,v 1.58 1999/07/15 23:03:27 momjian Exp $ + * $Id: nabstime.c,v 1.59 1999/07/16 05:00:14 momjian Exp $ * */ #include @@ -13,7 +13,6 @@ #include #include "postgres.h" -#include "miscadmin.h" #ifdef HAVE_FLOAT_H #include #endif @@ -23,8 +22,10 @@ #ifndef USE_POSIX_TIME #include #endif -#include "utils/builtins.h" + #include "access/xact.h" +#include "miscadmin.h" +#include "utils/builtins.h" static AbsoluteTime tm2abstime(struct tm * tm, int tz); diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 86ebe1be70..b2941d0617 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.21 1999/07/16 03:14:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.22 1999/07/16 05:00:16 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c index cf2a3ed058..107824eada 100644 --- a/src/backend/utils/adt/not_in.c +++ b/src/backend/utils/adt/not_in.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.18 1999/07/16 03:14:04 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.19 1999/07/16 05:00:18 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 072e3ffcd5..b31dad564c 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,22 +10,24 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.36 1999/07/16 03:14:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.37 1999/07/16 05:00:19 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include #include + +#include "postgres.h" #ifdef HAVE_LIMITS_H #include #endif -#include "postgres.h" -#include "utils/builtins.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif +#include "utils/builtins.h" #ifndef INT_MAX #define INT_MAX (0x7FFFFFFFL) diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index 806bd170e7..74422d4e3f 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.26 1999/07/16 03:14:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.27 1999/07/16 05:00:21 momjian Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index 8b4e2c5a17..1861115fcf 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.26 1999/07/16 03:14:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.27 1999/07/16 05:00:22 momjian Exp $ * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance @@ -30,8 +30,8 @@ #include #include "postgres.h" -#include "regex/regex.h" +#include "regex/regex.h" #include "utils/builtins.h" #if defined(DISABLE_XOPEN_NLS) diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index ec6adb44e3..bc2fcebc06 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -7,22 +7,22 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.40 1999/07/16 03:14:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.41 1999/07/16 05:00:24 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "miscadmin.h" -#include "access/heapam.h" -#include "access/genam.h" -#include "utils/syscache.h" +#include "access/genam.h" +#include "access/heapam.h" #include "catalog/catname.h" #include "catalog/indexing.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" +#include "miscadmin.h" #include "utils/builtins.h" +#include "utils/syscache.h" /***************************************************************************** * USER I/O ROUTINES * diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index c0a86078d6..2e57e2a1b9 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.33 1999/07/16 03:14:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.34 1999/07/16 05:00:25 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,13 +21,13 @@ #include "postgres.h" -#include "access/heapam.h" -#include "utils/builtins.h" +#include "access/heapam.h" #include "catalog/catname.h" -#include "utils/syscache.h" -#include "utils/lsyscache.h" #include "catalog/pg_statistic.h" +#include "utils/builtins.h" +#include "utils/lsyscache.h" +#include "utils/syscache.h" /* N is not a valid var/constant or relation id */ #define NONVALUE(N) ((N) == -1) diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c index f0787fdd87..15084778a4 100644 --- a/src/backend/utils/adt/sets.c +++ b/src/backend/utils/adt/sets.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.23 1999/07/16 03:14:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.24 1999/07/16 05:00:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,9 +19,9 @@ #include "postgres.h" #include "access/heapam.h" -#include "catalog/pg_proc.h" #include "catalog/catname.h" #include "catalog/indexing.h" +#include "catalog/pg_proc.h" #include "utils/sets.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 3c67ab854e..4ad2ab3dea 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -3,9 +3,9 @@ #include #include #include "postgres.h" +#include "access/xact.h" #include "miscadmin.h" #include "utils/builtins.h" -#include "access/xact.h" time_t timestamp_in(const char *timestamp_str) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index aae9819b37..b23a579017 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -7,16 +7,17 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.51 1999/07/16 03:14:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.52 1999/07/16 05:00:28 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include + #include "postgres.h" #include "access/htup.h" -#include "utils/builtins.h" #include "catalog/pg_type.h" +#include "utils/builtins.h" #ifdef CYR_RECODE char *convertstr(char *, int, int); diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 1529341956..94011f04fa 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.51 1999/07/16 03:14:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.52 1999/07/16 05:00:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,9 @@ #include #include "postgres.h" -#include "utils/builtins.h" #include "mb/pg_wchar.h" +#include "utils/builtins.h" static int text_cmp(text *arg1, text *arg2); diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 2c436cc979..137d3ceed4 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,19 +7,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.46 1999/07/16 03:14:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.47 1999/07/16 05:00:34 momjian Exp $ * *------------------------------------------------------------------------- */ #include #include "postgres.h" -#include "access/heapam.h" #include "access/genam.h" +#include "access/heapam.h" +#include "access/valid.h" +#include "catalog/pg_type.h" +#include "miscadmin.h" #include "utils/builtins.h" #include "utils/catcache.h" -#include "access/valid.h" -#include "miscadmin.h" -#include "catalog/pg_type.h" static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e); static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP); diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c index 3b775aa8ce..312b925717 100644 --- a/src/backend/utils/cache/fcache.c +++ b/src/backend/utils/cache/fcache.c @@ -7,25 +7,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.24 1999/07/16 03:14:16 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.25 1999/07/16 05:00:37 momjian Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" - - -#include "utils/syscache.h" -#include "catalog/pg_type.h" -#include "catalog/pg_proc.h" -#include "catalog/pg_language.h" -#include "parser/parsetree.h" -#include "utils/builtins.h" -#include "utils/fcache2.h" #ifndef HAVE_MEMMOVE +#include #else #include #endif +#include "catalog/pg_language.h" +#include "catalog/pg_proc.h" +#include "catalog/pg_type.h" +#include "parser/parsetree.h" +#include "utils/builtins.h" +#include "utils/fcache2.h" +#include "utils/syscache.h" + static Oid GetDynamicFuncArgType(Var *arg, ExprContext *econtext); static FunctionCachePtr init_fcache(Oid foid, bool use_syscache, diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index b3d1fdc087..1671a8e9ec 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.26 1999/07/16 03:14:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.27 1999/07/16 05:00:38 momjian Exp $ * * Note - this code is real crufty... * @@ -15,15 +15,14 @@ */ #include "postgres.h" -#include "miscadmin.h" - #include "catalog/catalog.h" +#include "catalog/catname.h" #include "catalog/heap.h" +#include "miscadmin.h" #include "storage/sinval.h" #include "utils/catcache.h" #include "utils/inval.h" #include "utils/relcache.h" -#include "catalog/catname.h" static InvalidationEntry InvalidationEntryAllocate(uint16 size); static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());