postgres.git / summary / log / commit / refs

commit    ac0e2d387a044faed310cbfe2fae78ecb0f6a4b6
Author:   Amit Kapila <akapila@postgresql.org>
Date:     Thu Jun 23 03:53:46 2022 +0000
First released in: 15.0, 10.22, 11.17, 12.12, 13.8, 14.5

    Fix memory leak due to LogicalRepRelMapEntry.attrmap.
    
    When rebuilding the relation mapping on subscribers, we were not releasing
    the attribute mapping's memory which was no longer required.
    
    The attribute mapping used in logical tuple conversion was refactored in
    PG13 (by commit e1551f96e6) but we forgot to update the related code that
    frees the attribute map.
    
    Author: Hou Zhijie
    Reviewed-by: Amit Langote, Amit Kapila, Shi yu
    Backpatch-through: 10, where it was introduced
    Discussion: https://postgr.es/m/OSZPR01MB6310F46CD425A967E4AEF736FDA49@OSZPR01MB6310.jpnprd01.prod.outlook.com


 src/backend/replication/logical/relation.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c
index 46475f32482..e989047681d 100644
--- a/src/backend/replication/logical/relation.c
+++ b/src/backend/replication/logical/relation.c
@@ -144,7 +144,7 @@ logicalrep_relmap_free_entry(LogicalRepRelMapEntry *entry)
 	bms_free(remoterel->attkeys);
 
 	if (entry->attrmap)
-		pfree(entry->attrmap);
+		free_attrmap(entry->attrmap);
 }
 
 /*
@@ -373,6 +373,13 @@ logicalrep_rel_open(LogicalRepRelId remoteid, LOCKMODE lockmode)
 		int			i;
 		Bitmapset  *missingatts;
 
+		/* Release the no-longer-useful attrmap, if any. */
+		if (entry->attrmap)
+		{
+			free_attrmap(entry->attrmap);
+			entry->attrmap = NULL;
+		}
+
 		/* Try to find and lock the relation by name. */
 		relid = RangeVarGetRelid(makeRangeVar(remoterel->nspname,
 											  remoterel->relname, -1),
@@ -620,6 +627,13 @@ logicalrep_partition_open(LogicalRepRelMapEntry *root,
 		part_entry->partoid = partOid;
 	}
 
+	/* Release the no-longer-useful attrmap, if any. */
+	if (entry->attrmap)
+	{
+		free_attrmap(entry->attrmap);
+		entry->attrmap = NULL;
+	}
+
 	if (!entry->remoterel.remoteid)
 	{
 		int			i;


[parent: ca7a0d1d3682]