diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-12 19:19:24 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-12 19:19:24 -0400 |
| commit | d64713df7e5996ab3ab337b5e0901cf2c53773f9 (patch) | |
| tree | 7105a61bf9fef5cef674cea7f1305dfeb77aa39a /src/backend/access/gist/gistscan.c | |
| parent | 88543ecfec9c754b5f14b898bccbc68d941748b3 (diff) | |
| download | postgresql-d64713df7e5996ab3ab337b5e0901cf2c53773f9.tar.gz postgresql-d64713df7e5996ab3ab337b5e0901cf2c53773f9.zip | |
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/backend/access/gist/gistscan.c')
| -rw-r--r-- | src/backend/access/gist/gistscan.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 67308ed37e5..5662a3a4aab 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -169,8 +169,7 @@ gistrescan(PG_FUNCTION_ARGS) * comparisons. The original operator is passed to the Consistent * function in the form of its strategy number, which is available * from the sk_strategy field, and its subtype from the sk_subtype - * field. Also, preserve sk_func.fn_collation which is the input - * collation for the operator. + * field. * * Next, if any of keys is a NULL and that key is not marked with * SK_SEARCHNULL/SK_SEARCHNOTNULL then nothing can be found (ie, we @@ -181,10 +180,8 @@ gistrescan(PG_FUNCTION_ARGS) for (i = 0; i < scan->numberOfKeys; i++) { ScanKey skey = scan->keyData + i; - Oid collation = skey->sk_func.fn_collation; skey->sk_func = so->giststate->consistentFn[skey->sk_attno - 1]; - skey->sk_func.fn_collation = collation; if (skey->sk_flags & SK_ISNULL) { @@ -205,16 +202,13 @@ gistrescan(PG_FUNCTION_ARGS) * all comparisons. The original operator is passed to the Distance * function in the form of its strategy number, which is available * from the sk_strategy field, and its subtype from the sk_subtype - * field. Also, preserve sk_func.fn_collation which is the input - * collation for the operator. + * field. */ for (i = 0; i < scan->numberOfOrderBys; i++) { ScanKey skey = scan->orderByData + i; - Oid collation = skey->sk_func.fn_collation; skey->sk_func = so->giststate->distanceFn[skey->sk_attno - 1]; - skey->sk_func.fn_collation = collation; /* Check we actually have a distance function ... */ if (!OidIsValid(skey->sk_func.fn_oid)) |