diff options
Diffstat (limited to 'src/backend/optimizer/util')
| -rw-r--r-- | src/backend/optimizer/util/indexnode.c | 6 | ||||
| -rw-r--r-- | src/backend/optimizer/util/joininfo.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/keys.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/pathnode.c | 22 | ||||
| -rw-r--r-- | src/backend/optimizer/util/relnode.c | 16 | ||||
| -rw-r--r-- | src/backend/optimizer/util/tlist.c | 4 |
6 files changed, 28 insertions, 28 deletions
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c index 33a52e2c8d9..43f870cb1fc 100644 --- a/src/backend/optimizer/util/indexnode.c +++ b/src/backend/optimizer/util/indexnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.7 1998/06/15 19:28:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.8 1998/07/18 04:22:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,7 +33,7 @@ static List *find_secondary_index(Query *root, Oid relid); * */ List * -find_relation_indices(Query *root, Rel *rel) +find_relation_indices(Query *root, RelOptInfo *rel) { if (rel->indexed) return (find_secondary_index(root, lfirsti(rel->relids))); @@ -61,7 +61,7 @@ find_secondary_index(Query *root, Oid relid) while (index_info(root, first, relid, &indexinfo)) { - Rel *indexnode = makeNode(Rel); + RelOptInfo *indexnode = makeNode(RelOptInfo); indexnode->relids = lconsi(indexinfo.relid, NIL); indexnode->relam = indexinfo.relam; diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 32e0f60454c..9f2e574fe63 100644 --- a/src/backend/optimizer/util/joininfo.c +++ b/src/backend/optimizer/util/joininfo.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.7 1998/06/15 19:28:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.8 1998/07/18 04:22:40 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,7 +62,7 @@ joininfo_member(List *join_relids, List *joininfo_list) * */ JInfo * -find_joininfo_node(Rel *this_rel, List *join_relids) +find_joininfo_node(RelOptInfo *this_rel, List *join_relids) { JInfo *joininfo = joininfo_member(join_relids, this_rel->joininfo); diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c index eb49cb5ad3b..60bbf08dd17 100644 --- a/src/backend/optimizer/util/keys.c +++ b/src/backend/optimizer/util/keys.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.6 1998/02/26 04:33:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.7 1998/07/18 04:22:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -54,7 +54,7 @@ static bool equal_indexkey_var(int index_key, Var *var); * */ bool -match_indexkey_operand(int indexkey, Var *operand, Rel *rel) +match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel) { if (IsA(operand, Var) && (lfirsti(rel->relids) == operand->varno) && diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 23917e2c9d9..7b48b91bd5c 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.8 1998/06/15 19:28:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.9 1998/07/18 04:22:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -62,13 +62,13 @@ path_is_cheaper(Path *path1, Path *path2) * */ Path * -set_cheapest(Rel *parent_rel, List *pathlist) +set_cheapest(RelOptInfo *parent_rel, List *pathlist) { List *p; Path *cheapest_so_far; Assert(pathlist != NIL); - Assert(IsA(parent_rel, Rel)); + Assert(IsA(parent_rel, RelOptInfo)); cheapest_so_far = (Path *) lfirst(pathlist); @@ -99,7 +99,7 @@ set_cheapest(Rel *parent_rel, List *pathlist) * */ List * -add_pathlist(Rel *parent_rel, List *unique_paths, List *new_paths) +add_pathlist(RelOptInfo *parent_rel, List *unique_paths, List *new_paths) { List *x; Path *new_path; @@ -200,7 +200,7 @@ better_path(Path *new_path, List *unique_paths, bool *noOther) * */ Path * -create_seqscan_path(Rel *rel) +create_seqscan_path(RelOptInfo *rel) { int relid = 0; @@ -251,8 +251,8 @@ create_seqscan_path(Rel *rel) */ IndexPath * create_index_path(Query *root, - Rel *rel, - Rel *index, + RelOptInfo *rel, + RelOptInfo *index, List *restriction_clauses, bool is_join_scan) { @@ -406,8 +406,8 @@ create_index_path(Query *root, * */ 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) @@ -481,7 +481,7 @@ create_nestloop_path(Rel *joinrel, * */ MergePath * -create_mergesort_path(Rel *joinrel, +create_mergesort_path(RelOptInfo *joinrel, int outersize, int innersize, int outerwidth, @@ -547,7 +547,7 @@ create_mergesort_path(Rel *joinrel, * */ HashPath * -create_hashjoin_path(Rel *joinrel, +create_hashjoin_path(RelOptInfo *joinrel, int outersize, int innersize, int outerwidth, diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index b18f3342015..87f0aef8d4d 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.5 1998/02/26 04:33:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.6 1998/07/18 04:22:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -27,17 +27,17 @@ * necessary. This is for base relations. * */ -Rel * +RelOptInfo * get_base_rel(Query *root, int relid) { List *relids; - Rel *rel; + RelOptInfo *rel; relids = lconsi(relid, NIL); rel = rel_member(relids, root->base_relation_list_); if (rel == NULL) { - rel = makeNode(Rel); + rel = makeNode(RelOptInfo); rel->relids = relids; rel->indexed = false; rel->pages = 0; @@ -100,7 +100,7 @@ get_base_rel(Query *root, int relid) * creating a new one if necessary. This is for join relations. * */ -Rel * +RelOptInfo * get_join_rel(Query *root, List *relid) { return rel_member(relid, root->join_relation_list_); @@ -114,7 +114,7 @@ get_join_rel(Query *root, List *relid) * Returns the corresponding entry in 'rels' if it is there. * */ -Rel * +RelOptInfo * rel_member(List *relid, List *rels) { List *temp = NIL; @@ -124,9 +124,9 @@ rel_member(List *relid, List *rels) { foreach(temp, rels) { - temprelid = ((Rel *) lfirst(temp))->relids; + temprelid = ((RelOptInfo *) lfirst(temp))->relids; if (same(temprelid, relid)) - return ((Rel *) (lfirst(temp))); + return ((RelOptInfo *) (lfirst(temp))); } } return (NULL); diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index b151155bc1d..488bc4b5e14 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.13 1998/06/15 19:28:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.14 1998/07/18 04:22:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -93,7 +93,7 @@ matching_tlvar(Var *var, List *targetlist) * CREATES: new var-node iff no matching var-node exists in targetlist */ void -add_tl_element(Rel *rel, Var *var) +add_tl_element(RelOptInfo *rel, Var *var) { Expr *oldvar = (Expr *) NULL; |