From 9e9b9ac7d1860fbb98eb4db17a94ff25524b6447 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 22 Apr 2011 17:43:18 -0400 Subject: Make a code-cleanup pass over the collations patch. This patch is almost entirely cosmetic --- mostly cleaning up a lot of neglected comments, and fixing code layout problems in places where the patch made lines too long and then pgindent did weird things with that. I did find a bug-of-omission in equalTupleDescs(). --- src/backend/executor/nodeMergejoin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/executor/nodeMergejoin.c') diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 208c0fb76ac..7d27123cf05 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -170,13 +170,13 @@ typedef enum * the two expressions from the original clause. * * In addition to the expressions themselves, the planner passes the btree - * opfamily OID, btree strategy number (BTLessStrategyNumber or + * opfamily OID, collation OID, btree strategy number (BTLessStrategyNumber or * BTGreaterStrategyNumber), and nulls-first flag that identify the intended * sort ordering for each merge key. The mergejoinable operator is an - * equality operator in this opfamily, and the two inputs are guaranteed to be + * equality operator in the opfamily, and the two inputs are guaranteed to be * ordered in either increasing or decreasing (respectively) order according - * to this opfamily, with nulls at the indicated end of the range. This - * allows us to obtain the needed comparison function from the opfamily. + * to the opfamily and collation, with nulls at the indicated end of the range. + * This allows us to obtain the needed comparison function from the opfamily. */ static MergeJoinClause MJExamineQuals(List *mergeclauses, -- cgit v1.2.3