NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitc380a0d

committed

Prevent ORDER BY for partial match

1 parent6291a92 commitc380a0dCopy full SHA for c380a0d

File tree

2 files changed

+17

-4

lines changed

2 files changed

+17

-4

lines changed

`‎rumget.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ callConsistentFn(RumState * rumstate, RumScanKey key)`
`97`	`97`
`98`	`98`	`for (i=0;i<key->nentries;i++)`
`99`	`99`	`{`
`100`		`-if (key->entryRes[i]&&key->addInfoIsNull[0]== false)`
	`100`	`+if (key->entryRes[i]&&key->addInfoIsNull[i]== false)`
`101`	`101`	`{`
`102`	`102`	`key->outerAddInfoIsNull= false;`
`103`	`103`

`‎rumscan.c`

Lines changed: 16 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,8 @@ freeScanKeys(RumScanOpaque so)`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`staticvoid`
`305`		`-initScanKey(RumScanOpaqueso,ScanKeyskey,bool*hasNullQuery)`
	`305`	`+initScanKey(RumScanOpaqueso,ScanKeyskey,bool*hasNullQuery,`
	`306`	`+bool*hasPartialMatch)`
`306`	`307`	`{`
`307`	`308`	`Datum*queryValues;`
`308`	`309`	`int32nQueryValues=0;`
`@@ -389,6 +390,15 @@ initScanKey(RumScanOpaque so, ScanKey skey, bool *hasNullQuery)`
`389`	`390`	`queryValues, (RumNullCategory*)nullFlags,`
`390`	`391`	`partial_matches,extra_data,`
`391`	`392`	`(skey->sk_flags&SK_ORDER_BY) ? true : false);`
	`393`	`+`
	`394`	`+if (partial_matches&&hasPartialMatch)`
	`395`	`+{`
	`396`	`+int32j;`
	`397`	`+RumScanKeykey=so->keys[so->nkeys-1];`
	`398`	`+`
	`399`	`+for (j=0;*hasPartialMatch== false&&j<key->nentries;j++)`
	`400`	`+*hasPartialMatch \|=key->scanEntry[j]->isPartialMatch;`
	`401`	`+}`
`392`	`402`	`}`
`393`	`403`
`394`	`404`	`staticScanDirection`
`@@ -494,6 +504,7 @@ rumNewScanKey(IndexScanDesc scan)`
`494`	`504`	`inti;`
`495`	`505`	`boolhasNullQuery= false;`
`496`	`506`	`boolcheckEmptyEntry= false;`
	`507`	`+boolhasPartialMatch= false;`
`497`	`508`	`MemoryContextoldCtx;`
`498`	`509`	`enum {`
`499`	`510`	`haofNone=0x00,`
`@@ -520,7 +531,7 @@ rumNewScanKey(IndexScanDesc scan)`
`520`	`531`
`521`	`532`	`for (i=0;i<scan->numberOfKeys;i++)`
`522`	`533`	`{`
`523`		`-initScanKey(so,&scan->keyData[i],&hasNullQuery);`
	`534`	`+initScanKey(so,&scan->keyData[i],&hasNullQuery,&hasPartialMatch);`
`524`	`535`	`if (so->isVoidRes)`
`525`	`536`	`break;`
`526`	`537`	`}`
`@@ -542,7 +553,7 @@ rumNewScanKey(IndexScanDesc scan)`
`542`	`553`
`543`	`554`	`for (i=0;i<scan->numberOfOrderBys;i++)`
`544`	`555`	`{`
`545`		`-initScanKey(so,&scan->orderByData[i],&hasNullQuery);`
	`556`	`+initScanKey(so,&scan->orderByData[i],&hasNullQuery,NULL);`
`546`	`557`	`if (so->isVoidRes)`
`547`	`558`	`break;`
`548`	`559`	`}`
`@@ -610,6 +621,8 @@ rumNewScanKey(IndexScanDesc scan)`
`610`	`621`	`}`
`611`	`622`
`612`	`623`	`adjustScanDirection(so);`
	`624`	`+if (scan->numberOfOrderBys>0&&hasPartialMatch)`
	`625`	`+elog(ERROR,"Partial match and order by index couldn't be used together");`
`613`	`626`
`614`	`627`	`/* initialize expansible array of RumScanEntry pointers */`
`615`	`628`	`so->totalentries=0;`

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!

Commitc380a0d

File tree

2 files changed

2 files changed

`‎rumget.c`

`‎rumscan.c`

0 commit comments