Final round before bed...more tomorrow...

10 files changed, 32 insertions, 91 deletions

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index d9b65c72fb9..15b4c769d60 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,31 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46 1999/05/25 22:41:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.46.2.1 1999/08/02 06:26:56 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
-
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-
-#include "optimizer/internal.h"
-
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"
-
-#include "commands/creatinh.h"
-
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
+#include "optimizer/internal.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
 #ifdef GEQO
 bool		_use_geqo_ = true;
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index bbc9e3547e3..24db0fac9d0 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -7,26 +7,21 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.20 1999/05/25 16:09:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.20.2.1 1999/08/02 06:26:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "catalog/pg_operator.h"
-#include "fmgr.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
-#include "optimizer/plancat.h"
-#include "parser/parsetree.h"	/* for getrelid() */
+#include "optimizer/plancat.h" 
+#include "optimizer/restrictinfo.h"
+#include "parser/parsetree.h" 
 #include "utils/lsyscache.h"
 
-
 static Cost compute_selec(Query *root, List *clauses, List *or_selectivities);
 
 /****************************************************************************
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 067cfffcc9f..283eb06ceeb 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,15 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.41 1999/07/07 09:36:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.41.2.1 1999/08/02 06:26:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
 #include <math.h>
 
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #ifndef MAXINT
@@ -27,10 +26,9 @@
 #endif
 #endif
 
-#include "nodes/relation.h"
+
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
-#include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index 0d4b2326ba4..44c64c8006f 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -7,17 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.16 1999/05/25 16:09:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.16.2.1 1999/08/02 06:26:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
+#include "optimizer/paths.h"
 
 
 static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 3dade2c6326..aa660f593d4 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38 1999/05/25 22:41:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38.2.1 1999/08/02 06:26:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,18 +16,9 @@
 
 #include "postgres.h"
 
-#include "storage/buf_internals.h"
-
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
+#include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/keys.h"
-#include "optimizer/cost.h"		/* for _enable_{hashjoin,
-								 * _enable_mergejoin} */
+#include "optimizer/paths.h"
 
 static Path *best_innerjoin(List *join_paths, List *outer_relid);
 static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 3c6c2888ff4..1ea9cfc4ab9 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,21 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.35 1999/05/26 12:55:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.35.2.1 1999/08/02 06:26:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
 static bool nonoverlap_sets(List *s1, List *s2);
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 8d8255cabb9..603d4b87921 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -7,19 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.22 1999/05/25 16:09:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.22.2.1 1999/08/02 06:26:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
 
 /*
  * group_clauses_by_order
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index 0b9dd397d74..088159110d7 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,29 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25 1999/05/25 22:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.25.2.1 1999/08/02 06:26:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-
-#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/paths.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
+#include "optimizer/paths.h"
 #include "optimizer/plancat.h"
-#include "optimizer/xfunc.h"
-
-#include "parser/parsetree.h"
-
+#include "optimizer/restrictinfo.h"
+#include "parser/parsetree.h" 
 
 static void best_or_subclause_indices(Query *root, RelOptInfo *rel, List *subclauses,
 				List *indices, List **indexids, Cost *cost, Cost *selec);
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index eee8a027a83..53c925fb0c9 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -7,23 +7,18 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.10 1999/05/25 16:09:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.10.2.1 1999/08/02 06:26:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/var.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
+#include "optimizer/keys.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static int match_pathkey_joinkeys(List *pathkey, List *joinkeys,
 					   int outer_or_inner);
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index ba8880daa26..b57a0dff48c 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,21 +7,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39 1999/05/25 22:41:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.39.2.1 1999/08/02 06:26:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
-#include "utils/elog.h"
 
 
 static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);