Fix my brain fade in TRUNCATE triggers patch: can't release relcache refcounts

while EState still contains pointers to those relations.  Exposed by the
CLOBBER_CACHE_ALWAYS tests that buildfarm member jaguar is running (I knew
those cycles would pay off...)

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 55c50f9a0f4046991a25cff370e108d0a923080f..94f33923495d15cf1d95b24af2984d0295b92ed1 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -662,8 +662,6 @@ ExecuteTruncate(TruncateStmt *stmt)
                heap_relid = RelationGetRelid(rel);
                toast_relid = rel->rd_rel->reltoastrelid;
 
-               heap_close(rel, NoLock);
-
                /*
                 * The same for the toast table, if any.
                 */
@@ -696,6 +694,14 @@ ExecuteTruncate(TruncateStmt *stmt)
 
        /* We can clean up the EState now */
        FreeExecutorState(estate);
+
+       /* And close the rels (can't do this while EState still holds refs) */
+       foreach(cell, rels)
+       {
+               Relation        rel = (Relation) lfirst(cell);
+
+               heap_close(rel, NoLock);
+       }
 }
 
 /*