Change my-function-name-- to my_function_name, and optimizer renames.

27 files changed, 61 insertions, 61 deletions

diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 3f93920af83..d7068c6c426 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * clauses.h--
+ * clauses.h
  *	  prototypes for clauses.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.14 1998/12/04 15:34:49 thomas Exp $
+ * $Id: clauses.h,v 1.15 1999/02/13 23:21:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index a94becb5a6e..fdaf17d91ff 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * cost.h--
+ * cost.h
  *	  prototypes for costsize.c and clausesel.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.16 1999/02/12 17:25:05 momjian Exp $
+ * $Id: cost.h,v 1.17 1999/02/13 23:21:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 #include "nodes/relation.h"
 
 /*
- * prototypes for costsize.c--
+ * prototypes for costsize.c
  *	  routines to compute costs and sizes
  */
 extern bool _enable_seqscan_;
@@ -49,7 +49,7 @@ extern int	compute_joinrel_size(JoinPath *joinpath);
 extern int	page_size(int tuples, int width);
 
 /*
- * prototypes for fuctions in clausesel.h--
+ * prototypes for fuctions in clausesel.h
  *	  routines to compute clause selectivities
  */
 extern void set_clause_selectivities(List *restrictinfo_list, Cost new_selectivity);
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index ab2d4793145..807b2178b2a 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo.h--
+ * geqo.h
  *	  prototypes for various files in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.10 1999/02/10 21:02:45 momjian Exp $
+ * $Id: geqo.h,v 1.11 1999/02/13 23:21:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index bdf521215e6..bf45ac979be 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_copy.h--
+ * geqo_copy.h
  *	  prototypes for copy functions in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.h,v 1.6 1998/09/01 04:36:57 momjian Exp $
+ * $Id: geqo_copy.h,v 1.7 1999/02/13 23:21:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index a5f03055696..00b5b9385e8 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_gene.h--
+ * geqo_gene.h
  *	  genome representation in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_gene.h,v 1.6 1998/09/01 04:36:58 momjian Exp $
+ * $Id: geqo_gene.h,v 1.7 1999/02/13 23:21:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 60b5bc2c730..2039703b602 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_misc.h--
+ * geqo_misc.h
  *	  prototypes for printout routines in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.8 1999/02/10 21:02:47 momjian Exp $
+ * $Id: geqo_misc.h,v 1.9 1999/02/13 23:21:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index 5a6b636efdf..82cb70847cc 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_mutation.h--
+ * geqo_mutation.h
  *	  prototypes for mutation functions in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_mutation.h,v 1.6 1998/09/01 04:37:00 momjian Exp $
+ * $Id: geqo_mutation.h,v 1.7 1999/02/13 23:21:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h
index abef40dd959..2a62b459be7 100644
--- a/src/include/optimizer/geqo_paths.h
+++ b/src/include/optimizer/geqo_paths.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_paths.h--
+ * geqo_paths.h
  *	  prototypes for various subroutines in geqo_path.c
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_paths.h,v 1.8 1999/02/12 05:57:06 momjian Exp $
+ * $Id: geqo_paths.h,v 1.9 1999/02/13 23:21:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index d7916cdecce..f8e047c8884 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_pool.h--
+ * geqo_pool.h
  *	  pool representation in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.h,v 1.6 1998/09/01 04:37:03 momjian Exp $
+ * $Id: geqo_pool.h,v 1.7 1999/02/13 23:21:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h
index 3d574b74da5..ea5ec008b6a 100644
--- a/src/include/optimizer/geqo_random.h
+++ b/src/include/optimizer/geqo_random.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_random.h--
+ * geqo_random.h
  *	  random number generator
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_random.h,v 1.3 1998/09/01 04:37:04 momjian Exp $
+ * $Id: geqo_random.h,v 1.4 1999/02/13 23:21:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index a49a9550c74..bc0f024206f 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_recombination.h--
+ * geqo_recombination.h
  *	  prototypes for recombination in the genetic query optimizer
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_recombination.h,v 1.6 1998/09/01 04:37:06 momjian Exp $
+ * $Id: geqo_recombination.h,v 1.7 1999/02/13 23:21:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index 262a1a9cf75..4416acbd6e7 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -1,11 +1,11 @@
 /*-------------------------------------------------------------------------
  *
- * geqo_selection.h--
+ * geqo_selection.h
  *	  prototypes for selection routines in optimizer/geqo
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_selection.h,v 1.6 1998/09/01 04:37:07 momjian Exp $
+ * $Id: geqo_selection.h,v 1.7 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 5d8e75d146d..d818cec7700 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * internal.h--
+ * internal.h
  *	  Definitions required throughout the query optimizer.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.13 1999/02/09 17:03:14 momjian Exp $
+ * $Id: internal.h,v 1.14 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index e6cd7abf80d..a38af83c5cb 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * joininfo.h--
+ * joininfo.h
  *	  prototypes for joininfo.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.9 1999/02/10 21:02:48 momjian Exp $
+ * $Id: joininfo.h,v 1.10 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index b1798b1c8cc..4a23680b75d 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * keys.h--
+ * keys.h
  *	  prototypes for keys.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.11 1999/02/11 17:00:49 momjian Exp $
+ * $Id: keys.h,v 1.12 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h
index 1ff2cdbc4fb..1b642127e4f 100644
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * ordering.h--
+ * ordering.h
  *	  prototypes for ordering.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ordering.h,v 1.12 1999/02/11 17:00:49 momjian Exp $
+ * $Id: ordering.h,v 1.13 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index 10bdeb26f0d..74a651e4c29 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * pathnode.h--
+ * pathnode.h
  *	  prototypes for pathnode.c, indexnode.c, relnode.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.13 1999/02/12 06:43:53 momjian Exp $
+ * $Id: pathnode.h,v 1.14 1999/02/13 23:21:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index e2f2046974c..5938e0e849e 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -1,13 +1,13 @@
 /*-------------------------------------------------------------------------
  *
- * paths.h--
+ * paths.h
  *	  prototypes for various files in optimizer/paths (were separate
  *	  header files
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.14 1999/02/12 05:57:08 momjian Exp $
+ * $Id: paths.h,v 1.15 1999/02/13 23:21:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index f15e516a335..cd67cd16d54 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * plancat.h--
+ * plancat.h
  *	  prototypes for plancat.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.10 1998/10/08 18:30:32 momjian Exp $
+ * $Id: plancat.h,v 1.11 1999/02/13 23:21:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 1bb2b636aa7..8c10eddc553 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * planmain.h--
+ * planmain.h
  *	  prototypes for various files in optimizer/plan
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.20 1999/02/09 17:03:14 momjian Exp $
+ * $Id: planmain.h,v 1.21 1999/02/13 23:21:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,8 +41,8 @@ extern Unique *make_unique(List *tlist, Plan *lefttree, char *uniqueAttr);
 /*
  * prototypes for plan/initsplan.c
  */
-extern void init_base_rels_tlist(Query *root, List *tlist);
-extern void init_base_rels_qual(Query *root, List *clauses);
+extern void make_var_only_tlist(Query *root, List *tlist);
+extern void add_restrict_and_join_to_rels(Query *root, List *clauses);
 extern void init_join_info(List *rel_list);
 extern void add_missing_vars_to_tlist(Query *root, List *tlist);
 
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index e620f3a2300..12411789683 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * planner.h--
+ * planner.h
  *	  prototypes for planner.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.9 1998/09/01 04:37:18 momjian Exp $
+ * $Id: planner.h,v 1.10 1999/02/13 23:21:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index b972d0952c6..24e83d340de 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * prep.h--
+ * prep.h
  *	  prototypes for files in prep.c
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.13 1998/09/01 04:37:19 momjian Exp $
+ * $Id: prep.h,v 1.14 1999/02/13 23:21:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index bd30b8163e2..88cedc3f686 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * restrictinfo.h--
+ * restrictinfo.h
  *	  prototypes for restrictinfo.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: restrictinfo.h,v 1.1 1999/02/03 20:15:53 momjian Exp $
+ * $Id: restrictinfo.h,v 1.2 1999/02/13 23:21:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
-extern bool valid_or_clause(RestrictInfo * restrictinfo);
+extern bool valid_or_clause(RestrictInfo *restrictinfo);
 extern List *get_actual_clauses(List *restrictinfo_list);
 extern void get_relattvals(List *restrictinfo_list, List **attnos,
 			   List **values, List **flags);
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 66ad302b8b1..2394694907f 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * subselect.h--
+ * subselect.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 4571ce90c0a..cfed55bbb98 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * tlist.h--
+ * tlist.h
  *	  prototypes for tlist.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.14 1999/02/10 21:02:50 momjian Exp $
+ * $Id: tlist.h,v 1.15 1999/02/13 23:21:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
 extern Expr *matching_tlvar(Var *var, List *targetlist);
-extern void add_tl_element(RelOptInfo *rel, Var *var);
+extern void add_var_to_tlist(RelOptInfo *rel, Var *var);
 extern TargetEntry *create_tl_element(Var *var, int resdomno);
 extern List *get_actual_tlist(List *tlist);
 extern Resdom *tlist_member(Var *var, List *tlist);
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 23bc30258d7..e903025bed4 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * var.h--
+ * var.h
  *	  prototypes for var.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.6 1998/09/01 04:37:23 momjian Exp $
+ * $Id: var.h,v 1.7 1999/02/13 23:21:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index cea01b52029..5c95cc1dbbc 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/xfunc.h
@@ -1,12 +1,12 @@
 /*-------------------------------------------------------------------------
  *
- * xfunc.h--
+ * xfunc.h
  *	  prototypes for xfunc.c and predmig.c.
  *
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.14 1999/02/12 17:25:05 momjian Exp $
+ * $Id: xfunc.h,v 1.15 1999/02/13 23:21:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -51,8 +51,8 @@ extern int	XfuncMode;			/* defined in tcop/postgres.c */
 /* function prototypes from planner/path/xfunc.c */
 extern void xfunc_trypullup(RelOptInfo *rel);
 extern int xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
-				 int whichchild, RestrictInfo * maxcinfopt);
-extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo * cinfo,
+				 int whichchild, RestrictInfo *maxcinfopt);
+extern RestrictInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, RestrictInfo *cinfo,
 			 int whichchild, int clausetype);
 extern Cost xfunc_rank(Expr *clause);
 extern Cost xfunc_expense(Query *queryInfo, Expr *clause);