optimizer rename

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 4051579be804bb8b1186cd176c5acd8f42f97493..a57c939edf0132e3f61bf2662499cb26ae6c5ead 100644 (file)
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.38 1999/02/15 05:28:09 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.39 1999/02/15 05:49:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -248,7 +248,10 @@ make_one_rel_by_joins(Query *root, List *rels, int levels_needed)
        root->join_rel_list = rels = joined_rels;
    }
 
+#ifdef NOT_USED
    Assert(BushyPlanFlag || length(rels) == 1);
+#endif
+   Assert(length(rels) == 1);
 
 #ifdef NOT_USED
    if (BushyPlanFlag)

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index c4350795cf8c3b119f6726715f45eff02a6770de..ff8040b46273271d0ead47c60654859be0bc60e3 100644 (file)
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.49 1999/02/15 05:28:09 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.50 1999/02/15 05:50:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,7 +67,7 @@ static List *indexable_joinclauses(RelOptInfo *rel, RelOptInfo *index,
                      List *joininfo_list, List *restrictinfo_list);
 static List *index_innerjoin(Query *root, RelOptInfo *rel,
                List *clausegroup_list, RelOptInfo *index);
-static List *create_index_paths(Query *root, RelOptInfo *rel, RelOptInfo *index,
+static List *create_index_path_group(Query *root, RelOptInfo *rel, RelOptInfo *index,
                   List *clausegroup_list, bool join);
 static List *add_index_paths(List *indexpaths, List *new_indexpaths);
 static bool function_index_operand(Expr *funcOpnd, RelOptInfo *rel, RelOptInfo *index);
@@ -152,7 +152,7 @@ create_index_paths(Query *root,
 
        scanpaths = NIL;
        if (scanclausegroups != NIL)
-           scanpaths = create_index_paths(root,
+           scanpaths = create_index_path_group(root,
                                           rel,
                                           index,
                                           scanclausegroups,
@@ -170,7 +170,7 @@ create_index_paths(Query *root,
 
        if (joinclausegroups != NIL)
        {
-           joinpaths = create_index_paths(root, rel,
+           joinpaths = create_index_path_group(root, rel,
                                           index,
                                           joinclausegroups,
                                           true);
@@ -1330,7 +1330,7 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
 }
 
 /*
- * create_index_paths
+ * create_index_path_group
  *   Creates a list of index path nodes for each group of clauses
  *   (restriction or join) that can be used in conjunction with an index.
  *
@@ -1344,11 +1344,11 @@ index_innerjoin(Query *root, RelOptInfo *rel, List *clausegroup_list,
  *
  */
 static List *
-create_index_paths(Query *root,
-                  RelOptInfo *rel,
-                  RelOptInfo *index,
-                  List *clausegroup_list,
-                  bool join)
+create_index_path_group(Query *root,
+                      RelOptInfo *rel,
+                      RelOptInfo *index,
+                      List *clausegroup_list,
+                      bool join)
 {
    List       *clausegroup = NIL;
    List       *ip_list = NIL;

diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index 807b2178b2ab638d9100ffdaac01e11fa523dedc..140ca955559e94562a5b465b38ad3ddf5b878526 100644 (file)
--- 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.11 1999/02/13 23:21:44 momjian Exp $
+ * $Id: geqo.h,v 1.12 1999/02/15 05:50:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@ extern RelOptInfo *geqo(Query *root);
 extern void geqo_params(int string_length);
 
 extern Cost geqo_eval(Query *root, Gene *tour, int num_gene);
-double     geqo_log(double x, double b);
 extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *outer_rel);