Commit5373817

committed

Fix strategy propagation to scanEntry for partial match by moving propagation

to initializaion of scanEntry.

1 parentba9f37f commit5373817Copy full SHA for 5373817

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- *$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.18 2008/07/11 21:06:29 tgl Exp $`
	`11`	`+ *$PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.19 2008/09/04 11:47:05 teodor Exp $`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`@@ -395,14 +395,7 @@ startScanKey(Relation index, GinState *ginstate, GinScanKey key)`
`395`	`395`	`return;`
`396`	`396`
`397`	`397`	`for (i=0;i<key->nentries;i++)`
`398`		`-{`
`399`	`398`	`startScanEntry(index,ginstate,key->scanEntry+i);`
`400`		`-/*`
`401`		`- * Copy strategy number to each entry of key to`
`402`		`- * use in comparePartialFn call`
`403`		`- */`
`404`		`-key->scanEntry[i].strategy=key->strategy;`
`405`		`-}`
`406`	`399`
`407`	`400`	`memset(key->entryRes, TRUE,sizeof(bool)*key->nentries);`
`408`	`401`	`key->isFinished= FALSE;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- *$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.17 2008/07/11 21:06:29 tgl Exp $`
	`11`	`+ *$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.18 2008/09/04 11:47:05 teodor Exp $`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`14`	`14`
`@@ -61,6 +61,7 @@ fillScanKey(GinState *ginstate, GinScanKey key, OffsetNumber attnum, Datum query`
`61`	`61`	`key->scanEntry[i].offset=InvalidOffsetNumber;`
`62`	`62`	`key->scanEntry[i].buffer=InvalidBuffer;`
`63`	`63`	`key->scanEntry[i].partialMatch=NULL;`
	`64`	`+key->scanEntry[i].strategy=strategy;`
`64`	`65`	`key->scanEntry[i].list=NULL;`
`65`	`66`	`key->scanEntry[i].nlist=0;`
`66`	`67`	`key->scanEntry[i].isPartialMatch= (ginstate->canPartialMatch[attnum-1]&&partial_matches )`

Comments

(0)