Commitf833863

committed

several bugfixes, detect that pathman has been dropped more reliably

1 parent2d49398 commitf833863Copy full SHA for f833863

File tree

+21

-4

lines changed

+21

-4

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static int oid_cmp(const void p1, const void p2);`
`83`	`83`	`void`
`84`	`84`	`load_config(void)`
`85`	`85`	`{`
`86`		`-/* Cache PATHMAN_CONFIG relation Oid */`
	`86`	`+/* Cache PATHMAN_CONFIG relation's Oid */`
`87`	`87`	`pathman_config_relid=get_relname_relid(PATHMAN_CONFIG,get_pathman_schema());`
`88`	`88`
`89`	`89`	`init_local_cache();/* create 'partitioned_rels' hash table */`
`@@ -99,7 +99,7 @@ load_config(void)`
`99`	`99`	`/* Mark pg_pathman as initialized */`
`100`	`100`	`initialization_needed= false;`
`101`	`101`
`102`		`-elog(DEBUG2,"pg_pathman's config has been loaded successfully");`
	`102`	`+elog(DEBUG2,"pg_pathman's config has been loaded successfully [%u]",MyProcPid);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/*`
`@@ -108,12 +108,15 @@ load_config(void)`
`108`	`108`	`void`
`109`	`109`	`unload_config(void)`
`110`	`110`	`{`
	`111`	`+/* Don't forget to reset cached PATHMAN_CONFIG relation's Oid */`
	`112`	`+pathman_config_relid=InvalidOid;`
	`113`	`+`
`111`	`114`	`fini_local_cache();/* destroy 'partitioned_rels' hash table */`
`112`	`115`
`113`	`116`	`/* Mark pg_pathman as uninitialized */`
`114`	`117`	`initialization_needed= true;`
`115`	`118`
`116`		`-elog(DEBUG2,"pg_pathman's config has been unloaded successfully");`
	`119`	`+elog(DEBUG2,"pg_pathman's config has been unloaded successfully [%u]",MyProcPid);`
`117`	`120`	`}`
`118`	`121`
`119`	`122`	`/*`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2078,6 +2078,9 @@ generate_mergeappend_paths(PlannerInfo root, RelOptInfo rel,`
`2078`	`2078`	`}`
`2079`	`2079`	`}`
`2080`	`2080`
	`2081`	`+/*`
	`2082`	`+ * Get cached PATHMAN_CONFIG relation Oid.`
	`2083`	`+ */`
`2081`	`2084`	`Oid`
`2082`	`2085`	`get_pathman_config_relid(void)`
`2083`	`2086`	`{`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,10 @@ refresh_pathman_relation_info(Oid relid,`
`137`	`137`
`138`	`138`	`/* If there's no children at all, remove this entry */`
`139`	`139`	`if (prel_children_count==0)`
	`140`	`+{`
`140`	`141`	`remove_pathman_relation_info(relid);`
	`142`	`+returnNULL;`
	`143`	`+}`
`141`	`144`
`142`	`145`	`/*`
`143`	`146`	`* Fill 'prel' with partition info, raise ERROR if anything is wrong.`
`@@ -306,10 +309,18 @@ finish_delayed_invalidation(void)`
`306`	`309`	`/* Handle the probable 'DROP EXTENSION' case */`
`307`	`310`	`if (delayed_shutdown)`
`308`	`311`	`{`
	`312`	`+Oidcur_pathman_config_relid;`
	`313`	`+`
	`314`	`+/* Unset 'shutdown' flag */`
`309`	`315`	`delayed_shutdown= false;`
`310`	`316`
	`317`	`+/* Get current PATHMAN_CONFIG relid */`
	`318`	`+cur_pathman_config_relid=get_relname_relid(PATHMAN_CONFIG,`
	`319`	`+get_pathman_schema());`
	`320`	`+`
`311`	`321`	`/* Check that PATHMAN_CONFIG table has indeed been dropped */`
`312`		`-if (InvalidOid==get_relname_relid(PATHMAN_CONFIG,get_pathman_schema()))`
	`322`	`+if (cur_pathman_config_relid==InvalidOid\|\|`
	`323`	`+cur_pathman_config_relid!=get_pathman_config_relid())`
`313`	`324`	`{`
`314`	`325`	`/* Ok, let's unload pg_pathman's config */`
`315`	`326`	`unload_config();`

Comments

(0)