NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commite84d243

committed

Initialize all memory for logical replication relation cache.

As reported by buildfarm animal skink / valgrind, some of thevariables weren't always initialized. To avoid further mishaps usememset to ensure the entire entry is initialized.Author: Petr JelinekReported-By: Andres FreundDiscussion:https://postgr.es/m/20170422183123.w2jgiuxtts7qrqaq@alap3.anarazel.deBackpatch: none, code new in master

1 parent61c21dd commite84d243Copy full SHA for e84d243

File tree

1 file changed

-12

lines changed

src/backend/replication/logical
- relation.c

1 file changed

-12

lines changed

`‎src/backend/replication/logical/relation.c`

Lines changed: 3 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ logicalrep_relmap_invalidate_cb(Datum arg, Oid reloid)`
`82`	`82`	`* Initialize the relation map cache.`
`83`	`83`	`*/`
`84`	`84`	`staticvoid`
`85`		`-logicalrep_relmap_init()`
	`85`	`+logicalrep_relmap_init(void)`
`86`	`86`	`{`
`87`	`87`	`HASHCTLctl;`
`88`	`88`
`@@ -141,19 +141,10 @@ logicalrep_relmap_free_entry(LogicalRepRelMapEntry *entry)`
`141`	`141`	`pfree(remoterel->attnames);`
`142`	`142`	`pfree(remoterel->atttyps);`
`143`	`143`	`}`
`144`		`-remoterel->attnames=NULL;`
`145`		`-remoterel->atttyps=NULL;`
`146`		`-`
`147`	`144`	`bms_free(remoterel->attkeys);`
`148`		`-remoterel->attkeys=NULL;`
`149`	`145`
`150`	`146`	`if (entry->attrmap)`
`151`	`147`	`pfree(entry->attrmap);`
`152`		`-`
`153`		`-entry->attrmap=NULL;`
`154`		`-remoterel->natts=0;`
`155`		`-entry->localreloid=InvalidOid;`
`156`		`-entry->localrel=NULL;`
`157`	`148`	`}`
`158`	`149`
`159`	`150`	`/*`
`@@ -182,6 +173,8 @@ logicalrep_relmap_update(LogicalRepRelation *remoterel)`
`182`	`173`	`if (found)`
`183`	`174`	`logicalrep_relmap_free_entry(entry);`
`184`	`175`
	`176`	`+memset(entry,0,sizeof(LogicalRepRelMapEntry));`
	`177`	`+`
`185`	`178`	`/* Make cached copy of the data */`
`186`	`179`	`oldctx=MemoryContextSwitchTo(LogicalRepRelMapContext);`
`187`	`180`	`entry->remoterel.remoteid=remoterel->remoteid;`
`@@ -197,8 +190,6 @@ logicalrep_relmap_update(LogicalRepRelation *remoterel)`
`197`	`190`	`}`
`198`	`191`	`entry->remoterel.replident=remoterel->replident;`
`199`	`192`	`entry->remoterel.attkeys=bms_copy(remoterel->attkeys);`
`200`		`-entry->attrmap=NULL;`
`201`		`-entry->localreloid=InvalidOid;`
`202`	`193`	`MemoryContextSwitchTo(oldctx);`
`203`	`194`	`}`
`204`	`195`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite84d243

File tree

1 file changed

1 file changed

`‎src/backend/replication/logical/relation.c`

0 commit comments