pathman: check if pathman is in shared_preload_libraries

zilder · zilder · commit 4bc7d78e2c2b · 2016-03-10T12:23:17.000+03:00
diff --git a/contrib/pg_pathman/init.c b/contrib/pg_pathman/init.c
@@ -44,13 +44,15 @@ init_shmem_config()
 			pmstate->dsm_init_lock    = LWLockAssign();
 			pmstate->edit_partitions_lock = LWLockAssign();
 		}
+#ifdef WIN32
 		else
 		{
 			elog(ERROR, "Pathman module must be initialized in postmaster. "
 						"Put the following line to configuration file: "
 						"shared_preload_libraries='pg_pathman'");
 			initialization_needed = false;
 		}
+#endif
 	}
 
 	create_relations_hashtable();
diff --git a/contrib/pg_pathman/pg_pathman.c b/contrib/pg_pathman/pg_pathman.c
@@ -103,6 +103,16 @@ static void set_pathkeys(PlannerInfo *root, RelOptInfo *childrel, Path *path);
 void
 _PG_init(void)
 {
+#ifndef WIN32
+	if (IsUnderPostmaster)
+	{
+		elog(ERROR, "Pathman module must be initialized in postmaster. "
+					"Put the following line to configuration file: "
+					"shared_preload_libraries='pg_pathman'");
+	        initialization_needed = false;
+	}
+#endif
+
 	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
`@@ -44,13 +44,15 @@ init_shmem_config()`
`44`	`44`	`pmstate->dsm_init_lock = LWLockAssign();`
`45`	`45`	`pmstate->edit_partitions_lock = LWLockAssign();`
`46`	`46`	`}`
	`47`	`+#ifdef WIN32`
`47`	`48`	`else`
`48`	`49`	`{`
`49`	`50`	`elog(ERROR, "Pathman module must be initialized in postmaster. "`
`50`	`51`	`"Put the following line to configuration file: "`
`51`	`52`	`"shared_preload_libraries='pg_pathman'");`
`52`	`53`	`initialization_needed = false;`
`53`	`54`	`}`
	`55`	`+#endif`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`create_relations_hashtable();`