Further cleanup of ts_headline code.

tglsfdc · tglsfdc · commit 9be664d715eb · 2020-04-09T15:39:02.000-04:00
Suppress a probably-meaningless uninitialized-variable warning (induced by my previous patch, I'm sorry to say). Improve mark_hl_fragments()'s test for overlapping cover strings: it failed to consider the possibility that the current string is strictly within another one. That's unlikely given the preceding splitting into MaxWords fragments, but I don't think it's impossible. Discussion: https://postgr.es/m/16345-2e0cf5cddbdcd3b4@postgresql.org
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
@@ -2434,22 +2434,24 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, bool highlightall,
 			/* Mark the chosen fragments (covers) */
 			mark_fragment(prs, highlightall, startpos, endpos);
 			num_f++;
-			/* exclude overlapping covers */
+			/* Exclude covers overlapping this one from future consideration */
 			for (i = 0; i < numcovers; i++)
 			{
 				if (i != minI &&
-					((covers[i].startpos >= covers[minI].startpos &&
-					  covers[i].startpos <= covers[minI].endpos) ||
-					 (covers[i].endpos >= covers[minI].startpos &&
-					  covers[i].endpos <= covers[minI].endpos)))
+					((covers[i].startpos >= startpos &&
+					  covers[i].startpos <= endpos) ||
+					 (covers[i].endpos >= startpos &&
+					  covers[i].endpos <= endpos) ||
+					 (covers[i].startpos < startpos &&
+					  covers[i].endpos > endpos)))
 					covers[i].excluded = true;
 			}
 		}
 		else
-			break;
+			break;				/* no selectable covers remain */
 	}
 
-	/* show at least min_words if we have not marked anything */
+	/* show the first min_words words if we have not marked anything */
 	if (num_f <= 0)
 	{
 		startpos = endpos = curlen = 0;
@@ -2607,6 +2609,7 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, bool highlightall,
 		if (bestlen < 0)
 		{
 			curlen = 0;
+			pose = 0;
 			for (i = 0; i < prs->curwords && curlen < min_words; i++)
 			{
 				if (!NONWORDTOKEN(prs->words[i].type))

Original file line number	Diff line number	Diff line change
`@@ -2434,22 +2434,24 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, bool highlightall,`
`2434`	`2434`	`/* Mark the chosen fragments (covers) */`
`2435`	`2435`	`mark_fragment(prs, highlightall, startpos, endpos);`
`2436`	`2436`	`num_f++;`
`2437`		`- /* exclude overlapping covers */`
	`2437`	`+ /* Exclude covers overlapping this one from future consideration */`
`2438`	`2438`	`for (i = 0; i < numcovers; i++)`
`2439`	`2439`	`{`
`2440`	`2440`	`if (i != minI &&`
`2441`		`- ((covers[i].startpos >= covers[minI].startpos &&`
`2442`		`- covers[i].startpos <= covers[minI].endpos) \|\|`
`2443`		`- (covers[i].endpos >= covers[minI].startpos &&`
`2444`		`- covers[i].endpos <= covers[minI].endpos)))`
	`2441`	`+ ((covers[i].startpos >= startpos &&`
	`2442`	`+ covers[i].startpos <= endpos) \|\|`
	`2443`	`+ (covers[i].endpos >= startpos &&`
	`2444`	`+ covers[i].endpos <= endpos) \|\|`
	`2445`	`+ (covers[i].startpos < startpos &&`
	`2446`	`+ covers[i].endpos > endpos)))`
`2445`	`2447`	`covers[i].excluded = true;`
`2446`	`2448`	`}`
`2447`	`2449`	`}`
`2448`	`2450`	`else`
`2449`		`- break;`
	`2451`	`+ break; /* no selectable covers remain */`
`2450`	`2452`	`}`
`2451`	`2453`
`2452`		`- /* show at least min_words if we have not marked anything */`
	`2454`	`+ /* show the first min_words words if we have not marked anything */`
`2453`	`2455`	`if (num_f <= 0)`
`2454`	`2456`	`{`
`2455`	`2457`	`startpos = endpos = curlen = 0;`
`@@ -2607,6 +2609,7 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, bool highlightall,`
`2607`	`2609`	`if (bestlen < 0)`
`2608`	`2610`	`{`
`2609`	`2611`	`curlen = 0;`
	`2612`	`+ pose = 0;`
`2610`	`2613`	`for (i = 0; i < prs->curwords && curlen < min_words; i++)`
`2611`	`2614`	`{`
`2612`	`2615`	`if (!NONWORDTOKEN(prs->words[i].type))`