diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-01 17:38:54 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-09-01 17:39:01 -0400 |
| commit | 51daa7bdb39e1bdc31eb99fd3f54f61743ebb7ae (patch) | |
| tree | a527c43c5129b7f154b32326337e062202c04010 /src/backend/executor/tqueue.c | |
| parent | c039ba0716383ccaf88c9be1a7f0803a77823de1 (diff) | |
| download | postgresql-51daa7bdb39e1bdc31eb99fd3f54f61743ebb7ae.tar.gz postgresql-51daa7bdb39e1bdc31eb99fd3f54f61743ebb7ae.zip | |
Improve division of labor between execParallel.c and nodeGather[Merge].c.
Move the responsibility for creating/destroying TupleQueueReaders into
execParallel.c, to avoid duplicative coding in nodeGather.c and
nodeGatherMerge.c. Also, instead of having DestroyTupleQueueReader do
shm_mq_detach, do it in the caller (which is now only ExecParallelFinish).
This means execParallel.c does both the attaching and detaching of the
tuple-queue-reader shm_mqs, which seems less weird than the previous
arrangement.
These changes also eliminate a vestigial memory leak (of the pei->tqueue
array). It's now demonstrable that rescans of Gather or GatherMerge don't
leak memory.
Discussion: https://postgr.es/m/8670.1504192177@sss.pgh.pa.us
Diffstat (limited to 'src/backend/executor/tqueue.c')
| -rw-r--r-- | src/backend/executor/tqueue.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/executor/tqueue.c b/src/backend/executor/tqueue.c index ee4bec0385e..6afcd1a30a7 100644 --- a/src/backend/executor/tqueue.c +++ b/src/backend/executor/tqueue.c @@ -651,11 +651,13 @@ CreateTupleQueueReader(shm_mq_handle *handle, TupleDesc tupledesc) /* * Destroy a tuple queue reader. + * + * Note: cleaning up the underlying shm_mq is the caller's responsibility. + * We won't access it here, as it may be detached already. */ void DestroyTupleQueueReader(TupleQueueReader *reader) { - shm_mq_detach(reader->queue); if (reader->typmodmap != NULL) hash_destroy(reader->typmodmap); /* Is it worth trying to free substructure of the remap tree? */ |