Commit9f51be4

committed

Purge prel_resowner hashtable in fini_local_cache.

Wobbling with it in 'resonwner_prel_callback' after all cache was purged is anerror.

1 parent5f6de23 commit9f51be4Copy full SHA for 9f51be4

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,7 @@ void init_relation_info_static_data(void);`
`401`	`401`	`/* For pg_pathman.enable_bounds_cache GUC */`
`402`	`402`	`externboolpg_pathman_enable_bounds_cache;`
`403`	`403`
	`404`	`+externHTAB*prel_resowner;`
`404`	`405`
`405`	`406`	`/* This allows us to track leakers of PartRelationInfo */`
`406`	`407`	`#ifdefUSE_RELINFO_LEAK_TRACKER`
`@@ -419,7 +420,7 @@ extern intprel_resowner_line;`
`419`	`420`	`close_pathman_relation_info(prel); \`
`420`	`421`	`prel = NULL; \`
`421`	`422`	`} while (0)`
`422`		`-#endif`
	`423`	`+#endif/* USE_RELINFO_LEAK_TRACKER */`
`423`	`424`
`424`	`425`
`425`	`426`	`#endif/* RELATION_INFO_H */`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,12 @@ fini_local_cache(void)`
`389`	`389`	`status_cache=NULL;`
`390`	`390`	`bounds_cache=NULL;`
`391`	`391`
	`392`	`+if (prel_resowner!=NULL)`
	`393`	`+{`
	`394`	`+hash_destroy(prel_resowner);`
	`395`	`+prel_resowner=NULL;`
	`396`	`+}`
	`397`	`+`
`392`	`398`	`/* Now we can clear allocations */`
`393`	`399`	`MemoryContextReset(PathmanParentsCacheContext);`
`394`	`400`	`MemoryContextReset(PathmanStatusCacheContext);`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -129,8 +129,9 @@ static booldelayed_shutdown = false; /* pathman was dropped */`
`129`	`129`
`130`	`130`	`/*`
`131`	`131`	`* PartRelationInfo is controlled by ResourceOwner;`
	`132`	`+ * resowner -> List of controlled PartRelationInfos by this ResourceOwner`
`132`	`133`	`*/`
`133`		`-staticHTAB*prel_resowner=NULL;`
	`134`	`+HTAB*prel_resowner=NULL;`
`134`	`135`
`135`	`136`
`136`	`137`	`/* Handy wrappers for Oids */`

Comments

(0)