diff options
Diffstat (limited to 'src/backend/optimizer/util')
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/util/joininfo.c | 4 | ||||
| -rw-r--r-- | src/backend/optimizer/util/relnode.c | 10 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 1a304e316e0..653dad7f2a0 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.19 1998/08/09 04:59:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.20 1998/08/10 02:26:29 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -439,13 +439,13 @@ contains_not(Node *clause) } /* - * join-clause-p-- + * is_joinable-- * * Returns t iff 'clause' is a valid join clause. * */ bool -join_clause_p(Node *clause) +is_joinable(Node *clause) { Node *leftop, *rightop; @@ -460,7 +460,7 @@ join_clause_p(Node *clause) * One side of the clause (i.e. left or right operands) must either be * a var node ... */ - if (IsA(leftop, Var) ||IsA(rightop, Var)) + if (IsA(leftop, Var) || IsA(rightop, Var)) return true; /* diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index 2aec33231db..fb3ac0ba307 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.9 1998/08/04 16:44:17 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.10 1998/08/10 02:26:30 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -97,7 +97,7 @@ other_join_clause_var(Var *var, Expr *clause) retval = (Var *) NULL; - if (var != NULL && join_clause_p((Node *) clause)) + if (var != NULL && is_joinable((Node *) clause)) { l = (Var *) get_leftop(clause); r = (Var *) get_rightop(clause); diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index 87f0aef8d4d..756ca8570ef 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.6 1998/07/18 04:22:41 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.7 1998/08/10 02:26:32 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ get_base_rel(Query *root, int relid) RelOptInfo *rel; relids = lconsi(relid, NIL); - rel = rel_member(relids, root->base_relation_list_); + rel = rel_member(relids, root->base_rel_list); if (rel == NULL) { rel = makeNode(RelOptInfo); @@ -56,8 +56,7 @@ get_base_rel(Query *root, int relid) rel->innerjoin = NIL; rel->superrels = NIL; - root->base_relation_list_ = lcons(rel, - root->base_relation_list_); + root->base_rel_list = lcons(rel, root->base_rel_list); /* * ??? the old lispy C code (get_rel) do a listp(relid) here but @@ -66,7 +65,6 @@ get_base_rel(Query *root, int relid) */ if (relid < 0) { - /* * If the relation is a materialized relation, assume * constants for sizes. @@ -103,7 +101,7 @@ get_base_rel(Query *root, int relid) RelOptInfo * get_join_rel(Query *root, List *relid) { - return rel_member(relid, root->join_relation_list_); + return rel_member(relid, root->join_rel_list); } /* |