Optimizer rename ClauseInfo -> RestrictInfo. Update optimizer README.

5 files changed, 38 insertions, 38 deletions

diff --git a/src/include/optimizer/clauseinfo.h b/src/include/optimizer/clauseinfo.h
deleted file mode 100644
index 24a3ec5107..0000000000
--- a/src/include/optimizer/clauseinfo.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * clauseinfo.h--
- *	  prototypes for clauseinfo.c.
- *
- *
- * Copyright (c) 1994, Regents of the University of California
- *
- * $Id: clauseinfo.h,v 1.9 1998/09/01 04:36:52 momjian Exp $
- *
- *-------------------------------------------------------------------------
- */
-#ifndef CLAUSEINFO_H
-#define CLAUSEINFO_H
-
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-
-extern bool valid_or_clause(ClauseInfo * clauseinfo);
-extern List *get_actual_clauses(List *clauseinfo_list);
-extern void get_relattvals(List *clauseinfo_list, List **attnos,
-			   List **values, List **flags);
-extern void get_joinvars(Oid relid, List *clauseinfo_list,
-			 List **attnos, List **values, List **flags);
-extern List *get_opnos(List *clauseinfo_list);
-
-#endif	 /* CLAUSEINFO_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 4342149e9b..7d6035c6d4 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.11 1998/09/01 04:36:54 momjian Exp $
+ * $Id: cost.h,v 1.12 1999/02/03 20:15:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,10 +52,10 @@ extern int	page_size(int tuples, int width);
  * prototypes for fuctions in clausesel.h--
  *	  routines to compute clause selectivities
  */
-extern void set_clause_selectivities(List *clauseinfo_list, Cost new_selectivity);
-extern Cost product_selec(List *clauseinfo_list);
+extern void set_clause_selectivities(List *restrictinfo_list, Cost new_selectivity);
+extern Cost product_selec(List *restrictinfo_list);
 extern void set_rest_relselec(Query *root, List *rel_list);
-extern void set_rest_selec(Query *root, List *clauseinfo_list);
+extern void set_rest_selec(Query *root, List *restrictinfo_list);
 extern Cost compute_clause_selec(Query *root,
 					 Node *clause, List *or_selectivities);
 
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index a570d17db5..99f2edc488 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.10 1998/09/01 04:37:14 momjian Exp $
+ * $Id: paths.h,v 1.11 1999/02/03 20:15:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@ extern List *find_paths(Query *root, List *rels);
  *	  routines to generate index paths
  */
 extern List *find_index_paths(Query *root, RelOptInfo * rel, List *indices,
-				 List *clauseinfo_list,
+				 List *restrictinfo_list,
 				 List *joininfo_list);
 
 /*
@@ -47,7 +47,7 @@ extern List *create_or_index_paths(Query *root, RelOptInfo * rel, List *clauses)
  * hashutils.h
  *	  routines to deal with hash keys and clauses
  */
-extern List *group_clauses_by_hashop(List *clauseinfo_list,
+extern List *group_clauses_by_hashop(List *restrictinfo_list,
 						int inner_relid);
 
 /*
@@ -68,7 +68,7 @@ extern List *new_join_pathkeys(List *outer_pathkeys,
  * mergeutils.h
  *	  routines to deal with merge keys and clauses
  */
-extern List *group_clauses_by_order(List *clauseinfo_list,
+extern List *group_clauses_by_order(List *restrictinfo_list,
 					   int inner_relid);
 extern MInfo *match_order_mergeinfo(PathOrder *ordering,
 					  List *mergeinfo_list);
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
new file mode 100644
index 0000000000..bd30b8163e
--- /dev/null
+++ b/src/include/optimizer/restrictinfo.h
@@ -0,0 +1,27 @@
+/*-------------------------------------------------------------------------
+ *
+ * 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 $
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef RESTRICTINFO_H
+#define RESTRICTINFO_H
+
+#include "nodes/pg_list.h"
+#include "nodes/relation.h"
+
+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);
+extern void get_joinvars(Oid relid, List *restrictinfo_list,
+			 List **attnos, List **values, List **flags);
+extern List *get_opnos(List *restrictinfo_list);
+
+#endif	 /* RESTRICTINFO_H */
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/xfunc.h
index 8a10ab80a5..75bb58caec 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/xfunc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.10 1998/09/01 04:37:24 momjian Exp $
+ * $Id: xfunc.h,v 1.11 1999/02/03 20:15:53 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, ClauseInfo * maxcinfopt);
-extern ClauseInfo *xfunc_pullup(Path *childpath, JoinPath *parentpath, ClauseInfo * 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);