Commit737ab85

committed

1. Pass GISTENTRYs to giststate->penaltyFn by pointers, not by vals.

2. Re-initialize keys in gistrescan (if gist used in inner scan).

1 parent4800abc commit737ab85Copy full SHA for 737ab85

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */`
`987`	`987`	`size=IndexTupleSize(datum)-sizeof(IndexTupleData);`
`988`	`988`	`datum+=sizeof(IndexTupleData);`
`989`	`989`	`gistdentryinit(giststate,&entry,datum,r,p,i,size,FALSE);`
`990`		`-(giststate->penaltyFn)(entry,identry,&usize);`
	`990`	`+(giststate->penaltyFn)(&entry,&identry,&usize);`
`991`	`991`	`if (which_grow<0\|\|usize<which_grow) {`
`992`	`992`	`which=i;`
`993`	`993`	`which_grow=usize;`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,13 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key)`
`118`	`118`	`gistfreestack(p->s_markstk);`
`119`	`119`	`p->s_stack=p->s_markstk= (GISTSTACK*)NULL;`
`120`	`120`	`p->s_flags=0x0;`
	`121`	`+for (i=0;i<s->numberOfKeys;i++)`
	`122`	`+{`
	`123`	`+s->keyData[i].sk_procedure`
	`124`	`+=RelationGetGISTStrategy(s->relation,s->keyData[i].sk_attno,`
	`125`	`+s->keyData[i].sk_procedure);`
	`126`	`+s->keyData[i].sk_func=p->giststate->consistentFn;`
	`127`	`+}`
`121`	`128`	`}else {`
`122`	`129`	`/* initialize opaque data */`
`123`	`130`	`p= (GISTScanOpaque)palloc(sizeof(GISTScanOpaqueData));`

Comments

(0)