several bugfixes, detect that pathman has been dropped more reliably

funbringer · funbringer · commit f83386318af7 · 2016-08-12T16:38:39.000+03:00
diff --git a/src/init.c b/src/init.c
@@ -83,7 +83,7 @@ static int oid_cmp(const void *p1, const void *p2);
 void
 load_config(void)
 {
-	/* Cache PATHMAN_CONFIG relation Oid */
+	/* Cache PATHMAN_CONFIG relation's Oid */
 	pathman_config_relid = get_relname_relid(PATHMAN_CONFIG, get_pathman_schema());
 
 	init_local_cache();		/* create 'partitioned_rels' hash table */
@@ -99,7 +99,7 @@ load_config(void)
 	/* Mark pg_pathman as initialized */
 	initialization_needed = false;
 
-	elog(DEBUG2, "pg_pathman's config has been loaded successfully");
+	elog(DEBUG2, "pg_pathman's config has been loaded successfully [%u]", MyProcPid);
 }
 
 /*
@@ -108,12 +108,15 @@ load_config(void)
 void
 unload_config(void)
 {
+	/* Don't forget to reset cached PATHMAN_CONFIG relation's Oid */
+	pathman_config_relid = InvalidOid;
+
 	fini_local_cache();		/* destroy 'partitioned_rels' hash table */
 
 	/* Mark pg_pathman as uninitialized */
 	initialization_needed = true;
 
-	elog(DEBUG2, "pg_pathman's config has been unloaded successfully");
+	elog(DEBUG2, "pg_pathman's config has been unloaded successfully [%u]", MyProcPid);
 }
 
 /*
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -2078,6 +2078,9 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 	}
 }
 
+/*
+ * Get cached PATHMAN_CONFIG relation Oid.
+ */
 Oid
 get_pathman_config_relid(void)
 {
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -137,7 +137,10 @@ refresh_pathman_relation_info(Oid relid,
 
 	/* If there's no children at all, remove this entry */
 	if (prel_children_count == 0)
+	{
 		remove_pathman_relation_info(relid);
+		return NULL;
+	}
 
 	/*
 	 * Fill 'prel' with partition info, raise ERROR if anything is wrong.
@@ -306,10 +309,18 @@ finish_delayed_invalidation(void)
 		/* Handle the probable 'DROP EXTENSION' case */
 		if (delayed_shutdown)
 		{
+			Oid	cur_pathman_config_relid;
+
+			/* Unset 'shutdown' flag */
 			delayed_shutdown = false;
 
+			/* Get current PATHMAN_CONFIG relid */
+			cur_pathman_config_relid = get_relname_relid(PATHMAN_CONFIG,
+														 get_pathman_schema());
+
 			/* Check that PATHMAN_CONFIG table has indeed been dropped */
-			if (InvalidOid == get_relname_relid(PATHMAN_CONFIG, get_pathman_schema()))
+			if (cur_pathman_config_relid == InvalidOid ||
+				cur_pathman_config_relid != get_pathman_config_relid())
 			{
 				/* Ok, let's unload pg_pathman's config */
 				unload_config();

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`	`{`