From: Marc G. Fournier Date: Mon, 2 Aug 1999 05:57:07 +0000 (+0000) Subject: Another mass of them... just #include file changes and/or DOUBLEALIGN->MAXALIGN X-Git-Tag: REL6_5_2~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10ace1fac8d9f2aa887a1095340e218430928fce;p=thirdparty%2Fpostgresql.git Another mass of them... just #include file changes and/or DOUBLEALIGN->MAXALIGN --- diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index bcda5f85e73..e8f6289931e 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.20 1999/05/25 16:06:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.20.2.1 1999/08/02 05:56:34 scrappy Exp $ * * NOTES * Postgres hash pages look like ordinary relation pages. The opaque @@ -23,20 +23,12 @@ *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include -#include +#include "access/genam.h" +#include "access/hash.h" +#include "miscadmin.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access); static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access); @@ -104,8 +96,8 @@ _hash_metapinit(Relation rel) for (i = metap->hashm_bshift; i > 0; --i) { if ((1 << i) < (metap->hashm_bsize - - (DOUBLEALIGN(sizeof(PageHeaderData)) + - DOUBLEALIGN(sizeof(HashPageOpaqueData))))) + (MAXALIGN(sizeof(PageHeaderData)) + + MAXALIGN(sizeof(HashPageOpaqueData))))) break; } Assert(i); @@ -613,7 +605,7 @@ _hash_splitpage(Relation rel, itemsz = IndexTupleDSize(hitem->hash_itup) + (sizeof(HashItemData) - sizeof(IndexTupleData)); - itemsz = DOUBLEALIGN(itemsz); + itemsz = MAXALIGN(itemsz); if (PageGetFreeSpace(npage) < itemsz) { diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index a0d03f6927c..66fc131dbda 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.46 1999/07/09 04:51:27 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.46.2.1 1999/08/02 05:56:36 scrappy Exp $ * * * INTERFACE ROUTINES @@ -73,27 +73,18 @@ *------------------------------------------------------------------------- */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif +#include "postgres.h" + +#include "access/heapam.h" +#include "access/hio.h" +#include "access/valid.h" +#include "catalog/catalog.h" +#include "miscadmin.h" +#include "storage/smgr.h" +#include "utils/builtins.h" +#include "utils/inval.h" +#include "utils/relcache.h" + /* ---------------------------------------------------------------- * heap support routines @@ -1289,7 +1280,7 @@ l2: HEAP_XMAX_INVALID | HEAP_MARKED_FOR_UPDATE); /* insert new item */ - if ((unsigned) DOUBLEALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp)) + if ((unsigned) MAXALIGN(newtup->t_len) <= PageGetFreeSpace((Page) dp)) RelationPutHeapTuple(relation, buffer, newtup); else { diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index c71b71e6e1b..c6f0ef6f887 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -7,19 +7,15 @@ * * * IDENTIFICATION - * $Id: hio.c,v 1.22 1999/07/03 01:56:16 momjian Exp $ + * $Id: hio.c,v 1.22.2.1 1999/08/02 05:56:37 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include -#include +#include "access/heapam.h" +#include "access/hio.h" /* * amputunique - place tuple at tid @@ -54,7 +50,7 @@ RelationPutHeapTuple(Relation relation, IncrHeapAccessStat(global_RelationPutHeapTuple); pageHeader = (Page) BufferGetPage(buffer); - len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */ + len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */ Assert((int) len <= PageGetFreeSpace(pageHeader)); offnum = PageAddItem((Page) pageHeader, (Item) tuple->t_data, @@ -147,7 +143,7 @@ RelationPutHeapTupleAtEnd(Relation relation, HeapTuple tuple) LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE); pageHeader = (Page) BufferGetPage(buffer); - len = (unsigned) DOUBLEALIGN(tuple->t_len); /* be conservative */ + len = (unsigned) MAXALIGN(tuple->t_len); /* be conservative */ /* * Note that this is true if the above returned a bogus page, which it diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c index 0d4f10421ec..170638a263c 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.16.2.1 1999/08/02 05:24:37 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.16.2.2 1999/08/02 05:56:37 scrappy Exp $ * * NOTES * initam should be moved someplace else. diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index ebc7f074e62..30cf2699d01 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.17.2.1 1999/08/02 05:24:38 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.17.2.2 1999/08/02 05:56:38 scrappy Exp $ * * NOTES * many of the old access method routines have been turned into diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 73019ce8b2f..3a6462980cc 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.30 1999/02/13 23:14:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.30.2.1 1999/08/02 05:56:39 scrappy Exp $ * * INTERFACE ROUTINES * index_open - open an index relation by relationId @@ -63,13 +63,11 @@ *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include +#include "access/genam.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 fa27bbef79e..e440037367f 100644 --- a/src/backend/access/index/istrat.c +++ b/src/backend/access/index/istrat.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33.2.1 1999/08/02 05:24:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33.2.2 1999/08/02 05:56:39 scrappy Exp $ * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index 55631101051..20646f7fa28 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -7,25 +7,15 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.45 1999/05/25 18:20:30 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.45.2.1 1999/08/02 05:56:42 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include - -#include -#include -#include -#include -#include - -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif +#include "postgres.h" +#include "access/genam.h" +#include "access/nbtree.h" static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey, Buffer *bufP, BTStack stack_in); diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 03bb786f4b0..74913dccd3e 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.27 1999/06/10 14:17:06 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.27.2.1 1999/08/02 05:56:46 scrappy Exp $ * * NOTES * This file contains the high level access-method interface to the @@ -16,15 +16,11 @@ *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include -#include -#include +#include "access/heapam.h" +#include "catalog/catname.h" +#include "commands/vacuum.h" static int RecoveryCheckingEnabled(void); static void TransRecover(Relation logRelation); diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c index 6fde4d74a0d..4c26e919214 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.21.2.1 1999/08/02 05:24:46 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21.2.2 1999/08/02 05:56:46 scrappy Exp $ * * NOTES * This file contains support functions for the high diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 0ec7ede4e79..835c912d8a3 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -7,19 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.22 1999/06/06 20:19:33 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.22.2.1 1999/08/02 05:56:47 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include -#include +#include "access/heapam.h" +#include "catalog/catname.h" +#include "storage/proc.h" static void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size); static void VariableRelationGetNextOid(Oid *oid_return); diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index cd860e0450b..bd01429d3b1 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.42 1999/06/29 04:54:46 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.42.2.1 1999/08/02 05:56:48 scrappy Exp $ * * NOTES * Transaction aborts can now occur two ways: @@ -142,21 +142,16 @@ * [PA, 7/17/98] * [PA] is Pascal André */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "postgres.h" + +#include "catalog/heap.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/access/transam/xid.c b/src/backend/access/transam/xid.c index 50db11bc912..0cefc73b12e 100644 --- a/src/backend/access/transam/xid.c +++ b/src/backend/access/transam/xid.c @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xid.c,v 1.22.2.1 1999/08/02 05:24:46 scrappy Exp $ + * $Id: xid.c,v 1.22.2.2 1999/08/02 05:56:49 scrappy Exp $ * * OLD COMMENTS * XXX WARNING diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index d1808bdbb2a..5eb0af070a8 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -8,17 +8,15 @@ * * * 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.25.2.1 1999/08/02 05:56:51 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include #include #include "postgres.h" -#include "miscadmin.h" #include "access/attnum.h" #include "access/funcindex.h" @@ -34,6 +32,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 331e0f722dd..103355ac99e 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -8,40 +8,37 @@ * * * 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.12.2.1 1999/08/02 05:56:52 scrappy Exp $ * *------------------------------------------------------------------------- */ #include -#include #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 6c7e7c16fa1..3de16c3c49c 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -7,82 +7,34 @@ * Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.60 1999/05/25 16:07:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.60.2.1 1999/08/02 05:56:52 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include /* For getopt() */ +#include #include -#include #include #include -#include -#ifdef __CYGWIN32__ -#include -#endif #define BOOTSTRAP_INCLUDE /* mask out stuff in tcop/tcopprot.h */ #include "postgres.h" +#ifdef HAVE_GETOPT_H +#include +#endif -#include "miscadmin.h" -#include "fmgr.h" - -#include "access/attnum.h" -#include "access/funcindex.h" #include "access/genam.h" #include "access/heapam.h" -#include "access/htup.h" -#include "access/itup.h" -#include "access/relscan.h" -#include "access/sdir.h" -#include "access/skey.h" -#include "access/strat.h" -#include "access/tupdesc.h" -#include "access/xact.h" #include "bootstrap/bootstrap.h" #include "catalog/catname.h" #include "catalog/index.h" -#include "catalog/pg_am.h" -#include "catalog/pg_attribute.h" -#include "catalog/pg_class.h" #include "catalog/pg_type.h" -#include "executor/execdesc.h" -#include "executor/hashjoin.h" -#include "executor/tuptable.h" #include "libpq/pqsignal.h" -#include "nodes/execnodes.h" -#include "nodes/memnodes.h" -#include "nodes/nodes.h" -#include "nodes/params.h" -#include "nodes/parsenodes.h" -#include "nodes/plannodes.h" -#include "nodes/pg_list.h" -#include "nodes/primnodes.h" -#include "rewrite/prs2lock.h" -#include "storage/block.h" -#include "storage/buf.h" -#include "storage/fd.h" -#include "storage/ipc.h" -#include "storage/itemptr.h" -#include "storage/lock.h" -#include "storage/off.h" -#include "storage/shmem.h" -#include "storage/spin.h" -#include "tcop/dest.h" +#include "miscadmin.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" -#include "utils/geo_decls.h" -#include "utils/hsearch.h" #include "utils/lsyscache.h" -#include "utils/mcxt.h" -#include "utils/nabstime.h" #include "utils/portal.h" -#include "utils/rel.h" - -#ifndef HAVE_MEMMOVE -#include "regex/utils.h" -#endif #define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t)) #define FIRST_TYPE_OID 16 /* OID of the first type */ diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index a5f9bf9728a..9a24c6870ee 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -7,38 +7,30 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.22 1999/06/19 05:05:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.22.2.1 1999/08/02 05:56:53 scrappy Exp $ * * NOTES * See acl.h. * *------------------------------------------------------------------------- */ -#include #include "postgres.h" -#include "utils/acl.h" /* where declarations for this file go */ #include "access/heapam.h" -#include "access/htup.h" -#include "access/tupmacs.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 "fmgr.h" +#include "miscadmin.h" #include "parser/parse_agg.h" #include "parser/parse_func.h" -#include "storage/bufmgr.h" -#include "utils/builtins.h" -#include "utils/memutils.h" +#include "utils/acl.h" #include "utils/syscache.h" -#include "utils/tqual.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 5e720714354..2a30e7b8558 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -7,20 +7,19 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.21 1999/05/25 16:08:01 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.21.2.1 1999/08/02 05:56:54 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include -#include +#include "postgres.h" -#include /* for DataDir */ -#include -#include /* NameIs{,Shared}SystemRelationName */ -#include -#include -#include +#include "access/transam.h" +#include "catalog/catalog.h" +#include "catalog/catname.h" +#include "catalog/pg_type.h" +#include "miscadmin.h" +#include "utils/syscache.h" /* * relpath - path to the relation diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 31747b23956..b8d5e0052c3 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.81 1999/07/07 09:27:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.81.2.1 1999/08/02 05:56:54 scrappy Exp $ * * * INTERFACE ROUTINES @@ -19,41 +19,29 @@ */ #include "postgres.h" + #include "access/genam.h" -#include "access/htup.h" #include "access/heapam.h" #include "access/istrat.h" -#include "access/xact.h" #include "bootstrap/bootstrap.h" -#include "catalog/catalog.h" #include "catalog/catname.h" #include "catalog/heap.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/pg_index.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/executor.h" -#include "fmgr.h" #include "miscadmin.h" #include "optimizer/clauses.h" #include "optimizer/prep.h" #include "parser/parse_func.h" -#include "storage/lmgr.h" #include "storage/smgr.h" #include "utils/builtins.h" -#include "utils/catcache.h" -#include "utils/mcxt.h" #include "utils/relcache.h" #include "utils/syscache.h" -#include "utils/tqual.h" #include "utils/temprel.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif - /* * macros used in guessing how many tuples are on a page. */ diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index a7a1dda444c..5093344a90c 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -8,11 +8,10 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.38 1999/05/25 16:08:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.38.2.1 1999/08/02 05:56:54 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include #include "postgres.h" @@ -23,12 +22,7 @@ #include "catalog/index.h" #include "catalog/indexing.h" #include "catalog/pg_index.h" -#include "catalog/pg_proc.h" -#include "fmgr.h" #include "miscadmin.h" -#include "nodes/execnodes.h" -#include "storage/bufmgr.h" -#include "utils/builtins.h" #include "utils/syscache.h" #include "utils/temprel.h" diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index ef9b9c3afbd..c3a421cbb6f 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -7,27 +7,20 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.20 1999/02/13 23:14:57 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.20.2.1 1999/08/02 05:56:55 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include +#include "postgres.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif +#include "access/heapam.h" +#include "catalog/catname.h" +#include "catalog/pg_aggregate.h" +#include "catalog/pg_proc.h" +#include "catalog/pg_type.h" +#include "miscadmin.h" +#include "utils/builtins.h" +#include "utils/syscache.h" /* ---------------- * AggregateCreate diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 58c87302d0a..96d048ac429 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.37 1999/05/25 16:08:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.37.2.1 1999/08/02 05:56:55 scrappy Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -21,19 +21,11 @@ #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "fmgr.h" #include "miscadmin.h" -#include "parser/parse_oper.h" -#include "storage/bufmgr.h" +#include "parser/parse_func.h" #include "utils/builtins.h" #include "utils/syscache.h" -#include "utils/tqual.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif static Oid OperatorGetWithOpenRelation(Relation pg_operator_desc, const char *operatorName, diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 3d31741cfe0..43752a1afba 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -7,23 +7,20 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.29 1999/05/25 16:08:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.29.2.1 1999/08/02 05:56:55 scrappy Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/heapam.h" -#include "access/relscan.h" #include "catalog/catname.h" #include "catalog/indexing.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" -#include "fmgr.h" #include "miscadmin.h" -#include "optimizer/internal.h" #include "optimizer/planner.h" -#include "parser/parse_node.h" +#include "parser/parse_type.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" #include "utils/fmgrtab.h" @@ -31,11 +28,6 @@ #include "utils/sets.h" #include "utils/syscache.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif /* ---------------------------------------------------------------- * ProcedureCreate diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 54856d4b76d..3757cf70d61 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -7,31 +7,21 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.37 1999/05/25 16:08:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.37.2.1 1999/08/02 05:56:55 scrappy Exp $ * *------------------------------------------------------------------------- */ #include "postgres.h" #include "access/heapam.h" -#include "access/relscan.h" #include "catalog/catname.h" #include "catalog/indexing.h" #include "catalog/pg_type.h" -#include "fmgr.h" #include "miscadmin.h" #include "parser/parse_func.h" -#include "storage/bufmgr.h" -#include "storage/lmgr.h" #include "utils/builtins.h" #include "utils/syscache.h" -#include "utils/tqual.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc, char *typeName); diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c index 487f55923df..f7531cf077d 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.4 1999/05/25 22:40:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.4.2.1 1999/08/02 05:57:01 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for RelationNameGetRelation */ -#include -#include -#include -#include -#include -#include +#include "postgres.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 "rewrite/rewriteHandler.h" +#include "rewrite/rewriteManip.h" +#include "tcop/dest.h" +#include "tcop/pquery.h" +#include "utils/builtins.h" +#include "utils/relcache.h" /* from tcop/postgres.c */ extern CommandDest whereToSendOutput; @@ -43,7 +43,7 @@ beginRecipe(RecipeStmt *stmt) #else -#include +#include "tioga/tgRecipe.h" #define DEBUG_RECIPE 1 diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index 6eddfdccfaf..0df0c4a64ed 100644 --- a/src/backend/commands/_deadcode/version.c +++ b/src/backend/commands/_deadcode/version.c @@ -9,7 +9,7 @@ * doesn't work! - jolly 8/19/95 * * - * $Id: version.c,v 1.19 1999/05/25 16:08:32 momjian Exp $ + * $Id: version.c,v 1.19.2.1 1999/08/02 05:57:02 scrappy Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -20,17 +20,9 @@ * *------------------------------------------------------------------------- */ -#include -#include -#include +#include "postgres.h" -#include -#include -#include -#include /* for GetCurrentXactStartTime */ -#include -#include #define MAX_QUERY_LEN 1024 diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 0e3cb83aa93..00016b0bca8 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.47 1999/05/25 16:08:15 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.47.2.1 1999/08/02 05:56:57 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -78,30 +78,23 @@ #include #include -#include #include -#include /* Needed by in.h on Ultrix */ +#include #include #include "postgres.h" -#include "commands/async.h" #include "access/heapam.h" -#include "access/relscan.h" -#include "access/xact.h" #include "catalog/catname.h" #include "catalog/pg_listener.h" -#include "fmgr.h" +#include "commands/async.h" #include "lib/dllist.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "miscadmin.h" -#include "storage/bufmgr.h" -#include "storage/lmgr.h" -#include "tcop/dest.h" +#include "utils/ps_status.h" #include "utils/syscache.h" -#include -#include +#include "utils/trace.h" /* stuff that we really ought not be touching directly :-( */ extern TransactionState CurrentTransactionState; diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index ebd4fd0c295..dae1bb0d4f6 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.47 1999/06/19 04:54:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.47.2.1 1999/08/02 05:56:57 scrappy Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -23,26 +23,19 @@ #include "postgres.h" #include "access/heapam.h" -#include "access/relscan.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 "fmgr.h" +#include "miscadmin.h" #include "optimizer/prep.h" #include "utils/acl.h" -#include "utils/array.h" #include "utils/builtins.h" -#include "utils/mcxt.h" -#include "utils/portal.h" -#include "utils/relcache.h" -#include "utils/temprel.h" #include "utils/syscache.h" -#include "miscadmin.h" -#include "string.h" +#include "utils/temprel.h" /* ---------------- * PortalExecutorHeapMemory stuff diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index e9c5fdcd894..d5fb8719bfa 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,26 +7,21 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.41 1999/05/25 16:08:20 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.41.2.1 1999/08/02 05:56:58 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "postgres.h" + +#include "access/heapam.h" +#include "catalog/catname.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 06f0a8115a5..72a53f3c9d6 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -7,31 +7,22 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.35 1999/05/25 16:08:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.35.2.1 1999/08/02 05:56:58 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include -#include #include #include #include "postgres.h" #include "access/heapam.h" -#include "access/htup.h" -#include "access/relscan.h" #include "catalog/catname.h" #include "catalog/pg_database.h" #include "catalog/pg_shadow.h" -#include "fmgr.h" -#include "miscadmin.h" /* for DataDir */ -#include "storage/bufmgr.h" -#include "storage/fd.h" -#include "storage/lmgr.h" -#include "tcop/tcopprot.h" #include "commands/dbcommands.h" -#include "utils/rel.h" +#include "miscadmin.h" +#include "tcop/tcopprot.h" #include "utils/syscache.h" diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index dd83129be4b..2dd5f992029 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -4,25 +4,19 @@ * * Copyright (c) 1994-5, Regents of the University of California * - * $Id: explain.c,v 1.38 1999/06/17 23:45:32 tgl Exp $ + * $Id: explain.c,v 1.38.2.1 1999/08/02 05:56:58 scrappy Exp $ * */ -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "postgres.h" + +#include "commands/explain.h" +#include "lib/stringinfo.h" +#include "nodes/print.h" +#include "optimizer/planner.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 e7f047477ca..ca364da2565 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -7,36 +7,27 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.4 1999/05/25 16:08:24 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.4.2.1 1999/08/02 05:56:58 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for getrelid() */ -#include -#include -#include -#include + +#include "postgres.h" + +#include "access/genam.h" +#include "access/heapam.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 "commands/defrem.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/proclang.c b/src/backend/commands/proclang.c index 194333fbe97..21fde2af579 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -6,7 +6,6 @@ *------------------------------------------------------------------------- */ #include -#include #include "postgres.h" diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index 7ae4c2c176d..b10ca04338b 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.33 1999/05/25 16:08:25 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.33.2.1 1999/08/02 05:56:59 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -15,25 +15,15 @@ #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 "commands/defrem.h" -#include "fmgr.h" #include "miscadmin.h" #include "parser/parse_func.h" -#include "storage/bufmgr.h" #include "utils/acl.h" -#include "utils/builtins.h" #include "utils/syscache.h" -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif /* * RemoveOperator diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index 061534054a9..01e7ccef8a2 100644 --- a/src/backend/commands/rename.c +++ b/src/backend/commands/rename.c @@ -7,42 +7,22 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.25 1999/05/25 16:08:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.25.2.1 1999/08/02 05:56:59 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for find_all_inheritors */ -#ifndef NO_SECURITY -#include -#endif /* !NO_SECURITY */ -#ifndef HAVE_MEMMOVE -#include -#else -#include -#endif +#include "postgres.h" + +#include "access/heapam.h" +#include "catalog/catname.h" +#include "utils/syscache.h" +#include "catalog/heap.h" +#include "catalog/indexing.h" +#include "catalog/catalog.h" +#include "commands/rename.h" +#include "miscadmin.h" +#include "optimizer/prep.h" +#include "utils/acl.h" /* * 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 a6f18e01d3d..b7f959cd65e 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -5,21 +5,15 @@ * *------------------------------------------------------------------------- */ -#include -#include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "postgres.h" + +#include "access/heapam.h" +#include "commands/creatinh.h" +#include "commands/sequence.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 cc3d27599c1..55f67711c77 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -5,13 +5,11 @@ * *------------------------------------------------------------------------- */ -#include #include "postgres.h" + #include "access/genam.h" #include "access/heapam.h" -#include "access/valid.h" -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/catname.h" #include "catalog/indexing.h" @@ -19,21 +17,12 @@ #include "catalog/pg_proc.h" #include "catalog/pg_trigger.h" #include "commands/trigger.h" -#include "fmgr.h" -#include "nodes/memnodes.h" -#include "nodes/parsenodes.h" -#include "storage/lmgr.h" -#include "storage/bufmgr.h" -#include "utils/mcxt.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 57ac35fb1f4..a452a0c5864 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -5,33 +5,27 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: user.c,v 1.28 1999/05/25 16:08:27 momjian Exp $ + * $Id: user.c,v 1.28.2.1 1999/08/02 05:56:59 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include -#include #include #include #include #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "postgres.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 "miscadmin.h" +#include "tcop/tcopprot.h" +#include "utils/acl.h" +#include "utils/syscache.h" static void CheckPgUserAclNotNull(void); diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index b5fa699981b..593137a08a5 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,50 +7,38 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110 1999/07/03 00:32:40 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.110.2.1 1999/08/02 05:57:00 scrappy Exp $ * *------------------------------------------------------------------------- */ #include #include -#include #include #include #include #include "postgres.h" -#include "miscadmin.h" #include "access/genam.h" #include "access/heapam.h" -#include "access/transam.h" -#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/catname.h" #include "catalog/index.h" -#include "catalog/pg_class.h" -#include "catalog/pg_index.h" #include "catalog/pg_operator.h" #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" #include "commands/vacuum.h" -#include "fmgr.h" +#include "miscadmin.h" #include "parser/parse_oper.h" -#include "storage/bufmgr.h" -#include "storage/bufpage.h" -#include "storage/shmem.h" #include "storage/smgr.h" -#include "storage/itemptr.h" -#include "storage/lmgr.h" #include "utils/builtins.h" #include "utils/inval.h" -#include "utils/mcxt.h" #include "utils/portal.h" #include "utils/relcache.h" #include "utils/syscache.h" #ifndef HAVE_GETRUSAGE -#include +#include "rusagestub.h" #else #include #include @@ -1294,9 +1282,9 @@ vc_rpfheap(VRelStats *vacrelstats, Relation onerel, to_item = i; to_vpd = fraged_pages->vpl_pagedesc[to_item]; } - to_vpd->vpd_free -= DOUBLEALIGN(tlen); + to_vpd->vpd_free -= MAXALIGN(tlen); if (to_vpd->vpd_offsets_used >= to_vpd->vpd_offsets_free) - to_vpd->vpd_free -= DOUBLEALIGN(sizeof(ItemIdData)); + to_vpd->vpd_free -= MAXALIGN(sizeof(ItemIdData)); (to_vpd->vpd_offsets_used)++; if (free_vtmove == 0) { @@ -2802,7 +2790,7 @@ static bool vc_enough_space(VPageDescr vpd, Size len) { - len = DOUBLEALIGN(len); + len = MAXALIGN(len); if (len > vpd->vpd_free) return false; @@ -2812,7 +2800,7 @@ vc_enough_space(VPageDescr vpd, Size len) return true; /* and len <= free_space */ /* ok. noff_usd >= noff_free and so we'll have to allocate new itemid */ - if (len + DOUBLEALIGN(sizeof(ItemIdData)) <= vpd->vpd_free) + if (len + MAXALIGN(sizeof(ItemIdData)) <= vpd->vpd_free) return true; return false; diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 094bec33e83..5167115904c 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -2,24 +2,25 @@ * 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.23.2.1 1999/08/02 05:57:00 scrappy Exp $ * */ -#include -#include #include #include + #include "postgres.h" -#include "miscadmin.h" +#include "access/xact.h" #include "commands/variable.h" -#include "utils/builtins.h" +#include "miscadmin.h" #include "optimizer/internal.h" -#include "access/xact.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 1cea214613b..959a0e6eb00 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -5,28 +5,22 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: view.c,v 1.33 1999/05/25 16:08:28 momjian Exp $ + * $Id: view.c,v 1.33.2.1 1999/08/02 05:57:00 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "postgres.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" /*--------------------------------------------------------------------- * DefineVirtualRelation diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c index 8c9240b717a..2770ea95578 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.5 1999/02/13 23:16:04 momjian Exp $ + * $Id: geqo_copy.c,v 1.5.2.1 1999/08/02 05:57:04 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -33,21 +33,6 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.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 92fca945e89..f83898d4b5e 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.6 1999/02/13 23:16:05 momjian Exp $ +* $Id: geqo_cx.c,v 1.6.2.1 1999/08/02 05:57:04 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -35,22 +35,6 @@ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 f667b7208bf..e09d788f35c 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.11 1999/02/13 23:16:06 momjian Exp $ +* $Id: geqo_erx.c,v 1.11.2.1 1999/08/02 05:57:04 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -32,22 +32,6 @@ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 e572c656870..3431f9a69c8 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.39 1999/05/25 22:41:19 momjian Exp $ + * $Id: geqo_eval.c,v 1.39.2.1 1999/08/02 05:57:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,9 @@ =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ -#include "postgres.h" - #include + +#include "postgres.h" #ifdef HAVE_LIMITS_H #include #ifndef MAXINT @@ -30,24 +30,11 @@ #include #endif -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" -#include "utils/portal.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" #include "optimizer/cost.h" -#include "optimizer/tlist.h" -#include "optimizer/joininfo.h" - -#include "optimizer/geqo_gene.h" #include "optimizer/geqo.h" +#include "optimizer/paths.h" +#include "utils/portal.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 88bcce1ed7d..31808aadf54 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.16 1999/05/25 16:09:16 momjian Exp $ + * $Id: geqo_main.c,v 1.16.2.1 1999/08/02 05:57:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -22,28 +22,10 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/plannodes.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" #include "optimizer/geqo.h" +#include "optimizer/geqo_misc.h" #include "optimizer/geqo_pool.h" #include "optimizer/geqo_selection.h" -#include "optimizer/geqo_recombination.h" -#include "optimizer/geqo_mutation.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 206ec2567d2..0baad491f52 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.19 1999/05/25 22:41:20 momjian Exp $ + * $Id: geqo_misc.c,v 1.19.2.1 1999/08/02 05:57:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -19,26 +19,8 @@ */ -#include #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo_pool.h" -#include "optimizer/geqo_recombination.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 a68b416bd43..d144e6a9489 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.5 1999/02/13 23:16:09 momjian Exp $ +* $Id: geqo_mutation.c,v 1.5.2.1 1999/08/02 05:57:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -32,23 +32,8 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.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 12b9b0d9b36..1525203dee5 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.5 1999/02/13 23:16:10 momjian Exp $ +* $Id: geqo_ox1.c,v 1.5.2.1 1999/08/02 05:57:05 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -34,24 +34,8 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 c98e5f8c232..955feecab11 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.5 1999/02/13 23:16:10 momjian Exp $ +* $Id: geqo_ox2.c,v 1.5.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -34,24 +34,8 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 fb4356c30f1..555dbdd1064 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.17 1999/05/22 23:27:19 tgl Exp $ +* $Id: geqo_params.c,v 1.17.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,33 +18,25 @@ =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ -#include #include #include #include -#include #include "postgres.h" #include "miscadmin.h" - #include "nodes/pg_list.h" -#include "nodes/relation.h" #include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.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" + /* * Parameter values read from the config file (or defaulted) are stored here * by geqo_params(). diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index d8e32f49ce7..7acf1369836 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.5 1999/02/13 23:16:11 momjian Exp $ +* $Id: geqo_pmx.c,v 1.5.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -34,24 +34,8 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 c01073e614a..4be183b2c65 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.12 1999/05/25 16:09:18 momjian Exp $ + * $Id: geqo_pool.c,v 1.12.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -21,24 +21,9 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.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 beaa2cfb576..98249c2f1e2 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.6 1999/02/13 23:16:12 momjian Exp $ +* $Id: geqo_px.c,v 1.6.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -34,24 +34,8 @@ /*************************************************************/ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 1ee5029d551..b16f52b0c44 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.7 1999/02/13 23:16:12 momjian Exp $ +* $Id: geqo_recombination.c,v 1.7.2.1 1999/08/02 05:57:06 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -19,24 +19,8 @@ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.h" -#include "optimizer/geqo.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 b42e4450f28..9016150d4d0 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.7 1999/02/13 23:16:13 momjian Exp $ + * $Id: geqo_selection.c,v 1.7.2.1 1999/08/02 05:57:07 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -36,24 +36,9 @@ #include #include "postgres.h" - -#include "nodes/pg_list.h" -#include "nodes/relation.h" -#include "nodes/primnodes.h" - -#include "utils/palloc.h" -#include "utils/elog.h" - -#include "optimizer/internal.h" -#include "optimizer/paths.h" -#include "optimizer/pathnode.h" -#include "optimizer/clauses.h" -#include "optimizer/cost.h" - -#include "optimizer/geqo_gene.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 255602bcfab..fae79504de2 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.12 1999/05/25 22:41:22 momjian Exp $ +* $Header: /cvsroot/pgsql/src/backend/optimizer/geqo/Attic/minspantree.c,v 1.12.2.1 1999/08/02 05:57:07 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -16,20 +16,13 @@ #include "postgres.h" + #include "nodes/pg_list.h" -#include "nodes/relation.h" #include "nodes/primnodes.h" - -#include "utils/palloc.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