Cleanup up include files.

src/include/optimizer/clauseinfo.h

@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauseinfo.h,v 1.4 1997/09/08 21:53:03 momjian Exp $
+ * $Id: clauseinfo.h,v 1.5 1997/11/26 01:13:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CLAUSEINFO_H
 #define CLAUSEINFO_H
 
+#include "nodes/pg_list.h"
+#include "nodes/relation.h"
+
 extern bool valid_or_clause(CInfo *clauseinfo);
 extern List *get_actual_clauses(List *clauseinfo_list);
 extern void

src/include/optimizer/cost.h

@@ -6,13 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.5 1997/09/08 21:53:09 momjian Exp $
+ * $Id: cost.h,v 1.6 1997/11/26 01:13:16 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"
+
 /*
  * prototypes for costsize.c--
  *	  routines to compute costs and sizes

src/include/optimizer/geqo.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.6 1997/09/08 21:53:10 momjian Exp $
+ * $Id: geqo.h,v 1.7 1997/11/26 01:13:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,10 @@
 #ifndef GEQO_H
 #define GEQO_H
 
+#include "nodes/nodes.h"
+#include "nodes/parsenodes.h"
+#include "nodes/relation.h"
+#include "optimizer/geqo_gene.h"
 
 /* GEQO debug flag */
 /*

src/include/optimizer/geqo_copy.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.h,v 1.4 1997/09/08 21:53:10 momjian Exp $
+ * $Id: geqo_copy.h,v 1.5 1997/11/26 01:13:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #ifndef GEQO_COPY_H
 #define GEQO_COPY_H
 
+#include "optimizer/geqo_gene.h"
 
 extern void geqo_copy(Chromosome *chromo1, Chromosome *chromo2, int string_length);
 

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.4 1997/09/08 21:53:11 momjian Exp $
+ * $Id: geqo_gene.h,v 1.5 1997/11/26 01:13:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,13 @@
 #ifndef GEQO_GENE_H
 #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! */
-typedef
-int Gene;
+typedef int Gene;
 
 typedef struct Chromosome
 {

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.4 1997/09/08 21:53:13 momjian Exp $
+ * $Id: geqo_misc.h,v 1.5 1997/11/26 01:13:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,10 @@
 
 #include <stdio.h>
 
+#include "nodes/parsenodes.h"
+#include "optimizer/geqo_gene.h"
+#include "optimizer/geqo_recombination.h"
+
 extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
 extern void print_gen(FILE *fp, Pool *pool, int generation);
 extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene);

src/include/optimizer/geqo_mutation.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_mutation.h,v 1.4 1997/09/08 21:53:13 momjian Exp $
+ * $Id: geqo_mutation.h,v 1.5 1997/11/26 01:13:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,6 +21,7 @@
 #ifndef GEQO_MUTATION_H
 #define GEQO_MUTATION_H
 
+#include "optimizer/geqo_gene.h"
 
 extern void geqo_mutation(Gene *tour, int num_gene);
 

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.4 1997/09/08 21:53:15 momjian Exp $
+ * $Id: geqo_pool.h,v 1.5 1997/11/26 01:13:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #ifndef GEQO_POOL_H
 #define GEQO_POOL_H
 
+#include "optimizer/geqo_gene.h"
 
 extern Pool *alloc_pool(int pool_size, int string_length);
 extern void free_pool(Pool *pool);

src/include/optimizer/geqo_recombination.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_recombination.h,v 1.4 1997/09/08 21:53:16 momjian Exp $
+ * $Id: geqo_recombination.h,v 1.5 1997/11/26 01:13:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #ifndef GEQO_RECOMBINATION_H
 #define GEQO_RECOMBINATION_H
 
+#include "optimizer/geqo_gene.h"
 
 extern void init_tour(Gene *tour, int num_gene);
 

src/include/optimizer/geqo_selection.h

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.h,v 1.4 1997/09/08 21:53:17 momjian Exp $
+ * $Id: geqo_selection.h,v 1.5 1997/11/26 01:13:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #ifndef GEQO_SELECTION_H
 #define GEQO_SELECTION_H
 
+#include "optimizer/geqo_gene.h"
 
 extern void geqo_selection(Chromosome *momma, Chromosome *daddy, Pool *pool, double bias);
 

src/include/optimizer/joininfo.h

@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.4 1997/09/08 21:53:18 momjian Exp $
+ * $Id: joininfo.h,v 1.5 1997/11/26 01:13:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef JOININFO_H
 #define JOININFO_H
 
+#include "nodes/nodes.h"
+#include "nodes/relation.h"
+#include "nodes/primnodes.h"
+
 extern JInfo *joininfo_member(List *join_relids, List *joininfo_list);
 extern JInfo *find_joininfo_node(Rel *this_rel, List *join_relids);
 extern Var *other_join_clause_var(Var *var, Expr *clause);

src/include/optimizer/keys.h

@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.5 1997/09/08 21:53:18 momjian Exp $
+ * $Id: keys.h,v 1.6 1997/11/26 01:13:41 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, Rel *rel);
 extern Var *extract_subkey(JoinKey *jk, int which_subkey);
 extern bool samekeys(List *keys1, List *keys2);

src/include/optimizer/pathnode.h

@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.4 1997/09/08 21:53:23 momjian Exp $
+ * $Id: pathnode.h,v 1.5 1997/11/26 01:13:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHNODE_H
 #define PATHNODE_H
 
+#include "nodes/nodes.h"
+#include "nodes/relation.h"
+#include "nodes/parsenodes.h"
+
 /*
  * prototypes for pathnode.c
  */

src/include/optimizer/paths.h

@@ -7,13 +7,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.4 1997/09/08 21:53:25 momjian Exp $
+ * $Id: paths.h,v 1.5 1997/11/26 01:13:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHS_H
 #define PATHS_H
 
+#include "nodes/nodes.h"
+#include "nodes/parsenodes.h"
+#include "nodes/relation.h"
+
 /*
  * allpaths.h
  */

src/include/optimizer/planmain.h

@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.5 1997/09/08 21:53:28 momjian Exp $
+ * $Id: planmain.h,v 1.6 1997/11/26 01:13:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANMAIN_H
 #define PLANMAIN_H
 
+#include "nodes/nodes.h"
+#include "nodes/plannodes.h"
+#include "nodes/parsenodes.h"
+#include "nodes/relation.h"
 
 /*
  * prototypes for plan/planmain.c

src/include/optimizer/planner.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.6 1997/11/25 22:06:37 momjian Exp $
+ * $Id: planner.h,v 1.7 1997/11/26 01:13:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,9 @@
 /*
 */
 
-#include <parser/parse_node.h>
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "parser/parse_node.h"
 
 extern Plan *planner(Query *parse);
 extern void pg_checkretval(Oid rettype, QueryTreeList *querytree_list);

src/include/optimizer/tlist.h

@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.5 1997/09/08 21:53:31 momjian Exp $
+ * $Id: tlist.h,v 1.6 1997/11/26 01:13:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TLIST_H
 #define TLIST_H
 
+#include "nodes/nodes.h"
+#include "nodes/parsenodes.h"
+#include "nodes/relation.h"
+
 extern int	exec_tlist_length(List *targelist);
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
 extern Expr *matching_tlvar(Var *var, List *targetlist);

src/include/optimizer/var.h

@@ -6,13 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.4 1997/09/08 21:53:31 momjian Exp $
+ * $Id: var.h,v 1.5 1997/11/26 01:13:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VAR_H
 #define VAR_H
 
+#include "nodes/nodes.h"
+#include "nodes/primnodes.h"
+
 extern List *pull_varnos(Node *me);
 extern bool contain_var_clause(Node *clause);
 extern List *pull_var_clause(Node *clause);