diff options
Diffstat (limited to 'src/backend/regex/regc_nfa.c')
| -rw-r--r-- | src/backend/regex/regc_nfa.c | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c index 60fb0bec5d7..f1819a24f6d 100644 --- a/src/backend/regex/regc_nfa.c +++ b/src/backend/regex/regc_nfa.c @@ -143,11 +143,7 @@ newstate(struct nfa *nfa) * compilation, since no code path will go very long without making a new * state or arc. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return NULL; - } + INTERRUPT(nfa->v->re); /* first, recycle anything that's on the freelist */ if (nfa->freestates != NULL) @@ -297,11 +293,7 @@ newarc(struct nfa *nfa, * compilation, since no code path will go very long without making a new * state or arc. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); /* check for duplicate arc, using whichever chain is shorter */ if (from->nouts <= to->nins) @@ -825,11 +817,7 @@ moveins(struct nfa *nfa, * Because we bypass newarc() in this code path, we'd better include a * cancel check. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); sortins(nfa, oldState); sortins(nfa, newState); @@ -929,11 +917,7 @@ copyins(struct nfa *nfa, * Because we bypass newarc() in this code path, we'd better include a * cancel check. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); sortins(nfa, oldState); sortins(nfa, newState); @@ -1000,11 +984,7 @@ mergeins(struct nfa *nfa, * Because we bypass newarc() in this code path, we'd better include a * cancel check. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); /* Sort existing inarcs as well as proposed new ones */ sortins(nfa, s); @@ -1125,11 +1105,7 @@ moveouts(struct nfa *nfa, * Because we bypass newarc() in this code path, we'd better include a * cancel check. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); sortouts(nfa, oldState); sortouts(nfa, newState); @@ -1226,11 +1202,7 @@ copyouts(struct nfa *nfa, * Because we bypass newarc() in this code path, we'd better include a * cancel check. */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return; - } + INTERRUPT(nfa->v->re); sortouts(nfa, oldState); sortouts(nfa, newState); @@ -3282,11 +3254,7 @@ checkmatchall_recurse(struct nfa *nfa, struct state *s, bool **haspaths) return false; /* In case the search takes a long time, check for cancel */ - if (CANCEL_REQUESTED(nfa->v->re)) - { - NERR(REG_CANCEL); - return false; - } + INTERRUPT(nfa->v->re); /* Create a haspath array for this state */ haspath = (bool *) MALLOC((DUPINF + 2) * sizeof(bool)); |