mirror of
https://github.com/postgres/postgres.git
synced 2025-06-13 07:41:39 +03:00
Pass collations to functions in FunctionCallInfoData, not FmgrInfo.
Since collation is effectively an argument, not a property of the function, FmgrInfo is really the wrong place for it; and this becomes critical in cases where a cached FmgrInfo is used for varying purposes that might need different collation settings. Fix by passing it in FunctionCallInfoData instead. In particular this allows a clean fix for bug #5970 (record_cmp not working). This requires touching a bit more code than the original method, but nobody ever thought that collations would not be an invasive patch...
This commit is contained in:
@ -138,11 +138,12 @@ typedef struct MergeJoinClauseData
|
||||
|
||||
/*
|
||||
* The comparison strategy in use, and the lookup info to let us call the
|
||||
* btree comparison support function.
|
||||
* btree comparison support function, and the collation to use.
|
||||
*/
|
||||
bool reverse; /* if true, negate the cmpfn's output */
|
||||
bool nulls_first; /* if true, nulls sort low */
|
||||
FmgrInfo cmpfinfo;
|
||||
Oid collation;
|
||||
} MergeJoinClauseData;
|
||||
|
||||
/* Result type for MJEvalOuterValues and MJEvalInnerValues */
|
||||
@ -242,7 +243,6 @@ MJExamineQuals(List *mergeclauses,
|
||||
|
||||
/* Set up the fmgr lookup information */
|
||||
fmgr_info(cmpproc, &(clause->cmpfinfo));
|
||||
fmgr_info_set_collation(collation, &(clause->cmpfinfo));
|
||||
|
||||
/* Fill the additional comparison-strategy flags */
|
||||
if (opstrategy == BTLessStrategyNumber)
|
||||
@ -254,6 +254,9 @@ MJExamineQuals(List *mergeclauses,
|
||||
|
||||
clause->nulls_first = nulls_first;
|
||||
|
||||
/* ... and the collation too */
|
||||
clause->collation = collation;
|
||||
|
||||
iClause++;
|
||||
}
|
||||
|
||||
@ -429,7 +432,7 @@ MJCompare(MergeJoinState *mergestate)
|
||||
* OK to call the comparison function.
|
||||
*/
|
||||
InitFunctionCallInfoData(fcinfo, &(clause->cmpfinfo), 2,
|
||||
NULL, NULL);
|
||||
clause->collation, NULL, NULL);
|
||||
fcinfo.arg[0] = clause->ldatum;
|
||||
fcinfo.arg[1] = clause->rdatum;
|
||||
fcinfo.argnull[0] = false;
|
||||
|
Reference in New Issue
Block a user