Skip to content

Commit 61729e9

Browse files
committed
Fix bug where GIN scan keys were not initialized with gin_fuzzy_search_limit.
When gin_fuzzy_search_limit was used, we could jump out of startScan() without calling startScanKey(). That was harmless in 9.3 and below, because startScanKey()() didn't do anything interesting, but in 9.4 it initializes information needed for skipping entries (aka GIN fast scans), and you readily get a segfault if it's not done. Nevertheless, it was clearly wrong all along, so backpatch all the way to 9.1 where the early return was introduced. (AFAICS startScanKey() did nothing useful in 9.3 and below, because the fields it initialized were already initialized in ginFillScanKey(), but I don't dare to change that in a minor release. ginFillScanKey() is always called in gingetbitmap() even though there's a check there to see if the scan keys have already been initialized, because they never are; ginrescan() free's them.) In the passing, remove unnecessary if-check from the second inner loop in startScan(). We already check in the first loop that the condition is true for all entries. Reported by Olaf Gawenda, bug #12694, Backpatch to 9.1 and above, although AFAICS it causes a live bug only in 9.4.
1 parent 8e36028 commit 61729e9

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/backend/access/gin/ginget.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,17 +509,24 @@ startScan(IndexScanDesc scan)
509509
* supposition isn't true), that total result will not more than
510510
* minimal predictNumberResult.
511511
*/
512+
bool reduce = true;
512513

513514
for (i = 0; i < so->totalentries; i++)
515+
{
514516
if (so->entries[i]->predictNumberResult <= so->totalentries * GinFuzzySearchLimit)
515-
return;
516-
517-
for (i = 0; i < so->totalentries; i++)
518-
if (so->entries[i]->predictNumberResult > so->totalentries * GinFuzzySearchLimit)
517+
{
518+
reduce = false;
519+
break;
520+
}
521+
}
522+
if (reduce)
523+
{
524+
for (i = 0; i < so->totalentries; i++)
519525
{
520526
so->entries[i]->predictNumberResult /= so->totalentries;
521527
so->entries[i]->reduceResult = TRUE;
522528
}
529+
}
523530
}
524531

525532
for (i = 0; i < so->nkeys; i++)

0 commit comments

Comments
 (0)