diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/gist/gistscan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 31758a1c8fe..328e54b85ed 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -229,6 +229,10 @@ gistrescan(IndexScanDesc scan, ScanKey key, int nkeys, { ScanKey skey = scan->keyData + i; + /* + * Copy consistent support function to ScanKey structure + * instead of function implementing filtering operator. + */ fmgr_info_copy(&(skey->sk_func), &(so->giststate->consistentFn[skey->sk_attno - 1]), so->giststate->scanCxt); @@ -284,8 +288,6 @@ gistrescan(IndexScanDesc scan, ScanKey key, int nkeys, GIST_DISTANCE_PROC, skey->sk_attno, RelationGetRelationName(scan->indexRelation)); - fmgr_info_copy(&(skey->sk_func), finfo, so->giststate->scanCxt); - /* * Look up the datatype returned by the original ordering * operator. GiST always uses a float8 for the distance function, @@ -300,6 +302,12 @@ gistrescan(IndexScanDesc scan, ScanKey key, int nkeys, */ so->orderByTypes[i] = get_func_rettype(skey->sk_func.fn_oid); + /* + * Copy distance support function to ScanKey structure + * instead of function implementing ordering operator. + */ + fmgr_info_copy(&(skey->sk_func), finfo, so->giststate->scanCxt); + /* Restore prior fn_extra pointers, if not first time */ if (!first_time) skey->sk_func.fn_extra = fn_extras[i]; |