rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further cleanup of ts_headline code. 

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
This commit is contained in:
Tom Lane 2020-04-09 15:38:43 -04:00
parent a4d4f59196
commit 2e0e409e3c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/tsearch/wparser_def.c
View File

@ -2337,22 +2337,24 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, bool highlightall,
/* Mark the chosen fragments (covers) */ /* Mark the chosen fragments (covers) */
mark_fragment(prs, highlightall, startpos, endpos); mark_fragment(prs, highlightall, startpos, endpos);
num_f++; num_f++;
/* exclude overlapping covers */ /* Exclude covers overlapping this one from future consideration */
for (i = 0; i < numcovers; i++) for (i = 0; i < numcovers; i++)
{ {
if (i != minI && if (i != minI &&
((covers[i].startpos >= covers[minI].startpos && ((covers[i].startpos >= startpos &&
covers[i].startpos <= covers[minI].endpos) || covers[i].startpos <= endpos) ||
(covers[i].endpos >= covers[minI].startpos && (covers[i].endpos >= startpos &&
covers[i].endpos <= covers[minI].endpos))) covers[i].endpos <= endpos) ||
(covers[i].startpos < startpos &&
covers[i].endpos > endpos)))
covers[i].excluded = true; covers[i].excluded = true;
} }
} }
else 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) if (num_f <= 0)
{ {
startpos = endpos = curlen = 0; startpos = endpos = curlen = 0;
@ -2510,6 +2512,7 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, bool highlightall,
if (bestlen < 0) if (bestlen < 0)
{ {
curlen = 0; curlen = 0;
pose = 0;
for (i = 0; i < prs->curwords && curlen < min_words; i++) for (i = 0; i < prs->curwords && curlen < min_words; i++)
{ {
if (!NONWORDTOKEN(prs->words[i].type)) if (!NONWORDTOKEN(prs->words[i].type))