summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2009-09-19 17:48:09 +0000
committerTom Lane2009-09-19 17:48:09 +0000
commita81944a43bd6531e6655698b3fbc69aa8a6c2666 (patch)
tree68fd6fa06388d96805412c7eac7f4983eafcf88b
parent4db20b22e826b4585d5d627584acd7380b9d27cd (diff)
Rename new subroutine, per discussion with Robert Haas.
-rw-r--r--src/backend/optimizer/path/joinpath.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 750af49a27..2fbcde9dcf 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -155,18 +155,18 @@ add_paths_to_joinrel(PlannerInfo *root,
}
/*
- * clause_matches_join
+ * clause_sides_match_join
* Determine whether a join clause is of the right form to use in this join.
*
* We already know that the clause is a binary opclause referencing only the
* rels in the current join. The point here is to check whether it has the
* form "outerrel_expr op innerrel_expr" or "innerrel_expr op outerrel_expr",
- * rather than mixing outer and inner vars on either side. If it is usable,
+ * rather than mixing outer and inner vars on either side. If it matches,
* we set the transient flag outer_is_left to identify which side is which.
*/
static inline bool
-clause_matches_join(RestrictInfo *rinfo, RelOptInfo *outerrel,
- RelOptInfo *innerrel)
+clause_sides_match_join(RestrictInfo *rinfo, RelOptInfo *outerrel,
+ RelOptInfo *innerrel)
{
if (bms_is_subset(rinfo->left_relids, outerrel->relids) &&
bms_is_subset(rinfo->right_relids, innerrel->relids))
@@ -267,7 +267,7 @@ join_is_removable(PlannerInfo *root,
/*
* Check if clause has the form "outer op inner" or "inner op outer".
*/
- if (!clause_matches_join(restrictinfo, outerrel, innerrel))
+ if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
continue; /* no good for these input relations */
/* OK, add to list */
@@ -1009,7 +1009,7 @@ hash_inner_and_outer(PlannerInfo *root,
/*
* Check if clause has the form "outer op inner" or "inner op outer".
*/
- if (!clause_matches_join(restrictinfo, outerrel, innerrel))
+ if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
continue; /* no good for these input relations */
hashclauses = lappend(hashclauses, restrictinfo);
@@ -1186,7 +1186,7 @@ select_mergejoin_clauses(PlannerInfo *root,
/*
* Check if clause has the form "outer op inner" or "inner op outer".
*/
- if (!clause_matches_join(restrictinfo, outerrel, innerrel))
+ if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
{
have_nonmergeable_joinclause = true;
continue; /* no good for these input relations */