opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

2. Re-initialize keys in gistrescan (if gist used in inner scan).
This commit is contained in:
Vadim B. Mikheev 1997-05-22 16:01:33 +00:00
parent 4800abc7c1
commit 737ab85cc0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/gist/gist.c
View File

@ -987,7 +987,7 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
size = IndexTupleSize(datum) - sizeof(IndexTupleData);
datum += sizeof(IndexTupleData);
gistdentryinit(giststate,&entry,datum,r,p,i,size,FALSE);
(giststate->penaltyFn)(entry, identry, &usize);
(giststate->penaltyFn)(&entry, &identry, &usize);
if (which_grow < 0 || usize < which_grow) {
which = i;
which_grow = usize;

7
src/backend/access/gist/gistscan.c
View File

@ -118,6 +118,13 @@ gistrescan(IndexScanDesc s, bool fromEnd, ScanKey key)
gistfreestack(p->s_markstk);
p->s_stack = p->s_markstk = (GISTSTACK *) NULL;
p->s_flags = 0x0;
for (i = 0; i < s->numberOfKeys; i++)
{
s->keyData[i].sk_procedure
= RelationGetGISTStrategy(s->relation, s->keyData[i].sk_attno,
s->keyData[i].sk_procedure);
s->keyData[i].sk_func = p->giststate->consistentFn;
}
} else {
/* initialize opaque data */
p = (GISTScanOpaque) palloc(sizeof(GISTScanOpaqueData));