diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-02-15 16:40:06 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-02-15 16:40:06 -0500 |
| commit | 6a4941f8c622df999614f2a5819ee99db99f70ee (patch) | |
| tree | 96b347415d7f7897c10d0e42a63895165d6a0247 | |
| parent | b167d57d5af09527af61952296f1db8761cbee38 (diff) | |
| download | postgresql-6a4941f8c622df999614f2a5819ee99db99f70ee.tar.gz postgresql-6a4941f8c622df999614f2a5819ee99db99f70ee.zip | |
Make sure that hash join's bulk-tuple-transfer loops are interruptible.
The loops in ExecHashJoinNewBatch(), ExecHashIncreaseNumBatches(), and
ExecHashRemoveNextSkewBucket() are all capable of iterating over many
tuples without ever doing a CHECK_FOR_INTERRUPTS, so that the backend
might fail to respond to SIGINT or SIGTERM for an unreasonably long time.
Fix that. In the case of ExecHashJoinNewBatch(), it seems useful to put
the added CHECK_FOR_INTERRUPTS into ExecHashJoinGetSavedTuple() rather
than directly in the loop, because that will also ensure that both
principal code paths through ExecHashJoinOuterGetTuple() will do a
CHECK_FOR_INTERRUPTS, which seems like a good idea to avoid surprises.
Back-patch to all supported branches.
Tom Lane and Thomas Munro
Discussion: https://postgr.es/m/6044.1487121720@sss.pgh.pa.us
| -rw-r--r-- | src/backend/executor/nodeHash.c | 6 | ||||
| -rw-r--r-- | src/backend/executor/nodeHashjoin.c | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index fbad0f3f13f..a192fa6a8ad 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -667,6 +667,9 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable) } tuple = nexttuple; + + /* allow this loop to be cancellable */ + CHECK_FOR_INTERRUPTS(); } } @@ -1438,6 +1441,9 @@ ExecHashRemoveNextSkewBucket(HashJoinTable hashtable) } hashTuple = nextHashTuple; + + /* allow this loop to be cancellable */ + CHECK_FOR_INTERRUPTS(); } /* diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index ff03f169bf6..6c12eb5e428 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -912,6 +912,13 @@ ExecHashJoinGetSavedTuple(HashJoinState *hjstate, MinimalTuple tuple; /* + * We check for interrupts here because this is typically taken as an + * alternative code path to an ExecProcNode() call, which would include + * such a check. + */ + CHECK_FOR_INTERRUPTS(); + + /* * Since both the hash value and the MinimalTuple length word are uint32, * we can read them both in one BufFileRead() call without any type * cheating. |