Rename Rel to RelOptInfo.

12 files changed, 44 insertions, 44 deletions

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index d205f4236a3..1a172d83e08 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.24 1998/02/13 03:45:23 vadim Exp $
+ * $Id: nodes.h,v 1.25 1998/07/18 04:22:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,7 +70,7 @@ typedef enum NodeTag
 	 * TAGS FOR INNER PLAN NODES (relation.h)
 	 *---------------------
 	 */
-	T_Rel = 200,
+	T_RelOptInfo = 200,
 	T_Path,
 	T_IndexPath,
 	T_JoinPath,
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 8c2fb363a92..baee1b1d079 100644
--- 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.7 1997/09/08 21:53:01 momjian Exp $
+ * $Id: relation.h,v 1.8 1998/07/18 04:22:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,7 @@
 typedef List *Relid;
 
 /*
- * Rel
+ * RelOptInfo
  *		Per-base-relation information
  *
  *		Parts of this data structure are specific to various scan and join
@@ -47,7 +47,7 @@ typedef List *Relid;
  *						leaves the tuples unordered)
  *		cheapestpath -	least expensive Path (regardless of final order)
  *		pruneable - flag to let the planner know whether it can prune the plan
- *					space of this Rel or not.  -- JMH, 11/11/92
+ *					space of this RelOptInfo or not.  -- JMH, 11/11/92
  *
  *	 * If the relation is a (secondary) index it will have the following
  *		three fields:
@@ -71,7 +71,7 @@ typedef List *Relid;
  *	   is always 0.								2/95 - ay
  */
 
-typedef struct Rel
+typedef struct RelOptInfo
 {
 	NodeTag		type;
 
@@ -106,7 +106,7 @@ typedef struct Rel
 	List	   *joininfo;		/* join clauses */
 	List	   *innerjoin;
 	List	   *superrels;
-} Rel;
+} RelOptInfo;
 
 extern Var *get_expr(TargetEntry *foo);
 
@@ -139,7 +139,7 @@ typedef struct Path
 {
 	NodeTag		type;
 
-	Rel		   *parent;
+	RelOptInfo		   *parent;
 	Cost		path_cost;
 
 	NodeTag		pathtype;
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 05bc19fec85..0c1a88b586a 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.8 1998/02/26 04:42:14 momjian Exp $
+ * $Id: cost.h,v 1.9 1998/07/18 04:22:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,8 +47,8 @@ extern Cost
 cost_hashjoin(Cost outercost, Cost innercost, List *outerkeys,
 			  List *innerkeys, int outersize, int innersize,
 			  int outerwidth, int innerwidth);
-extern int	compute_rel_size(Rel *rel);
-extern int	compute_rel_width(Rel *rel);
+extern int	compute_rel_size(RelOptInfo *rel);
+extern int	compute_rel_width(RelOptInfo *rel);
 extern int	compute_joinrel_size(JoinPath *joinpath);
 extern int	page_size(int tuples, int width);
 
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index a653b4d6325..2a1018ed283 100644
--- 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.7 1997/11/26 01:13:23 momjian Exp $
+ * $Id: geqo.h,v 1.8 1998/07/18 04:22:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -70,13 +70,13 @@ double		SelectionBias;
  /* ^^^						*/
 
 /* geqo prototypes */
-extern Rel *geqo(Query *root);
+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 Rel *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, Rel *outer_rel);
+extern RelOptInfo *gimme_tree(Query *root, Gene *tour, int rel_count, int num_gene, RelOptInfo *outer_rel);
 
 
 #endif							/* GEQO_H */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 2a7a801305b..2dcc6351c5b 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.5 1997/11/26 01:13:28 momjian Exp $
+ * $Id: geqo_misc.h,v 1.6 1998/07/18 04:22:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@ extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
 extern void print_gen(FILE *fp, Pool *pool, int generation);
 extern void print_edge_table(FILE *fp, Edge *edge_table, int num_gene);
 
-extern void geqo_print_rel(Query *root, Rel *rel);
+extern void geqo_print_rel(Query *root, RelOptInfo *rel);
 extern void geqo_print_path(Query *root, Path *path, int indent);
 extern void geqo_print_joinclauses(Query *root, List *clauses);
 
diff --git a/src/include/optimizer/geqo_paths.h b/src/include/optimizer/geqo_paths.h
index 8be4032a227..c222cb1fae1 100644
--- a/src/include/optimizer/geqo_paths.h
+++ b/src/include/optimizer/geqo_paths.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_paths.h,v 1.4 1997/09/08 21:53:14 momjian Exp $
+ * $Id: geqo_paths.h,v 1.5 1998/07/18 04:22:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,6 @@
 
 
 extern List *geqo_prune_rels(List *rel_list);
-extern void geqo_rel_paths(Rel *rel);
+extern void geqo_rel_paths(RelOptInfo *rel);
 
 #endif							/* GEQO_PATHS_H */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 9fdbe231234..57fe535df0c 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.5 1997/11/26 01:13:39 momjian Exp $
+ * $Id: joininfo.h,v 1.6 1998/07/18 04:22:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@
 #include "nodes/primnodes.h"
 
 extern JInfo *joininfo_member(List *join_relids, List *joininfo_list);
-extern JInfo *find_joininfo_node(Rel *this_rel, List *join_relids);
+extern JInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
 extern Var *other_join_clause_var(Var *var, Expr *clause);
 
 #endif							/* JOININFO_H */
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index ea02f5f1307..3ae613629d0 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.6 1997/11/26 01:13:41 momjian Exp $
+ * $Id: keys.h,v 1.7 1998/07/18 04:22:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include "nodes/nodes.h"
 #include "nodes/relation.h"
 
-extern bool match_indexkey_operand(int indexkey, Var *operand, Rel *rel);
+extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel);
 extern Var *extract_subkey(JoinKey *jk, int which_subkey);
 extern bool samekeys(List *keys1, List *keys2);
 extern List *collect_index_pathkeys(int *index_keys, List *tlist);
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index b71512cad7f..d8369f7e746 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.7 1998/02/26 04:42:16 momjian Exp $
+ * $Id: pathnode.h,v 1.8 1998/07/18 04:22:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,25 +21,25 @@
  * prototypes for pathnode.c
  */
 extern bool path_is_cheaper(Path *path1, Path *path2);
-extern Path *set_cheapest(Rel *parent_rel, List *pathlist);
+extern Path *set_cheapest(RelOptInfo *parent_rel, List *pathlist);
 extern List *
-add_pathlist(Rel *parent_rel, List *unique_paths,
+add_pathlist(RelOptInfo *parent_rel, List *unique_paths,
 			 List *new_paths);
-extern Path *create_seqscan_path(Rel *rel);
+extern Path *create_seqscan_path(RelOptInfo *rel);
 extern IndexPath *
-create_index_path(Query *root, Rel *rel, Rel *index,
+create_index_path(Query *root, RelOptInfo *rel, RelOptInfo *index,
 				  List *restriction_clauses, bool is_join_scan);
 extern JoinPath *
-create_nestloop_path(Rel *joinrel, Rel *outer_rel,
+create_nestloop_path(RelOptInfo *joinrel, RelOptInfo *outer_rel,
 					 Path *outer_path, Path *inner_path, List *keys);
 extern MergePath *
-create_mergesort_path(Rel *joinrel, int outersize,
+create_mergesort_path(RelOptInfo *joinrel, int outersize,
 		 int innersize, int outerwidth, int innerwidth, Path *outer_path,
 					  Path *inner_path, List *keys, MergeOrder *order,
 		   List *mergeclauses, List *outersortkeys, List *innersortkeys);
 
 extern HashPath *
-create_hashjoin_path(Rel *joinrel, int outersize,
+create_hashjoin_path(RelOptInfo *joinrel, int outersize,
 		 int innersize, int outerwidth, int innerwidth, Path *outer_path,
 		   Path *inner_path, List *keys, Oid operator, List *hashclauses,
 					 List *outerkeys, List *innerkeys);
@@ -47,13 +47,13 @@ create_hashjoin_path(Rel *joinrel, int outersize,
 /*
  * prototypes for rel.c
  */
-extern Rel *rel_member(List *relid, List *rels);
-extern Rel *get_base_rel(Query *root, int relid);
-extern Rel *get_join_rel(Query *root, List *relid);
+extern RelOptInfo *rel_member(List *relid, List *rels);
+extern RelOptInfo *get_base_rel(Query *root, int relid);
+extern RelOptInfo *get_join_rel(Query *root, List *relid);
 
 /*
  * prototypes for indexnode.h
  */
-extern List *find_relation_indices(Query *root, Rel *rel);
+extern List *find_relation_indices(Query *root, RelOptInfo *rel);
 
 #endif							/* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 741204dfe87..1a2e3db83f7 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.8 1998/02/26 04:42:17 momjian Exp $
+ * $Id: paths.h,v 1.9 1998/07/18 04:22:51 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, Rel *rel, List *indices,
+find_index_paths(Query *root, RelOptInfo *rel, List *indices,
 				 List *clauseinfo_list,
 				 List *joininfo_list);
 
@@ -42,7 +42,7 @@ extern void find_all_join_paths(Query *root, List *joinrels);
 /*
  * orindxpath.h
  */
-extern List *create_or_index_paths(Query *root, Rel *rel, List *clauses);
+extern List *create_or_index_paths(Query *root, RelOptInfo *rel, List *clauses);
 
 /*
  * hashutils.h
@@ -94,7 +94,7 @@ extern List *final_join_rels(List *join_rel_list);
  */
 extern void prune_joinrels(List *rel_list);
 extern void prune_rel_paths(List *rel_list);
-extern Path *prune_rel_path(Rel *rel, Path *unorderedpath);
+extern Path *prune_rel_path(RelOptInfo *rel, Path *unorderedpath);
 extern List *merge_joinrels(List *rel_list1, List *rel_list2);
 extern List *prune_oldrels(List *old_rels);
 
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 76dd57439e1..b6b1d2eb7eb 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.8 1998/02/26 04:42:31 momjian Exp $
+ * $Id: tlist.h,v 1.9 1998/07/18 04:22:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 extern int	exec_tlist_length(List *targelist);
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
 extern Expr *matching_tlvar(Var *var, List *targetlist);
-extern void add_tl_element(Rel *rel, Var *var);
+extern void add_tl_element(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/xfunc.h b/src/include/optimizer/xfunc.h
index c3888cdc3bc..cbc998c7a96 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.7 1998/02/26 04:42:33 momjian Exp $
+ * $Id: xfunc.h,v 1.8 1998/07/18 04:22:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,7 +49,7 @@ extern int	XfuncMode;			/* defined in tcop/postgres.c */
 #define is_join(pathnode) (length(get_relids(get_parent(pathnode))) > 1 ? 1 : 0)
 
 /* function prototypes from planner/path/xfunc.c */
-extern void xfunc_trypullup(Rel *rel);
+extern void xfunc_trypullup(RelOptInfo *rel);
 extern int
 xfunc_shouldpull(Path *childpath, JoinPath *parentpath,
 				 int whichchild, CInfo *maxcinfopt);
@@ -71,7 +71,7 @@ extern List *xfunc_primary_join(JoinPath *pathnode);
 extern Cost xfunc_get_path_cost(Path *pathnode);
 extern Cost xfunc_total_path_cost(JoinPath *pathnode);
 extern Cost xfunc_expense_per_tuple(JoinPath *joinnode, int whichchild);
-extern void xfunc_fixvars(Expr *clause, Rel *rel, int varno);
+extern void xfunc_fixvars(Expr *clause, RelOptInfo *rel, int varno);
 extern int	xfunc_cinfo_compare(void *arg1, void *arg2);
 extern int	xfunc_clause_compare(void *arg1, void *arg2);
 extern void xfunc_disjunct_sort(List *clause_list);
@@ -80,7 +80,7 @@ extern int	xfunc_func_width(RegProcedure funcid, List *args);
 extern int	xfunc_tuple_width(Relation rd);
 extern int	xfunc_num_join_clauses(JoinPath *path);
 extern List *xfunc_LispRemove(List *foo, List *bar);
-extern bool xfunc_copyrel(Rel *from, Rel **to);
+extern bool xfunc_copyrel(RelOptInfo *from, RelOptInfo **to);
 
 /*
  * function prototypes for path/predmig.c