From 62f4dd3796dac30e2230baa4afbb7d2a626d9373 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Thu, 17 Oct 2019 08:45:43 +0530 Subject: [PATCH] Fix memory leak introduced in commit 7df159a620. We memorize all internal and empty leaf pages in the 1st vacuum stage for gist indexes. They are used in the 2nd stage, to delete all the empty pages. There was a memory context page_set_context for this purpose, but we never used it. Reported-by: Amit Kapila Author: Dilip Kumar Reviewed-by: Amit Kapila Backpatch-through: 12, where it got introduced Discussion: https://postgr.es/m/CAA4eK1LGr+MN0xHZpJ2dfS8QNQ1a_aROKowZB+MPNep8FVtwAA@mail.gmail.com --- src/backend/access/gist/gistvacuum.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c index bf754ea6d0..710e4015b3 100644 --- a/src/backend/access/gist/gistvacuum.c +++ b/src/backend/access/gist/gistvacuum.c @@ -169,6 +169,7 @@ gistvacuumscan(IndexVacuumInfo *info, GistBulkDeleteResult *stats, BlockNumber num_pages; bool needLock; BlockNumber blkno; + MemoryContext oldctx; /* * Reset counts that will be incremented during the scan; needed in case @@ -179,8 +180,17 @@ gistvacuumscan(IndexVacuumInfo *info, GistBulkDeleteResult *stats, stats->stats.pages_deleted = 0; stats->stats.pages_free = 0; MemoryContextReset(stats->page_set_context); + + /* + * Create the integer sets to remember all the internal and the empty leaf + * pages in page_set_context. Internally, the integer set will remember + * this context so that the subsequent allocations for these integer sets + * will be done from the same context. + */ + oldctx = MemoryContextSwitchTo(stats->page_set_context); stats->internal_page_set = intset_create(); stats->empty_leaf_set = intset_create(); + MemoryContextSwitchTo(oldctx); /* Set up info to pass down to gistvacuumpage */ vstate.info = info; -- 2.40.0