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/nodeHashjoin.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/nodeHashjoin.c')
| -rw-r--r-- | src/backend/executor/nodeHashjoin.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 668ed871e19..252960c81c5 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -92,6 +92,14 @@ ExecHashJoin(HashJoinState *node) */ for (;;) { + /* + * It's possible to iterate this loop many times before returning a + * tuple, in some pathological cases such as needing to move much of + * the current batch to a later batch. So let's check for interrupts + * each time through. + */ + CHECK_FOR_INTERRUPTS(); + switch (node->hj_JoinState) { case HJ_BUILD_HASHTABLE: @@ -247,13 +255,6 @@ ExecHashJoin(HashJoinState *node) case HJ_SCAN_BUCKET: /* - * We check for interrupts here because this corresponds to - * where we'd fetch a row from a child plan node in other join - * types. - */ - CHECK_FOR_INTERRUPTS(); - - /* * Scan the selected hash bucket for matches to current outer */ if (!ExecScanHashBucket(node, econtext)) |