Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9a98dd4

Browse files
committed
Rename new subroutine, per discussion with Robert Haas.
1 parent f7e508a commit 9a98dd4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/backend/optimizer/path/joinpath.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/optimizer/path/joinpath.c,v 1.125 2009/09/18 17:24:51 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/optimizer/path/joinpath.c,v 1.126 2009/09/19 17:48:09 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -155,18 +155,18 @@ add_paths_to_joinrel(PlannerInfo *root,
155155
}
156156

157157
/*
158-
* clause_matches_join
158+
* clause_sides_match_join
159159
* Determine whether a join clause is of the right form to use in this join.
160160
*
161161
* We already know that the clause is a binary opclause referencing only the
162162
* rels in the current join. The point here is to check whether it has the
163163
* form "outerrel_expr op innerrel_expr" or "innerrel_expr op outerrel_expr",
164-
* rather than mixing outer and inner vars on either side. If it is usable,
164+
* rather than mixing outer and inner vars on either side. If it matches,
165165
* we set the transient flag outer_is_left to identify which side is which.
166166
*/
167167
static inline bool
168-
clause_matches_join(RestrictInfo *rinfo, RelOptInfo *outerrel,
169-
RelOptInfo *innerrel)
168+
clause_sides_match_join(RestrictInfo *rinfo, RelOptInfo *outerrel,
169+
RelOptInfo *innerrel)
170170
{
171171
if (bms_is_subset(rinfo->left_relids, outerrel->relids) &&
172172
bms_is_subset(rinfo->right_relids, innerrel->relids))
@@ -267,7 +267,7 @@ join_is_removable(PlannerInfo *root,
267267
/*
268268
* Check if clause has the form "outer op inner" or "inner op outer".
269269
*/
270-
if (!clause_matches_join(restrictinfo, outerrel, innerrel))
270+
if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
271271
continue; /* no good for these input relations */
272272

273273
/* OK, add to list */
@@ -1009,7 +1009,7 @@ hash_inner_and_outer(PlannerInfo *root,
10091009
/*
10101010
* Check if clause has the form "outer op inner" or "inner op outer".
10111011
*/
1012-
if (!clause_matches_join(restrictinfo, outerrel, innerrel))
1012+
if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
10131013
continue; /* no good for these input relations */
10141014

10151015
hashclauses = lappend(hashclauses, restrictinfo);
@@ -1186,7 +1186,7 @@ select_mergejoin_clauses(PlannerInfo *root,
11861186
/*
11871187
* Check if clause has the form "outer op inner" or "inner op outer".
11881188
*/
1189-
if (!clause_matches_join(restrictinfo, outerrel, innerrel))
1189+
if (!clause_sides_match_join(restrictinfo, outerrel, innerrel))
11901190
{
11911191
have_nonmergeable_joinclause = true;
11921192
continue; /* no good for these input relations */

0 commit comments

Comments
 (0)