Commit7c8334b

Artur Zakirov

committed

Clean code

1 parent9038ba2 commit7c8334bCopy full SHA for 7c8334b

File tree

-18

lines changed

-18

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ callConsistentFn(RumState *rumstate, RumScanKey key)`
`89`	`89`
`90`	`90`	`key->outerAddInfoIsNull= true;`
`91`	`91`
`92`		`-for(i=0;i<key->nentries/nuserentries/;i++)`
	`92`	`+for(i=0;i<key->nentries;i++)`
`93`	`93`	`{`
`94`	`94`	`if (key->entryRes[i]&&key->addInfoIsNull[0]== false)`
`95`	`95`	`{`
`@@ -691,7 +691,8 @@ startScanEntry(RumState *rumstate, RumScanEntry entry)`
`691`	`691`	`entry->isFinished= FALSE;`
`692`	`692`	`}`
`693`	`693`	`}`
`694`		`-elseif (entry->searchMode==GIN_SEARCH_MODE_EVERYTHING)`
	`694`	`+elseif (entry->queryCategory==RUM_CAT_EMPTY_QUERY&&`
	`695`	`+entry->searchMode==GIN_SEARCH_MODE_EVERYTHING)`
`695`	`696`	`{`
`696`	`697`	`btreeEntry.findItem(&btreeEntry,stackEntry);`
`697`	`698`	`collectMatchRumKey(&btreeEntry,stackEntry,entry);`

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -419,10 +419,10 @@ rumNewScanKey(IndexScanDesc scan)`
`419`	`419`	`break;`
`420`	`420`	`}`
`421`	`421`	`/*`
`422`		`- * If there are no regular scan keys, generate anEMPTY scankey to`
	`422`	`+ * If there are no regular scan keys, generate anEVERYTHING scankey to`
`423`	`423`	`* drive a full-index scan.`
`424`	`424`	`*/`
`425`		`-if (so->nkeys==0&&scan->numberOfOrderBys>0&&!so->isVoidRes)`
	`425`	`+if (so->nkeys==0&& !so->isVoidRes)`
`426`	`426`	`{`
`427`	`427`	`hasNullQuery= true;`
`428`	`428`	`rumFillScanKey(so,FirstOffsetNumber,`
`@@ -447,20 +447,6 @@ rumNewScanKey(IndexScanDesc scan)`
`447`	`447`	`scan->numberOfOrderBys);`
`448`	`448`	`}`
`449`	`449`
`450`		`-/*`
`451`		`- * If there are no regular scan keys, generate an EVERYTHING scankey to`
`452`		`- * drive a full-index scan.`
`453`		`- */`
`454`		`-if (so->nkeys==0&& !so->isVoidRes)`
`455`		`-{`
`456`		`-hasNullQuery= true;`
`457`		`-rumFillScanKey(so,FirstOffsetNumber,`
`458`		`-InvalidStrategy,`
`459`		`-GIN_SEARCH_MODE_EVERYTHING,`
`460`		`- (Datum)0,0,`
`461`		`-NULL,NULL,NULL,NULL, false);`
`462`		`-}`
`463`		`-`
`464`	`450`	`MemoryContextSwitchTo(oldCtx);`
`465`	`451`
`466`	`452`	`pgstat_count_index_scan(scan->indexRelation);`

Comments

(0)