Clean code

Artur Zakirov · Artur Zakirov · commit 7c8334b85bc7 · 2016-05-30T11:37:33.000+03:00
diff --git a/rumget.c b/rumget.c
@@ -89,7 +89,7 @@ callConsistentFn(RumState *rumstate, RumScanKey key)
 
 		key->outerAddInfoIsNull = true;
 
-		for(i = 0; i < key->nentries/*nuserentries*/; i++)
+		for(i = 0; i < key->nentries; i++)
 		{
 			if (key->entryRes[i] && key->addInfoIsNull[0] == false)
 			{
@@ -691,7 +691,8 @@ startScanEntry(RumState *rumstate, RumScanEntry entry)
 			entry->isFinished = FALSE;
 		}
 	}
-	else if (entry->searchMode == GIN_SEARCH_MODE_EVERYTHING)
+	else if (entry->queryCategory == RUM_CAT_EMPTY_QUERY &&
+			 entry->searchMode == GIN_SEARCH_MODE_EVERYTHING)
 	{
 		btreeEntry.findItem(&btreeEntry, stackEntry);
 		collectMatchRumKey(&btreeEntry, stackEntry, entry);
diff --git a/rumscan.c b/rumscan.c
@@ -419,10 +419,10 @@ rumNewScanKey(IndexScanDesc scan)
 			break;
 	}
 	/*
-	 * If there are no regular scan keys, generate an EMPTY scankey to
+	 * If there are no regular scan keys, generate an EVERYTHING scankey to
 	 * drive a full-index scan.
 	 */
-	if (so->nkeys == 0 && scan->numberOfOrderBys > 0 && !so->isVoidRes)
+	if (so->nkeys == 0 && !so->isVoidRes)
 	{
 		hasNullQuery = true;
 		rumFillScanKey(so, FirstOffsetNumber,
@@ -447,20 +447,6 @@ rumNewScanKey(IndexScanDesc scan)
 			   scan->numberOfOrderBys);
 	}
 
-	/*
-	 * If there are no regular scan keys, generate an EVERYTHING scankey to
-	 * drive a full-index scan.
-	 */
-	if (so->nkeys == 0 && !so->isVoidRes)
-	{
-		hasNullQuery = true;
-		rumFillScanKey(so, FirstOffsetNumber,
-					   InvalidStrategy,
-					   GIN_SEARCH_MODE_EVERYTHING,
-					   (Datum) 0, 0,
-					   NULL, NULL, NULL, NULL, false);
-	}
-
 	MemoryContextSwitchTo(oldCtx);
 
 	pgstat_count_index_scan(scan->indexRelation);

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`		`- else if (entry->searchMode == GIN_SEARCH_MODE_EVERYTHING)`
	`694`	`+ else if (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);`