diff options
| author | Andres Freund <andres@anarazel.de> | 2017-07-25 17:37:17 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2017-07-30 16:06:42 -0700 |
| commit | d47cfef7116fb36349949f5c757aa2112c249804 (patch) | |
| tree | 8e75ba762674b200802a11a19edbc3b5777ed5ca /src/backend/executor/nodeSubplan.c | |
| parent | 9dea962b3ef48f6e96172653b7cf80cb5f53e6b6 (diff) | |
| download | postgresql-d47cfef7116fb36349949f5c757aa2112c249804.tar.gz postgresql-d47cfef7116fb36349949f5c757aa2112c249804.zip | |
Move interrupt checking from ExecProcNode() to executor nodes.
In a followup commit ExecProcNode(), and especially the large switch
it contains, will largely be replaced by a function pointer directly
to the correct node. The node functions will then get invoked by a
thin inline function wrapper. To avoid having to include miscadmin.h
in headers - CHECK_FOR_INTERRUPTS() - move the interrupt checks into
the individual executor routines.
While looking through all executor nodes, I noticed a number of
arguably missing interrupt checks, add these too.
Author: Andres Freund, Tom Lane
Reviewed-By: Tom Lane
Discussion:
https://postgr.es/m/22833.1490390175@sss.pgh.pa.us
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index e8fa4c8547c..fe10e809dfb 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -33,6 +33,7 @@ #include "executor/executor.h" #include "executor/nodeSubplan.h" #include "nodes/makefuncs.h" +#include "miscadmin.h" #include "optimizer/clauses.h" #include "utils/array.h" #include "utils/lsyscache.h" @@ -65,6 +66,8 @@ ExecSubPlan(SubPlanState *node, { SubPlan *subplan = node->subplan; + CHECK_FOR_INTERRUPTS(); + /* Set non-null as default */ *isNull = false; @@ -618,6 +621,8 @@ findPartialMatch(TupleHashTable hashtable, TupleTableSlot *slot, InitTupleHashIterator(hashtable, &hashiter); while ((entry = ScanTupleHashTable(hashtable, &hashiter)) != NULL) { + CHECK_FOR_INTERRUPTS(); + ExecStoreMinimalTuple(entry->firstTuple, hashtable->tableslot, false); if (!execTuplesUnequal(slot, hashtable->tableslot, numCols, keyColIdx, |