NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commitb3a93b7

Artur Zakirov

committed

Add EMPTY scankey for full-index scan

1 parent5d0122d commitb3a93b7Copy full SHA for b3a93b7

File tree

2 files changed

+14

-5

lines changed

2 files changed

+14

-5

lines changed

`‎rumget.c‎`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,10 @@ callConsistentFn(RumState *rumstate, RumScanKey key)`
`64`	`64`	`*/`
`65`	`65`	`key->recheckCurItem= true;`
`66`	`66`
`67`		`-res=DatumGetBool(FunctionCall10Coll(&rumstate->consistentFn[key->attnum-1],`
	`67`	`+if (key->searchMode==GIN_SEARCH_MODE_INCLUDE_EMPTY)`
	`68`	`+res= true;`
	`69`	`+else`
	`70`	`+res=DatumGetBool(FunctionCall10Coll(&rumstate->consistentFn[key->attnum-1],`
`68`	`71`	`rumstate->supportCollation[key->attnum-1],`
`69`	`72`	`PointerGetDatum(key->entryRes),`
`70`	`73`	`UInt16GetDatum(key->strategy),`
`@@ -87,7 +90,7 @@ callConsistentFn(RumState *rumstate, RumScanKey key)`
`87`	`90`
`88`	`91`	`key->outerAddInfoIsNull= true;`
`89`	`92`
`90`		`-for(i=0;i<key->nuserentries;i++)`
	`93`	`+for(i=0;i<key->nentries/nuserentries/;i++)`
`91`	`94`	`{`
`92`	`95`	`if (key->entryRes[i]&&key->addInfoIsNull[0]== false)`
`93`	`96`	`{`

`‎rumscan.c‎`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ rumbeginscan(Relation rel, int nkeys, int norderbys)`
`41`	`41`	`ALLOCSET_DEFAULT_INITSIZE,`
`42`	`42`	`ALLOCSET_DEFAULT_MAXSIZE);`
`43`	`43`	`so->keyCtx=AllocSetContextCreate(CurrentMemoryContext,`
`44`		`-"Gin scan key context",`
	`44`	`+"Rum scan key context",`
`45`	`45`	`ALLOCSET_DEFAULT_MINSIZE,`
`46`	`46`	`ALLOCSET_DEFAULT_INITSIZE,`
`47`	`47`	`ALLOCSET_DEFAULT_MAXSIZE);`
`@@ -386,6 +386,8 @@ rumNewScanKey(IndexScanDesc scan)`
`386`	`386`	`{`
`387`	`387`	`RumScanOpaqueso= (RumScanOpaque)scan->opaque;`
`388`	`388`	`inti;`
	`389`	`+uint32nkeys,`
	`390`	`+norderbys;`
`389`	`391`	`boolhasNullQuery= false;`
`390`	`392`	`MemoryContextoldCtx;`
`391`	`393`
`@@ -417,13 +419,15 @@ rumNewScanKey(IndexScanDesc scan)`
`417`	`419`	`if (so->isVoidRes)`
`418`	`420`	`break;`
`419`	`421`	`}`
	`422`	`+nkeys=so->nkeys;`
`420`	`423`
`421`	`424`	`for (i=0;i<scan->numberOfOrderBys;i++)`
`422`	`425`	`{`
`423`	`426`	`initScanKey(so,&scan->orderByData[i],&hasNullQuery);`
`424`	`427`	`if (so->isVoidRes)`
`425`	`428`	`break;`
`426`	`429`	`}`
	`430`	`+norderbys=so->nkeys-nkeys;`
`427`	`431`
`428`	`432`	`if (scan->numberOfOrderBys>0)`
`429`	`433`	`{`
`@@ -437,11 +441,13 @@ rumNewScanKey(IndexScanDesc scan)`
`437`	`441`	`* If there are no regular scan keys, generate an EVERYTHING scankey to`
`438`	`442`	`* drive a full-index scan.`
`439`	`443`	`*/`
`440`		`-if (so->nkeys==0&& !so->isVoidRes)`
	`444`	`+if (nkeys==0&& !so->isVoidRes)`
`441`	`445`	`{`
`442`	`446`	`hasNullQuery= true;`
`443`	`447`	`rumFillScanKey(so,FirstOffsetNumber,`
`444`		`-InvalidStrategy,GIN_SEARCH_MODE_EVERYTHING,`
	`448`	`+InvalidStrategy,`
	`449`	`+ (norderbys>0) ?GIN_SEARCH_MODE_INCLUDE_EMPTY :`
	`450`	`+GIN_SEARCH_MODE_EVERYTHING,`
`445`	`451`	`(Datum)0,0,`
`446`	`452`	`NULL,NULL,NULL,NULL, false);`
`447`	`453`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb3a93b7

File tree

2 files changed

2 files changed

`‎rumget.c‎`

`‎rumscan.c‎`

0 commit comments