From d9910a96c9bd73c16e29ecaa0577945d5e1c091c Mon Sep 17 00:00:00 2001 From: Andreas Seltenreich Date: Sun, 30 Oct 2016 03:25:55 +0100 Subject: [PATCH] Add CHECK_FOR_INTERRUPTS in tsquery_rewrite loop. The loop in findeq() appears to have exponential complexity and runtime becomes excessive for more than about 30 tokens in the tsvectors. Add a CHECK_FOR_INTERRUPTS to make it cancellable. --- src/backend/utils/adt/tsquery_rewrite.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index 28f328d..ef6444f 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -95,6 +95,10 @@ findeq(QTNode *node, QTNode *ex, QTNode *subs, bool *isfind) do { + /* This loop is rather heavyweight, it better be + * cancellable. */ + CHECK_FOR_INTERRUPTS(); + tnode->sign = 0; for (i = 0; i < ex->nchild; i++) { -- 2.9.3