Optimizer cleanup.

diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 7b234224e1c172077fab8f1a2ccaf8d5b7514719..deecc3aa33d2ad6447018b0f6feb08404459940f 100644 (file)
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.61 1999/02/04 03:19:06 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.62 1999/02/05 19:59:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1343,7 +1343,7 @@ _copyRestrictInfo(RestrictInfo * from)
        Node_Copy(from, newnode, indexids);
        Node_Copy(from, newnode, mergejoinorder);
        newnode->hashjoinoperator = from->hashjoinoperator;
-       newnode->cinfojoinid = listCopy(from->cinfojoinid);
+       newnode->restrictinfojoinid = listCopy(from->restrictinfojoinid);
 
        return newnode;
 }

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 8c0d49a7c32dc8e15410c9015702b8921c37f7e5..fd2bb20f554920efcf9ed381145f93a81a4f0596 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *  $Id: outfuncs.c,v 1.64 1999/02/04 01:46:54 momjian Exp $
+ *  $Id: outfuncs.c,v 1.65 1999/02/05 19:59:25 momjian Exp $
  *
  * NOTES
  *       Every (plan) node in POSTGRES has an associated "out" routine which
@@ -1107,7 +1107,7 @@ _outMergeOrder(StringInfo str, MergeOrder *node)
 static void
 _outRestrictInfo(StringInfo str, RestrictInfo * node)
 {
-       appendStringInfo(str, " CINFO :clause ");
+       appendStringInfo(str, " RESTRICTINFO :clause ");
        _outNode(str, node->clause);
 
        appendStringInfo(str, 

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index f3ac661b0a44dd2136dd0b9fc229b20a7ac22139..43c71c6a81d5126c27a44a42d4aaa07a0985c632 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.48 1999/02/04 03:19:06 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.49 1999/02/05 19:59:25 momjian Exp $
  *
  * NOTES
  *       Most of the read functions for plan nodes are tested. (In fact, they
@@ -2087,13 +2087,13 @@ parsePlanString(void)
                return_value = _readJoinKey();
        else if (!strncmp(token, "MERGEORDER", length))
                return_value = _readMergeOrder();
-       else if (!strncmp(token, "CLAUSEINFO", length))
+       else if (!strncmp(token, "RETRICTINFO", length))
                return_value = _readRestrictInfo();
        else if (!strncmp(token, "JOINMETHOD", length))
                return_value = _readJoinMethod();
        else if (!strncmp(token, "JOININFO", length))
                return_value = _readJoinInfo();
-       else if (!strncmp(token, "HINFO", length))
+       else if (!strncmp(token, "HASHINFO", length))
                return_value = _readHashInfo();
        else if (!strncmp(token, "ITER", length))
                return_value = _readIter();

diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index 42cbade63ade3c884a19b61392f2794034bf3f59..ae937cc9763032c89148afaca3b1e248a3d6cd4f 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.37 1999/02/03 21:16:26 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.38 1999/02/05 19:59:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -56,7 +56,7 @@ static List *group_clauses_by_indexkey(RelOptInfo * rel, RelOptInfo * index,
 static List *group_clauses_by_ikey_for_joins(RelOptInfo * rel, RelOptInfo * index,
                                                                int *indexkeys, Oid *classes, List *join_cinfo_list, List *restr_cinfo_list);
 static RestrictInfo *match_clause_to_indexkey(RelOptInfo * rel, RelOptInfo * index, int indexkey,
-                                                int xclass, RestrictInfo * clauseInfo, bool join);
+                                                int xclass, RestrictInfo * restrictInfo, bool join);
 static bool pred_test(List *predicate_list, List *restrictinfo_list,
                  List *joininfo_list);
 static bool one_pred_test(Expr *predicate, List *restrictinfo_list);
@@ -571,14 +571,14 @@ group_clauses_by_ikey_for_joins(RelOptInfo * rel,
  *
  */
 static RestrictInfo *
-match_clause_to_indexkey(RelOptInfo * rel,
-                                                RelOptInfo * index,
+match_clause_to_indexkey(RelOptInfo *rel,
+                                                RelOptInfo *index,
                                                 int indexkey,
                                                 int xclass,
-                                                RestrictInfo * clauseInfo,
+                                                RestrictInfo *restrictInfo,
                                                 bool join)
 {
-       Expr       *clause = clauseInfo->clause;
+       Expr       *clause = restrictInfo->clause;
        Var                *leftop,
                           *rightop;
        Oid                     join_op = InvalidOid;
@@ -761,7 +761,7 @@ match_clause_to_indexkey(RelOptInfo * rel,
        }
 
        if (isIndexable)
-               return clauseInfo;
+               return restrictInfo;
 
        return NULL;
 }
@@ -1208,7 +1208,7 @@ indexable_joinclauses(RelOptInfo * rel, RelOptInfo * index,
                {
                        List       *clauses = lfirst(clausegroups);
 
-                       ((RestrictInfo *) lfirst(clauses))->cinfojoinid = joininfo->otherrels;
+                       ((RestrictInfo *) lfirst(clauses))->restrictinfojoinid = joininfo->otherrels;
                }
                cg_list = nconc(cg_list, clausegroups);
        }
@@ -1298,7 +1298,7 @@ index_innerjoin(Query *root, RelOptInfo * rel, List *clausegroup_list,
                pathnode->indexkeys = index->indexkeys;
                pathnode->indexqual = clausegroup;
 
-               pathnode->path.joinid = ((RestrictInfo *) lfirst(clausegroup))->cinfojoinid;
+               pathnode->path.joinid = ((RestrictInfo *) lfirst(clausegroup))->restrictinfojoinid;
 
                pathnode->path.path_cost = cost_index((Oid) lfirsti(index->relids),
                                           (int) temp_pages,

diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index 4a185c13d50f5f734cdf7268ed58260d74acce8f..f02bfeaab5bea041d35755c7ef4086b183a45694 100644 (file)
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.21 1999/02/05 03:43:05 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.22 1999/02/05 19:59:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,9 +64,9 @@ prune_joinrel(RelOptInfo *rel, List *other_rels)
        List       *r1 = NIL;
        List       *result = NIL;
 
-       foreach(r1, other_rels)
+       foreach(i, other_rels)
        {
-               RelOptInfo *other_rel = (RelOptInfo *) lfirst(r1);
+               RelOptInfo *other_rel = (RelOptInfo *) lfirst(i);
 
                if (same(rel->relids, other_rel->relids))
                        /*

diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 86a143199c4b391faff3afaafdfe4a9087ed6487..e2bdb295dac0c8b1f58c96ad62652679a0334157 100644 (file)
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.36 1999/02/03 21:16:30 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.37 1999/02/05 19:59:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -321,7 +321,7 @@ create_indexscan_node(IndexPath *best_path,
 
        /*
         * Extract the(first if conjunct, only if disjunct) clause from the
-        * clauseinfo list.
+        * restrictinfo list.
         */
        Expr       *index_clause = (Expr *) NULL;
        List       *indxqual = NIL;

diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile
index f930c721b7b3849e3b0a2419c59f75fd3c09081c..f28457497f010993ec590cfbf255ff7496c67b74 100644 (file)
--- a/src/backend/optimizer/util/Makefile
+++ b/src/backend/optimizer/util/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for optimizer/util
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.7 1998/07/20 20:01:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Makefile,v 1.8 1999/02/05 19:59:28 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -13,7 +13,7 @@ include ../../../Makefile.global
 
 CFLAGS += -I../..
 
-OBJS = clauseinfo.o clauses.o indexnode.o plancat.o \
+OBJS = restrictinfo.o clauses.o indexnode.o plancat.o \
        joininfo.o keys.o ordering.o pathnode.o relnode.o tlist.o var.o
 
 # not ready yet: predmig.o xfunc.o

diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index d13e014b51a5e9c0aa88485a488c5b2e19db5573..15d389e5f6b715125bcc7c5eb458df45548b5be4 100644 (file)
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.9 1999/02/03 21:16:51 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.10 1999/02/05 19:59:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -44,7 +44,7 @@ equal_path_path_ordering(PathOrder *path_ordering1,
                         path_ordering2->ordtype == SORTOP_ORDER)
        {
                return (equal_sortops_order(path_ordering1->ord.sortop,
-                                                                path_ordering2->ord.sortop));
+                                                                       path_ordering2->ord.sortop));
        }
        else if (path_ordering1->ordtype == MERGE_ORDER &&
                         path_ordering2->ordtype == SORTOP_ORDER)

diff --git a/src/backend/optimizer/util/clauseinfo.c b/src/backend/optimizer/util/restrictinfo.c
similarity index 97%
rename from src/backend/optimizer/util/clauseinfo.c
rename to src/backend/optimizer/util/restrictinfo.c
index 4df034536c0e5b3c4d8d31b797cd747c020c0023..22ffe665e2e813abe9b51c35e11656d15607ede1 100644 (file)
--- a/src/backend/optimizer/util/clauseinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/clauseinfo.c,v 1.11 1999/02/03 21:16:50 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.1 1999/02/05 19:59:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 45bb715e671a44d701ff349f9854fdd8494a0f14..51b30d4c4e39c0232cfc72594f6515c401724aab 100644 (file)
--- 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.14 1999/02/04 03:19:10 momjian Exp $
+ * $Id: relation.h,v 1.15 1999/02/05 19:59:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -219,7 +219,7 @@ typedef struct RestrictInfo
 
        /* hashjoin only */
        Oid                     hashjoinoperator;
-       Relid           cinfojoinid;
+       Relid           restrictinfojoinid;
 } RestrictInfo;
 
 typedef struct JoinMethod