pathman: initialization check added

zilder · zilder · commit 8de9ace95860 · 2016-01-22T17:14:24.000+03:00
diff --git a/contrib/pathman/init.c b/contrib/pathman/init.c
@@ -292,7 +292,7 @@ load_check_constraints(Oid parent_oid)
 		{
 			if (ranges[i].max > ranges[i+1].min)
 			{
-				elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u..",
+				elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u...",
 					 ranges[i].child_oid, ranges[i+1].child_oid, parent_oid);
 				hash_search(relations, (const void *) &parent_oid, HASH_REMOVE, &found);
 			}
diff --git a/contrib/pathman/pathman.c b/contrib/pathman/pathman.c
@@ -1,6 +1,7 @@
 #include "pathman.h"
 #include "postgres.h"
 #include "fmgr.h"
+#include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
@@ -100,6 +101,14 @@ static void set_pathkeys(PlannerInfo *root, RelOptInfo *childrel, Path *path);
 void
 _PG_init(void)
 {
+	if (IsUnderPostmaster)
+	{
+		elog(ERROR, "Pathman module must be initialized in postmaster. "
+					"Put the following line to configuration file: "
+					"shared_preload_library = 'pathman'");
+		initialization_needed = false;
+	}
+
 	set_rel_pathlist_hook_original = set_rel_pathlist_hook;
 	set_rel_pathlist_hook = pathman_set_rel_pathlist_hook;
 	shmem_startup_hook_original = shmem_startup_hook;

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ load_check_constraints(Oid parent_oid)`
`292`	`292`	`{`
`293`	`293`	`if (ranges[i].max > ranges[i+1].min)`
`294`	`294`	`{`
`295`		`- elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u..",`
	`295`	`+ elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u...",`
`296`	`296`	`ranges[i].child_oid, ranges[i+1].child_oid, parent_oid);`
`297`	`297`	`hash_search(relations, (const void *) &parent_oid, HASH_REMOVE, &found);`
`298`	`298`	`}`