diff options
| author | Tom Lane | 2011-04-12 23:19:24 +0000 |
|---|---|---|
| committer | Tom Lane | 2011-04-12 23:19:24 +0000 |
| commit | d64713df7e5996ab3ab337b5e0901cf2c53773f9 (patch) | |
| tree | 7105a61bf9fef5cef674cea7f1305dfeb77aa39a /src/include/utils | |
| parent | 88543ecfec9c754b5f14b898bccbc68d941748b3 (diff) | |
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...
Diffstat (limited to 'src/include/utils')
| -rw-r--r-- | src/include/utils/selfuncs.h | 3 | ||||
| -rw-r--r-- | src/include/utils/tuplesort.h | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index c1b417ad8f..dd38a0292f 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -135,7 +135,8 @@ extern Pattern_Prefix_Status pattern_fixed_prefix(Const *patt, Oid collation, Const **prefix, Const **rest); -extern Const *make_greater_string(const Const *str_const, FmgrInfo *ltproc); +extern Const *make_greater_string(const Const *str_const, FmgrInfo *ltproc, + Oid collation); extern Datum eqsel(PG_FUNCTION_ARGS); extern Datum neqsel(PG_FUNCTION_ARGS); diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index a2085df869..1ebcbfe172 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -60,7 +60,8 @@ typedef struct Tuplesortstate Tuplesortstate; extern Tuplesortstate *tuplesort_begin_heap(TupleDesc tupDesc, int nkeys, AttrNumber *attNums, - Oid *sortOperators, Oid *collations, bool *nullsFirstFlags, + Oid *sortOperators, Oid *sortCollations, + bool *nullsFirstFlags, int workMem, bool randomAccess); extern Tuplesortstate *tuplesort_begin_cluster(TupleDesc tupDesc, Relation indexRel, @@ -72,7 +73,8 @@ extern Tuplesortstate *tuplesort_begin_index_hash(Relation indexRel, uint32 hash_mask, int workMem, bool randomAccess); extern Tuplesortstate *tuplesort_begin_datum(Oid datumType, - Oid sortOperator, Oid sortCollation, bool nullsFirstFlag, + Oid sortOperator, Oid sortCollation, + bool nullsFirstFlag, int workMem, bool randomAccess); extern void tuplesort_set_bound(Tuplesortstate *state, int64 bound); @@ -125,6 +127,7 @@ extern void SelectSortFunction(Oid sortOperator, bool nulls_first, * reverse-sort and NULLs-ordering properly. */ extern int32 ApplySortFunction(FmgrInfo *sortFunction, int sortFlags, + Oid collation, Datum datum1, bool isNull1, Datum datum2, bool isNull2); |