Commitc5ba352

committed

Fix merge confilict merging GiST ordering

2 parentsfe7a11d +62e0ade commitc5ba352Copy full SHA for c5ba352

File tree

-0

lines changed

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,10 @@ gistrescan(PG_FUNCTION_ARGS)`
`230`	`230`	`{`
`231`	`231`	`ScanKeyskey=scan->keyData+i;`
`232`	`232`
	`233`	`+/*`
	`234`	`+ * Copy consistent support function to ScanKey structure`
	`235`	`+ * instead of function implementing filtering operator.`
	`236`	`+ */`
`233`	`237`	`fmgr_info_copy(&(skey->sk_func),`
`234`	`238`	`&(so->giststate->consistentFn[skey->sk_attno-1]),`
`235`	`239`	`so->giststate->scanCxt);`
`@@ -299,6 +303,10 @@ gistrescan(PG_FUNCTION_ARGS)`
`299`	`303`	`*/`
`300`	`304`	`so->orderByTypes[i]=get_func_rettype(skey->sk_func.fn_oid);`
`301`	`305`
	`306`	`+/*`
	`307`	`+ * Copy distance support function to ScanKey structure`
	`308`	`+ * instead of function implementing ordering operator.`
	`309`	`+ */`
`302`	`310`	`fmgr_info_copy(&(skey->sk_func),finfo,so->giststate->scanCxt);`
`303`	`311`
`304`	`312`	`/* Restore prior fn_extra pointers, if not first time */`

Comments

(0)