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 /contrib | |
| 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 'contrib')
| -rw-r--r-- | contrib/btree_gin/btree_gin.c | 2 | ||||
| -rw-r--r-- | contrib/btree_gist/btree_text.c | 30 |
2 files changed, 25 insertions, 7 deletions
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c index 144f6db1846..7ca153e0928 100644 --- a/contrib/btree_gin/btree_gin.c +++ b/contrib/btree_gin/btree_gin.c @@ -121,7 +121,7 @@ gin_compare_prefix_##type(PG_FUNCTION_ARGS) \ int32 res, \ cmp; \ \ - cmp = DatumGetInt32(DirectFunctionCall2WithCollation( \ + cmp = DatumGetInt32(DirectFunctionCall2Coll( \ TypeInfo_##type.typecmp, \ DEFAULT_COLLATION_OID, \ (data->strategy == BTLessStrategyNumber || \ diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c index 665dfe78b44..c6b57f82de9 100644 --- a/contrib/btree_gist/btree_text.c +++ b/contrib/btree_gist/btree_text.c @@ -33,37 +33,55 @@ Datum gbt_text_same(PG_FUNCTION_ARGS); static bool gbt_textgt(const void *a, const void *b) { - return (DatumGetBool(DirectFunctionCall2WithCollation(text_gt, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b)))); + return DatumGetBool(DirectFunctionCall2Coll(text_gt, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static bool gbt_textge(const void *a, const void *b) { - return (DatumGetBool(DirectFunctionCall2WithCollation(text_ge, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b)))); + return DatumGetBool(DirectFunctionCall2Coll(text_ge, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static bool gbt_texteq(const void *a, const void *b) { - return (DatumGetBool(DirectFunctionCall2WithCollation(texteq, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b)))); + return DatumGetBool(DirectFunctionCall2Coll(texteq, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static bool gbt_textle(const void *a, const void *b) { - return (DatumGetBool(DirectFunctionCall2WithCollation(text_le, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b)))); + return DatumGetBool(DirectFunctionCall2Coll(text_le, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static bool gbt_textlt(const void *a, const void *b) { - return (DatumGetBool(DirectFunctionCall2WithCollation(text_lt, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b)))); + return DatumGetBool(DirectFunctionCall2Coll(text_lt, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static int32 gbt_textcmp(const bytea *a, const bytea *b) { - return DatumGetInt32(DirectFunctionCall2WithCollation(bttextcmp, DEFAULT_COLLATION_OID, PointerGetDatum(a), PointerGetDatum(b))); + return DatumGetInt32(DirectFunctionCall2Coll(bttextcmp, + DEFAULT_COLLATION_OID, + PointerGetDatum(a), + PointerGetDatum(b))); } static gbtree_vinfo tinfo = |