database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-19 23:22:23 +03:00
Code Activity

Add comments and a missing CHECK_FOR_INTERRUPTS in ts_headline.

Browse Source 
I just spent an annoying amount of time reverse-engineering the
100%-undocumented API between ts_headline and the text search
parser's prsheadline function.  Add some commentary about that
while it's fresh in mind.  Also remove some unused macros in
wparser_def.c.

While at it, I noticed that when commit 78e73e875 added a
CHECK_FOR_INTERRUPTS call in TS_execute_recurse, it missed
doing so in the parallel function TS_phrase_execute, which
surely needs one just as much.

Back-patch because of the missing CHECK_FOR_INTERRUPTS.
Might as well back-patch the rest of this too.
This commit is contained in:
Tom Lane
2022-11-21 17:07:07 -05:00
parent 140c803723
commit c0eed88914
4 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/utils/adt/tsvector_op.c
View File

@@ -1609,6 +1609,9 @@ TS_phrase_execute(QueryItem *curitem, void *arg, uint32 flags,
/* since this function recurses, it could be driven to stack overflow */
check_stack_depth();
/* ... and let's check for query cancel while we're at it */
CHECK_FOR_INTERRUPTS();
if (curitem->type == QI_VAL)
{
if (!chkcond(arg, (QueryOperand *) curitem, data))