diff options
Diffstat (limited to 'src/include')
104 files changed, 156 insertions, 305 deletions
diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 383877e9ad..b1c31b2c66 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -16,12 +16,6 @@ #include <access/itup.h> #include <access/relscan.h> #include <access/sdir.h> -#include <storage/page.h> -#include <storage/block.h> -#include <utils/rel.h> -#include <storage/off.h> - -#include <fmgr.h> /* ** You can have as many strategies as you please in GiSTs, as diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index 4be3b676ca..d86036e9e1 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -12,9 +12,6 @@ #ifndef GISTSCAN_H #include <access/relscan.h> -#include <storage/off.h> -#include <storage/block.h> -#include <utils/rel.h> extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd, uint16 nkeys, ScanKey key); diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index 20ad45863f..77fc90b162 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -12,7 +12,6 @@ #ifndef GISTSTRAT_H #define GISTSTRAT_H -#include <access/strat.h> #include <utils/rel.h> extern StrategyNumber RelationGetGISTStrategy(Relation r, diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 685acee3f5..1157bf355a 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $ + * $Id: hash.h,v 1.25 1999/07/15 15:20:53 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -18,7 +18,6 @@ #include <access/sdir.h> #include <access/funcindex.h> -#include <storage/bufpage.h> #include <access/relscan.h> #include <access/itup.h> #include <utils/int8.h> diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 17f5f2aede..1071fa6d9c 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,20 +6,20 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.43 1999/07/10 22:06:26 tgl Exp $ + * $Id: heapam.h,v 1.44 1999/07/15 15:20:53 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef HEAPAM_H #define HEAPAM_H +#include <time.h> #include "access/tupmacs.h" #include "access/htup.h" #include "access/relscan.h" #include "storage/block.h" #include "utils/rel.h" #include "utils/tqual.h" -#include <time.h> /* ---------------------------------------------------------------- * heap access method statistics diff --git a/src/include/access/hio.h b/src/include/access/hio.h index bf5164b5e8..d94d959b7a 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $ + * $Id: hio.h,v 1.12 1999/07/15 15:20:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,8 +14,6 @@ #define HIO_H #include <access/htup.h> -#include <utils/rel.h> - extern void RelationPutHeapTuple(Relation relation, Buffer buffer, HeapTuple tuple); diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 3901e5f10f..507a17907f 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -1,4 +1,4 @@ -/*------------------------------------------------------------------------- + /*------------------------------------------------------------------------- * * htup.h * POSTGRES heap tuple definitions. @@ -6,17 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: htup.h,v 1.22 1999/07/12 13:32:38 momjian Exp $ + * $Id: htup.h,v 1.23 1999/07/15 15:20:54 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef HTUP_H #define HTUP_H -#include <utils/nabstime.h> #include <storage/bufpage.h> -#include <storage/itemptr.h> -#include <utils/memutils.h> #define MinHeapTupleBitmapSize 32 /* 8 * 4 */ diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 6f45129158..90ed45926a 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $ + * $Id: istrat.h,v 1.14 1999/07/15 15:20:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define ISTRAT_H #include <utils/rel.h> -#include <access/strat.h> /* * StrategyNumberIsValid diff --git a/src/include/access/itup.h b/src/include/access/itup.h index 85fc975e71..f89211029c 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.17 1999/02/13 23:20:55 momjian Exp $ + * $Id: itup.h,v 1.18 1999/07/15 15:20:54 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include <access/tupmacs.h> #include <access/tupdesc.h> #include <storage/itemptr.h> -#include <utils/memutils.h> #define MaxIndexAttributeNumber 7 diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index b4993ca3d2..9618e5fb72 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.27 1999/05/25 22:04:55 momjian Exp $ + * $Id: nbtree.h,v 1.28 1999/07/15 15:20:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,13 +15,8 @@ #include <access/sdir.h> #include <access/relscan.h> -#include <storage/itemid.h> -#include <storage/page.h> #include <access/funcindex.h> #include <access/itup.h> -#include <storage/bufmgr.h> /* don't remove, required by - * BT_READ/BT_WRITE */ -#include <storage/itemptr.h> /* * BTPageOpaqueData -- At the end of every page, we store a pointer diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 4481c575e6..fe8b03f40c 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -6,16 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $ + * $Id: relscan.h,v 1.16 1999/07/15 15:20:55 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RELSCAN_H #define RELSCAN_H -#include <storage/buf.h> -#include <utils/rel.h> -#include <access/htup.h> #include <utils/tqual.h> typedef ItemPointerData MarkData; diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 0cc2381b7d..d5d105ec3f 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.14 1999/02/13 23:20:57 momjian Exp $ + * $Id: rtree.h,v 1.15 1999/07/15 15:20:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,10 +17,6 @@ #include <access/itup.h> #include <access/relscan.h> #include <access/sdir.h> -#include <access/skey.h> -#include <access/strat.h> -#include <storage/block.h> -#include <storage/off.h> /* see rtstrat.c for what all this is about */ #define RTNStrategies 8 diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h index 31b77bba2b..fb3e090b6c 100644 --- a/src/include/access/rtstrat.h +++ b/src/include/access/rtstrat.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtstrat.h,v 1.9 1999/02/13 23:20:58 momjian Exp $ + * $Id: rtstrat.h,v 1.10 1999/07/15 15:20:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define RTSTRAT_H #include <utils/rel.h> -#include <access/attnum.h> extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index 3f2d6e8d96..baaf4bd0ac 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -6,13 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $ + * $Id: tupmacs.h,v 1.11 1999/07/15 15:20:56 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef TUPMACS_H #define TUPMACS_H +#include "utils/memutils.h" + /* * check to see if the ATT'th bit of an array of 8-bit bytes is set. */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index a855806c19..9f155200e2 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xact.h,v 1.20 1999/02/13 23:21:00 momjian Exp $ + * $Id: xact.h,v 1.21 1999/07/15 15:20:56 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef XACT_H #define XACT_H -#include <access/transam.h> #include <utils/nabstime.h> +#include <access/transam.h> /* ---------------- * transaction state structure diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 95cdf8845f..a43ffae1dd 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.16 1999/05/25 16:13:40 momjian Exp $ + * $Id: index.h,v 1.17 1999/07/15 15:20:58 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,9 +14,7 @@ #define INDEX_H #include <nodes/execnodes.h> -#include <nodes/parsenodes.h> #include <access/itup.h> -#include <access/funcindex.h> extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId); diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index f694b43a75..2ff93f6574 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: indexing.h,v 1.19 1999/02/13 23:21:03 momjian Exp $ + * $Id: indexing.h,v 1.20 1999/07/15 15:20:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #define INDEXING_H #include <access/htup.h> -#include <utils/rel.h> /* * Some definitions for indices on pg_attribute diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 61f40cbff3..bad0e1513d 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -6,14 +6,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.9 1999/07/14 01:20:12 momjian Exp $ + * $Id: dbcommands.h,v 1.10 1999/07/15 15:21:01 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef DBCOMMANDS_H #define DBCOMMANDS_H +#include <signal.h> #include "tcop/dest.h" + /* * Originally from tmp/daemon.h. The functions declared in daemon.h does not * exist; hence removed. -- AY 7/29/94 diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 89e13188ea..9b7fff0b24 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -9,11 +9,8 @@ #ifndef TRIGGER_H #define TRIGGER_H -#include "access/tupdesc.h" -#include "access/htup.h" #include "nodes/parsenodes.h" #include "nodes/execnodes.h" -#include "utils/rel.h" typedef uint32 TriggerEvent; diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index b456003f00..59a72bbb15 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: vacuum.h,v 1.21 1999/07/14 01:20:15 momjian Exp $ + * $Id: vacuum.h,v 1.22 1999/07/15 15:21:03 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,9 +18,7 @@ #include "catalog/pg_index.h" #include "catalog/pg_attribute.h" #include "nodes/pg_list.h" -#include "storage/block.h" #include "storage/itemptr.h" -#include "storage/off.h" typedef struct VAttListData diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h index be72695412..e7df6135d0 100644 --- a/src/include/executor/execFlatten.h +++ b/src/include/executor/execFlatten.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execFlatten.h,v 1.8 1999/02/13 23:21:22 momjian Exp $ + * $Id: execFlatten.h,v 1.9 1999/07/15 15:21:04 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include "nodes/relation.h" #include "nodes/execnodes.h" -#include "nodes/parsenodes.h" extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone); diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 14aacc8bd3..cd67bd3f32 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -6,13 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdebug.h,v 1.9 1999/07/14 01:20:16 momjian Exp $ + * $Id: execdebug.h,v 1.10 1999/07/15 15:21:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECDEBUG_H #define EXECDEBUG_H +#include <nodes/print.h> + /* ---------------------------------------------------------------- * debugging defines. * diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 43c1eb53cf..e979441a15 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -6,16 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.34 1999/06/17 15:15:53 momjian Exp $ + * $Id: executor.h,v 1.35 1999/07/15 15:21:06 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECUTOR_H #define EXECUTOR_H -#include <catalog/pg_index.h> -#include <storage/bufmgr.h> -#include <access/itup.h> #include <stdio.h> #include <executor/execdesc.h> diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 48a3d63fe3..4cc3a471c7 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: functions.h,v 1.9 1999/02/13 23:21:24 momjian Exp $ + * $Id: functions.h,v 1.10 1999/07/15 15:21:07 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef FUNCTIONS_H #define FUNCTIONS_H -#include "access/tupdesc.h" #include "nodes/parsenodes.h" -#include "nodes/primnodes.h" #include "utils/syscache.h" extern Datum ProjectAttribute(TupleDesc TD, TargetEntry *tlist, diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index e98c99d99f..724a7ddd31 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: hashjoin.h,v 1.13 1999/05/25 22:42:45 momjian Exp $ + * $Id: hashjoin.h,v 1.14 1999/07/15 15:21:08 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,8 +14,6 @@ #define HASHJOIN_H #include "access/htup.h" -#include "storage/fd.h" -#include "utils/mcxt.h" /* ---------------------------------------------------------------- * hash-join hash table structures diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 5462f31c64..7ee15e4748 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAgg.h,v 1.9 1999/02/13 23:21:24 momjian Exp $ + * $Id: nodeAgg.h,v 1.10 1999/07/15 15:21:09 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEAGG_H #define NODEAGG_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecAgg(Agg *node); diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 6bc6080654..34212d22df 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeAppend.h,v 1.10 1999/02/13 23:21:25 momjian Exp $ + * $Id: nodeAppend.h,v 1.11 1999/07/15 15:21:10 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEAPPEND_H #define NODEAPPEND_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent); diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 9be307b2a2..ee740efcd8 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeGroup.h,v 1.11 1999/07/13 21:17:37 momjian Exp $ + * $Id: nodeGroup.h,v 1.12 1999/07/15 15:21:11 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEGROUP_H #define NODEGROUP_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecGroup(Group *node); diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 4544d6416e..605ab0b126 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -6,19 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHash.h,v 1.13 1999/05/25 16:13:55 momjian Exp $ + * $Id: nodeHash.h,v 1.14 1999/07/15 15:21:11 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEHASH_H #define NODEHASH_H -#include "executor/hashjoin.h" -#include "executor/tuptable.h" -#include "nodes/execnodes.h" -#include "nodes/pg_list.h" #include "nodes/plannodes.h" -#include "utils/syscache.h" extern TupleTableSlot *ExecHash(Hash *node); extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 336e9b4d1f..2061ac7bdc 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.14 1999/05/25 22:42:46 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.15 1999/07/15 15:21:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,8 +14,6 @@ #define NODEHASHJOIN_H #include "nodes/plannodes.h" -#include "nodes/execnodes.h" -#include "utils/syscache.h" extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 2d959a8ca8..d8b284f8d5 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeIndexscan.h,v 1.8 1999/02/13 23:21:26 momjian Exp $ + * $Id: nodeIndexscan.h,v 1.9 1999/07/15 15:21:12 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEINDEXSCAN_H #define NODEINDEXSCAN_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecIndexScan(IndexScan *node); diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index fddc4d1edb..f10b252c1c 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMaterial.h,v 1.10 1999/02/21 03:49:44 scrappy Exp $ + * $Id: nodeMaterial.h,v 1.11 1999/07/15 15:21:13 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMATERIAL_H #define NODEMATERIAL_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecMaterial(Material *node); diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 779408df65..27078d5a39 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeMergejoin.h,v 1.10 1999/02/13 23:21:26 momjian Exp $ + * $Id: nodeMergejoin.h,v 1.11 1999/07/15 15:21:13 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEMERGEJOIN_H #define NODEMERGEJOIN_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecMergeJoin(MergeJoin *node); diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 7a70189672..f0a11d0100 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeNestloop.h,v 1.10 1999/05/25 16:13:56 momjian Exp $ + * $Id: nodeNestloop.h,v 1.11 1999/07/15 15:21:13 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODENESTLOOP_H #define NODENESTLOOP_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent); diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index c5ad4ea715..506e6e580d 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeResult.h,v 1.8 1999/02/13 23:21:27 momjian Exp $ + * $Id: nodeResult.h,v 1.9 1999/07/15 15:21:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODERESULT_H #define NODERESULT_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecResult(Result *node); diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index d858678471..a2358c4aa6 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSeqscan.h,v 1.8 1999/02/13 23:21:28 momjian Exp $ + * $Id: nodeSeqscan.h,v 1.9 1999/07/15 15:21:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESEQSCAN_H #define NODESEQSCAN_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecSeqScan(SeqScan *node); diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index 590f49dfd2..a8c8f99c62 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSort.h,v 1.8 1999/02/13 23:21:28 momjian Exp $ + * $Id: nodeSort.h,v 1.9 1999/07/15 15:21:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODESORT_H #define NODESORT_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecSort(Sort *node); diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index b74fbc00af..98251c2487 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,8 +7,6 @@ #ifndef NODESUBPLAN_H #define NODESUBPLAN_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext); diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index cece9f3f93..f5355b5d32 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeUnique.h,v 1.8 1999/02/13 23:21:29 momjian Exp $ + * $Id: nodeUnique.h,v 1.9 1999/07/15 15:21:14 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEUNIQUE_H #define NODEUNIQUE_H -#include "executor/tuptable.h" -#include "nodes/execnodes.h" #include "nodes/plannodes.h" extern TupleTableSlot *ExecUnique(Unique *node); diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index ea9bda89b8..80af87f16a 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -10,6 +10,11 @@ #include <string.h> #include "postgres.h" + +/* + * These are not needed by this file, but used by other programs + * using SPI + */ #include "nodes/primnodes.h" #include "nodes/relation.h" #include "nodes/execnodes.h" @@ -23,10 +28,7 @@ #include "nodes/params.h" #include "utils/fcache.h" #include "utils/datum.h" -#include "utils/elog.h" -#include "utils/palloc.h" #include "utils/syscache.h" -#include "utils/mcxt.h" #include "utils/portal.h" #include "utils/builtins.h" #include "catalog/pg_language.h" diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index 3e7988aa09..916d7141d2 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -3,7 +3,7 @@ * spi.c * Server Programming Interface private declarations * - * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.5 1999/07/14 01:20:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.6 1999/07/15 15:21:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -11,8 +11,6 @@ #define SPI_PRIV_H #include "executor/spi.h" -#include "catalog/pg_type.h" -#include "access/printtup.h" typedef struct { diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index de582ba387..ad6390fa20 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tuptable.h,v 1.12 1999/05/25 16:13:58 momjian Exp $ + * $Id: tuptable.h,v 1.13 1999/07/15 15:21:14 momjian Exp $ * * NOTES * The tuple table interface is getting pretty ugly. @@ -17,8 +17,6 @@ #ifndef TUPTABLE_H #define TUPTABLE_H -#include <storage/buf.h> -#include <access/tupdesc.h> #include <access/htup.h> /* ---------------- diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 7eda4e4e57..fe979ebdd5 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.14 1999/02/13 23:21:35 momjian Exp $ + * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include <stdio.h> #include <sys/types.h> -#include "libpq/pqcomm.h" #include "libpq/hba.h" diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index d9d1a95523..f4086c1137 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: libpq.h,v 1.31 1999/07/07 17:17:50 momjian Exp $ + * $Id: libpq.h,v 1.32 1999/07/15 15:21:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,7 +19,7 @@ #include "libpq/libpq-be.h" #include "tcop/dest.h" - +#include "utils/exc.h" /* ---------------- * PQArgBlock diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 4daf7179cf..c7289e2390 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -5,14 +5,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pqformat.h,v 1.4 1999/05/25 16:14:01 momjian Exp $ + * $Id: pqformat.h,v 1.5 1999/07/15 15:21:16 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PQFORMAT_H #define PQFORMAT_H -#include "postgres.h" #include "lib/stringinfo.h" #define pq_beginmessage(buf) initStringInfo(buf) diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 21114d2455..ca324c94b1 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $ + * $Id: execnodes.h,v 1.31 1999/07/15 15:21:16 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECNODES_H #define EXECNODES_H -#include <nodes/memnodes.h> #include <nodes/primnodes.h> #include <executor/hashjoin.h> #include <access/relscan.h> diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 4cc34024a7..7ea2e7e142 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $ + * $Id: makefuncs.h,v 1.19 1999/07/15 15:21:16 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef MAKEFUNC_H #define MAKEFUNC_H -#include <nodes/primnodes.h> #include <nodes/parsenodes.h> -#include <utils/fcache.h> extern Oper *makeOper(Oid opno, Oid opid, diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index da59725063..528924ad41 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodeFuncs.h,v 1.8 1999/02/13 23:21:38 momjian Exp $ + * $Id: nodeFuncs.h,v 1.9 1999/07/15 15:21:17 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NODEFUNCS_H #define NODEFUNCS_H -#include <nodes/nodes.h> #include <nodes/primnodes.h> extern bool single_node(Node *node); diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 8415069f0f..322987c447 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: nodes.h,v 1.49 1999/05/26 12:56:33 momjian Exp $ + * $Id: nodes.h,v 1.50 1999/07/15 15:21:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -262,13 +262,7 @@ typedef struct Node */ extern Node *newNode(Size size, NodeTag tag); -/* - * nodes/{outfuncs.c,print.c} - */ -#define nodeDisplay pprint - extern char *nodeToString(void *obj); -extern void print(void *obj); /* * nodes/{readfuncs.c,read.c} diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 708394e0e1..8d5292e740 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -6,18 +6,20 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: print.h,v 1.10 1999/02/13 23:21:41 momjian Exp $ + * $Id: print.h,v 1.11 1999/07/15 15:21:18 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PRINT_H #define PRINT_H -#include "nodes/nodes.h" -#include "nodes/plannodes.h" #include "nodes/parsenodes.h" -#include "nodes/relation.h" -#include "executor/tuptable.h" +#include "nodes/plannodes.h" + +/* + * nodes/{outfuncs.c,print.c} + */ +#define nodeDisplay pprint extern void print(void *obj); extern void pprint(void *obj); diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 5f629dd0e6..c5d7d30840 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $ + * $Id: relation.h,v 1.33 1999/07/15 15:21:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define RELATION_H #include <nodes/parsenodes.h> -#include <nodes/primnodes.h> /* * Relids diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h index 41414dba4d..d925be5630 100644 --- a/src/include/optimizer/xfunc.h +++ b/src/include/optimizer/_deadcode/xfunc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $ + * $Id: xfunc.h,v 1.1 1999/07/15 15:21:24 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,12 +33,6 @@ extern int XfuncMode; /* defined in tcop/postgres.c */ -/* defaults for function attributes used for expensive function calculations */ -#define BYTE_PCT 100 -#define PERBYTE_CPU 0 -#define PERCALL_CPU 0 -#define OUTIN_RATIO 100 - /* default width assumed for variable length attributes */ #define VARLEN_DEFAULT 128; diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 3cd74b1e25..1416cc2545 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: clauses.h,v 1.19 1999/06/19 03:41:44 tgl Exp $ + * $Id: clauses.h,v 1.20 1999/07/15 15:21:19 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef CLAUSES_H #define CLAUSES_H -#include <nodes/primnodes.h> #include <nodes/relation.h> extern Expr *make_clause(int type, Node *oper, List *args); diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index e7f8452f24..b9fc710370 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -6,18 +6,21 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $ + * $Id: cost.h,v 1.21 1999/07/15 15:21:20 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef COST_H #define COST_H -#include "nodes/nodes.h" -#include "nodes/parsenodes.h" -#include "nodes/pg_list.h" #include "nodes/relation.h" +/* defaults for function attributes used for expensive function calculations */ +#define BYTE_PCT 100 +#define PERBYTE_CPU 0 +#define PERCALL_CPU 0 +#define OUTIN_RATIO 100 + /* * prototypes for costsize.c * routines to compute costs and sizes diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index f02510e21e..1558bd6a99 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $ + * $Id: geqo.h,v 1.17 1999/07/15 15:21:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,8 +21,6 @@ #ifndef GEQO_H #define GEQO_H -#include "nodes/nodes.h" -#include "nodes/parsenodes.h" #include "nodes/relation.h" #include "optimizer/geqo_gene.h" diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 00b5b9385e..d8d4e8ff56 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_gene.h,v 1.7 1999/02/13 23:21:45 momjian Exp $ + * $Id: geqo_gene.h,v 1.8 1999/07/15 15:21:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,8 +23,6 @@ #define GEQO_GENE_H #include "nodes/nodes.h" -#include "nodes/relation.h" -#include "optimizer/geqo_gene.h" /* we presume that int instead of Relid is o.k. for Gene; so don't change it! */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 9fadc318d4..abb6398a70 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $ + * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,9 +23,8 @@ #include <stdio.h> -#include "nodes/parsenodes.h" -#include "optimizer/geqo_gene.h" #include "optimizer/geqo_recombination.h" +#include "nodes/relation.h" extern void print_pool(FILE *fp, Pool *pool, int start, int stop); extern void print_gen(FILE *fp, Pool *pool, int generation); diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index f8e047c888..3d6f2aa7df 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -5,7 +5,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: geqo_pool.h,v 1.7 1999/02/13 23:21:47 momjian Exp $ + * $Id: geqo_pool.h,v 1.8 1999/07/15 15:21:21 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ #define GEQO_POOL_H #include "optimizer/geqo_gene.h" +#include "nodes/parsenodes.h" extern Pool *alloc_pool(int pool_size, int string_length); extern void free_pool(Pool *pool); diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h index 3812d421f9..faa573bbe7 100644 --- a/src/include/optimizer/internal.h +++ b/src/include/optimizer/internal.h @@ -6,13 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: internal.h,v 1.21 1999/07/07 09:27:28 momjian Exp $ + * $Id: internal.h,v 1.22 1999/07/15 15:21:21 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef INTERNAL_H #define INTERNAL_H +#include "catalog/pg_index.h" + /* * ---------- SHARED MACROS * diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 3a4451dd35..ac72326184 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $ + * $Id: joininfo.h,v 1.13 1999/07/15 15:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef JOININFO_H #define JOININFO_H -#include "nodes/nodes.h" #include "nodes/relation.h" -#include "nodes/primnodes.h" extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list); extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids); diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h index 423b8e4216..67910c283f 100644 --- a/src/include/optimizer/keys.h +++ b/src/include/optimizer/keys.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $ + * $Id: keys.h,v 1.16 1999/07/15 15:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef KEYS_H #define KEYS_H -#include "nodes/nodes.h" #include "nodes/relation.h" extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel); diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index d7019fc446..0860ab7f18 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $ + * $Id: pathnode.h,v 1.18 1999/07/15 15:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PATHNODE_H #define PATHNODE_H -#include "nodes/nodes.h" #include "nodes/relation.h" -#include "nodes/parsenodes.h" /* * prototypes for pathnode.c diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index ee39919245..a26085d05e 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -7,15 +7,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: paths.h,v 1.30 1999/05/26 12:56:35 momjian Exp $ + * $Id: paths.h,v 1.31 1999/07/15 15:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PATHS_H #define PATHS_H -#include "nodes/nodes.h" -#include "nodes/parsenodes.h" #include "nodes/relation.h" /* diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 96bf3ebfc1..9e37617446 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -6,16 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: planmain.h,v 1.28 1999/06/06 17:38:09 tgl Exp $ + * $Id: planmain.h,v 1.29 1999/07/15 15:21:22 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PLANMAIN_H #define PLANMAIN_H -#include "nodes/nodes.h" #include "nodes/plannodes.h" -#include "nodes/parsenodes.h" #include "nodes/relation.h" /* diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 6bad60b6ad..a8f85001e6 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: planner.h,v 1.11 1999/05/13 07:29:11 tgl Exp $ + * $Id: planner.h,v 1.12 1999/07/15 15:21:23 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,7 +18,6 @@ #include "nodes/parsenodes.h" #include "nodes/plannodes.h" -#include "parser/parse_node.h" extern Plan *planner(Query *parse); extern Plan *union_planner(Query *parse); diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 0d1e741bc2..2f5c4dca20 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $ + * $Id: restrictinfo.h,v 1.5 1999/07/15 15:21:23 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RESTRICTINFO_H #define RESTRICTINFO_H -#include "nodes/pg_list.h" #include "nodes/relation.h" extern bool valid_or_clause(RestrictInfo *restrictinfo); diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index 5e9e16e51d..d4970e4848 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -7,7 +7,6 @@ #ifndef SUBSELECT_H #define SUBSELECT_H -#include "nodes/pg_list.h" #include "nodes/plannodes.h" extern int PlannerQueryLevel; /* level of current query */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index de57eb59dd..860b077de2 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $ + * $Id: tlist.h,v 1.19 1999/07/15 15:21:23 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef TLIST_H #define TLIST_H -#include "nodes/nodes.h" -#include "nodes/parsenodes.h" #include "nodes/relation.h" extern TargetEntry *tlistentry_member(Var *var, List *targetlist); diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index e903025bed..16f9f4f663 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: var.h,v 1.7 1999/02/13 23:21:54 momjian Exp $ + * $Id: var.h,v 1.8 1999/07/15 15:21:23 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef VAR_H #define VAR_H -#include "nodes/nodes.h" #include "nodes/primnodes.h" extern List *pull_varnos(Node *me); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 0801592882..64a6e3a65e 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,16 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.10 1999/05/25 22:43:16 momjian Exp $ + * $Id: parse_agg.h,v 1.11 1999/07/15 15:21:25 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_AGG_H #define PARSE_AGG_H -#include <nodes/nodes.h> -#include <nodes/parsenodes.h> -#include <nodes/primnodes.h> #include <parser/parse_node.h> extern void AddAggToParseState(ParseState *pstate, Aggref *aggref); diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index 82cac2e233..2b3dddad5c 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -6,17 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_clause.h,v 1.9 1999/05/26 12:56:41 momjian Exp $ + * $Id: parse_clause.h,v 1.10 1999/07/15 15:21:25 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_CLAUSE_H #define PARSE_CLAUSE_H -#include <nodes/pg_list.h> -#include <nodes/nodes.h> -#include <nodes/parsenodes.h> -#include <nodes/primnodes.h> #include <parser/parse_node.h> extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList, Node **qual); diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index a8ce037d59..5976421735 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -6,15 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_coerce.h,v 1.13 1999/07/14 01:20:25 momjian Exp $ + * $Id: parse_coerce.h,v 1.14 1999/07/15 15:21:26 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_COERCE_H #define PARSE_COERCE_H -#include "nodes/pg_list.h" #include "parser/parse_node.h" +#include "catalog/pg_type.h" typedef enum CATEGORY { diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 285b00f3f7..0913ce3bba 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,17 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.11 1999/05/26 12:56:41 momjian Exp $ + * $Id: parse_expr.h,v 1.12 1999/07/15 15:21:26 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_EXPR_H #define PARSE_EXPR_H -#include <nodes/nodes.h> -#include <nodes/parsenodes.h> -#include <nodes/primnodes.h> #include <parser/parse_node.h> +#include "parser/parse_type.h" extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence); extern Oid exprType(Node *expr); diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index d3441a0ce8..de3487183a 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -6,18 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.16 1999/06/17 22:21:40 tgl Exp $ + * $Id: parse_func.h,v 1.17 1999/07/15 15:21:26 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSER_FUNC_H #define PARSER_FUNC_H -#include <nodes/nodes.h> -#include <nodes/pg_list.h> -#include <nodes/parsenodes.h> -#include <nodes/primnodes.h> -#include <parser/parse_func.h> #include <parser/parse_node.h> diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 9bc4cf2b13..5a56b5fb75 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -5,18 +5,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_node.h,v 1.12 1999/05/13 07:29:19 tgl Exp $ + * $Id: parse_node.h,v 1.13 1999/07/15 15:21:27 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_NODE_H #define PARSE_NODE_H -#include <nodes/nodes.h> -#include <nodes/pg_list.h> -#include <nodes/primnodes.h> #include <nodes/parsenodes.h> -#include <parser/parse_type.h> #include <utils/rel.h> /* state information used during parse analysis */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index 0c54a55326..82e241ef87 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -6,15 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_oper.h,v 1.7 1999/02/13 23:21:57 momjian Exp $ + * $Id: parse_oper.h,v 1.8 1999/07/15 15:21:27 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_OPER_H #define PARSE_OPER_H -#include <parser/parse_func.h> -#include <parser/parse_node.h> +#include "access/htup.h" typedef HeapTuple Operator; diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 5240dcc28d..12c47636b6 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -6,19 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.9 1999/02/13 23:21:57 momjian Exp $ + * $Id: parse_relation.h,v 1.10 1999/07/15 15:21:27 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_QUERY_H #define PARSE_RANGE_H -#include <nodes/nodes.h> -#include <nodes/parsenodes.h> -#include <nodes/pg_list.h> -#include <nodes/primnodes.h> #include <parser/parse_node.h> -#include <utils/rel.h> extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname); extern int refnameRangeTablePosn(ParseState *pstate, diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 2a70b5dde3..d54ce32d83 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -6,17 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_target.h,v 1.12 1999/05/17 17:03:46 momjian Exp $ + * $Id: parse_target.h,v 1.13 1999/07/15 15:21:27 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSE_TARGET_H #define PARSE_TARGET_H -#include <nodes/pg_list.h> -#include <nodes/nodes.h> -#include <nodes/parsenodes.h> -#include <nodes/primnodes.h> #include <parser/parse_node.h> #define EXPR_COLUMN_FIRST 1 diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index a28520ff93..1f6767d662 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -7,13 +7,16 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parsetree.h,v 1.6 1999/02/13 23:21:57 momjian Exp $ + * $Id: parsetree.h,v 1.7 1999/07/15 15:21:28 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef PARSETREE_H #define PARSETREE_H /* include once only */ +#include "nodes/parsenodes.h" +#include "nodes/pg_list.h" + /* ---------------- * need pg_list.h for definitions of CAR(), etc. macros * ---------------- diff --git a/src/include/postgres.h b/src/include/postgres.h index 051d65cec0..63640e53db 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -6,7 +6,7 @@ * * Copyright (c) 1995, Regents of the University of California * - * $Id: postgres.h,v 1.23 1999/06/10 22:59:22 momjian Exp $ + * $Id: postgres.h,v 1.24 1999/07/15 15:20:47 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -40,8 +40,9 @@ #include "config.h" #endif #include "c.h" -#include "utils/elog.h" #include "utils/palloc.h" +#include "utils/mcxt.h" +#include "utils/elog.h" /* ---------------------------------------------------------------- * Section 1: simple type definitions diff --git a/src/include/rewrite/locks.h b/src/include/rewrite/locks.h index 7527d0f5b6..69740a86eb 100644 --- a/src/include/rewrite/locks.h +++ b/src/include/rewrite/locks.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: locks.h,v 1.11 1999/02/13 23:21:59 momjian Exp $ + * $Id: locks.h,v 1.12 1999/07/15 15:21:29 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LOCKS_H #define LOCKS_H -#include "nodes/nodes.h" #include "nodes/parsenodes.h" #include "rewrite/prs2lock.h" diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index 2b5caebba4..6a59f8f224 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteHandler.h,v 1.10 1999/05/26 12:56:48 momjian Exp $ + * $Id: rewriteHandler.h,v 1.11 1999/07/15 15:21:30 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef REWRITEHANDLER_H #define REWRITEHANDLER_H -#include "nodes/nodes.h" #include "nodes/parsenodes.h" struct _rewrite_meta_knowledge diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 389676daba..273b2fd499 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -6,15 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rewriteManip.h,v 1.16 1999/05/26 12:56:50 momjian Exp $ + * $Id: rewriteManip.h,v 1.17 1999/07/15 15:21:30 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef REWRITEMANIP_H #define REWRITEMANIP_H -#include "nodes/nodes.h" -#include "nodes/parsenodes.h" #include "rewrite/rewriteHandler.h" /* RewriteManip.c */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 55b735a6a9..a0d08a2d78 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.26 1999/05/25 16:14:39 momjian Exp $ + * $Id: bufmgr.h,v 1.27 1999/07/15 15:21:31 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,17 +54,6 @@ typedef bits16 BufferLock; */ #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1) -/* - * BufferIsPinned - * True iff the buffer is pinned (and therefore valid) - * - * Note: - * Smenatics are identical to BufferIsValid - * XXX - need to remove either one eventually. - */ -#define BufferIsPinned BufferIsValid - - extern int ShowPinTrace; /* @@ -101,6 +90,17 @@ extern int ShowPinTrace; ) \ ) +/* + * BufferIsPinned + * True iff the buffer is pinned (and therefore valid) + * + * Note: + * Smenatics are identical to BufferIsValid + * XXX - need to remove either one eventually. + */ +#define BufferIsPinned BufferIsValid + + #define IncrBufferRefCount(buffer) \ ( \ BufferIsLocal(buffer) ? \ diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 74729eaddc..6921f97a08 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: bufpage.h,v 1.23 1999/07/03 00:32:59 momjian Exp $ + * $Id: bufpage.h,v 1.24 1999/07/15 15:21:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include <storage/item.h> #include <storage/buf.h> #include <storage/page.h> +#include <storage/bufmgr.h> /* * a postgres disk page is an abstraction layered on top of a postgres diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 6027785fab..c7e649f19c 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $ + * $Id: lmgr.h,v 1.21 1999/07/15 15:21:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #include <storage/lock.h> #include <utils/rel.h> -#include <catalog/catname.h> #define AccessShareLock 1 /* SELECT */ #define RowShareLock 2 /* SELECT FOR UPDATE */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index 63a3e1b54c..e05ceae862 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -6,13 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $ + * $Id: off.h,v 1.8 1999/07/15 15:21:33 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef OFF_H #define OFF_H +#include "storage/itemid.h" /* * OffsetNumber: * diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 91d85c68c5..700e6afe5f 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -6,13 +6,15 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $ + * $Id: pos.h,v 1.8 1999/07/15 15:21:35 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef POS_H #define POS_H +#include "storage/off.h" + /* * a 'position' used to be <pagenumber, offset> in postgres. this has * been changed to just <offset> as the notion of having multiple pages diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index f46f9b3248..a694d435c7 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -44,7 +44,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $ + * $Id: dest.h,v 1.21 1999/07/15 15:21:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -52,7 +52,6 @@ #define DEST_H #include <access/htup.h> -#include <access/tupdesc.h> /* ---------------- * CommandDest is a simplistic means of identifying the desired diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 95e68fdf07..c0270b3a12 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: acl.h,v 1.20 1999/07/09 03:28:53 momjian Exp $ + * $Id: acl.h,v 1.21 1999/07/15 15:21:38 momjian Exp $ * * NOTES * For backward-compatability purposes we have to allow there @@ -24,6 +24,7 @@ #include <nodes/parsenodes.h> #include <utils/array.h> +#include "utils/memutils.h" /* * AclId system identifier for the user, group, etc. diff --git a/src/include/utils/array.h b/src/include/utils/array.h index e6c8c6c311..ed4705184d 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -10,7 +10,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: array.h,v 1.18 1999/05/25 16:14:49 momjian Exp $ + * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $ * * NOTES * XXX the data array should be LONGALIGN'd -- notice that the array @@ -23,6 +23,7 @@ #define ARRAY_H #include <stdio.h> +#include "utils/memutils.h" typedef struct { @@ -97,11 +98,7 @@ typedef struct *------------------------------------------------------------------------ */ -/* #if defined(irix5) */ -/* #define RETURN_NULL {*isNull = true; return(0); }*/ - /* #else *//* irix5 */ #define RETURN_NULL {*isNull = true; return(0); } - /* #endif *//* irix5 */ #define NAME_LEN 30 #define MAX_BUFF_SIZE BLCKSZ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 1d8044ca54..f653068e20 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.81 1999/05/26 12:57:03 momjian Exp $ + * $Id: builtins.h,v 1.82 1999/07/15 15:21:39 momjian Exp $ * * NOTES * This should normally only be included by fmgr.h. @@ -28,9 +28,7 @@ #include <utils/datetime.h> #include <utils/nabstime.h> #include <utils/int8.h> -#include <utils/cash.h> #include <utils/inet.h> -#include <utils/rel.h> #include <utils/numeric.h> /* diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 5f583aded3..601e59596a 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.16 1999/07/14 01:20:26 momjian Exp $ + * $Id: catcache.h,v 1.17 1999/07/15 15:21:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,9 +17,6 @@ #include <access/htup.h> #include <lib/dllist.h> -#include <nodes/memnodes.h> -#include <utils/rel.h> -#include <utils/mcxt.h> /* * struct catctup: tuples in the cache. diff --git a/src/include/utils/dt.h b/src/include/utils/dt.h index d217c8aa87..de6d81aafa 100644 --- a/src/include/utils/dt.h +++ b/src/include/utils/dt.h @@ -8,7 +8,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dt.h,v 1.40 1999/05/25 16:14:53 momjian Exp $ + * $Id: dt.h,v 1.41 1999/07/15 15:21:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include <time.h> #include <math.h> +#include <limits.h> /* * DateTime represents absolute time. diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index e2dbf4c59f..601c023387 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dynamic_loader.h,v 1.10 1999/02/13 23:22:18 momjian Exp $ + * $Id: dynamic_loader.h,v 1.11 1999/07/15 15:21:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include <sys/types.h> #include <sys/param.h> /* For MAXPATHLEN */ +/* we need this include because port files use them */ #include <postgres.h> #ifdef MIN diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index 321c5deaf2..3ee354df11 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: inval.h,v 1.11 1999/02/13 23:22:23 momjian Exp $ + * $Id: inval.h,v 1.12 1999/07/15 15:21:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define INVAL_H #include <access/htup.h> -#include <utils/rel.h> extern void InitLocalInvalidateData(void); diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h index 981c368345..71154579f5 100644 --- a/src/include/utils/lselect.h +++ b/src/include/utils/lselect.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lselect.h,v 1.12 1999/02/13 23:22:24 momjian Exp $ + * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,9 +15,6 @@ #include <stdio.h> -#include "access/skey.h" -#include "access/tupdesc.h" -#include "access/htup.h" #include "utils/syscache.h" struct leftist diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index e88f004004..6a985ac8c7 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,14 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: lsyscache.h,v 1.16 1999/02/13 23:22:24 momjian Exp $ + * $Id: lsyscache.h,v 1.17 1999/07/15 15:21:41 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef LSYSCACHE_H #define LSYSCACHE_H -#include <access/attnum.h> #include <access/htup.h> extern bool op_class(Oid oprno, int32 opclass, Oid amopid); diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 754d023d2e..7a3d12f605 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -15,7 +15,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.29 1999/07/14 01:20:29 momjian Exp $ + * $Id: memutils.h,v 1.30 1999/07/15 15:21:41 momjian Exp $ * * NOTES * some of the information in this file will be moved to @@ -30,7 +30,6 @@ * This is not needed by this include file, but by almost every file * that includes this file. */ -#include "utils/mcxt.h" /* ---------------- * Alignment macros: align a length or address appropriately for a given type. diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 61e6976766..07186589a9 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: portal.h,v 1.15 1999/06/12 14:07:32 momjian Exp $ + * $Id: portal.h,v 1.16 1999/07/15 15:21:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,9 +26,7 @@ #define PORTAL_H #include <executor/execdesc.h> -#include <lib/fstack.h> #include <nodes/memnodes.h> -#include <utils/memutils.h> typedef struct PortalBlockData { diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h index b9590cef61..c3e0295302 100644 --- a/src/include/utils/psort.h +++ b/src/include/utils/psort.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: psort.h,v 1.19 1999/05/25 16:14:57 momjian Exp $ + * $Id: psort.h,v 1.20 1999/07/15 15:21:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,6 @@ typedef struct Psortstate } Psortstate; #ifdef EBUG -#include "utils/elog.h" #include "storage/buf.h" #include "storage/bufmgr.h" diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index c6863746d1..22949b4434 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -6,17 +6,14 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: syscache.h,v 1.13 1999/02/13 23:22:32 momjian Exp $ + * $Id: syscache.h,v 1.14 1999/07/15 15:21:43 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef SYSCACHE_H #define SYSCACHE_H -#include <access/attnum.h> #include <access/htup.h> -#include <storage/buf.h> -#include <utils/rel.h> /* #define CACHEDEBUG *//* turns DEBUG elogs on */ diff --git a/src/include/utils/temprel.h b/src/include/utils/temprel.h index 1b83223510..ecfa17985e 100644 --- a/src/include/utils/temprel.h +++ b/src/include/utils/temprel.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: temprel.h,v 1.3 1999/05/25 16:14:57 momjian Exp $ + * $Id: temprel.h,v 1.4 1999/07/15 15:21:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define TEMPREL_H #include "access/htup.h" -#include "access/attnum.h" void create_temp_relation(char *relname, HeapTuple pg_class_tuple); void remove_all_temp_relations(void); diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 1bec1aff7b..acb3284c9a 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: tqual.h,v 1.22 1999/05/25 22:43:39 momjian Exp $ + * $Id: tqual.h,v 1.23 1999/07/15 15:21:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,6 +15,7 @@ #define TQUAL_H #include <access/htup.h> +#include <access/xact.h> typedef struct SnapshotData { |