Check readiness in add_to_pathman_config

ildus · ildus · commit 02e0db7650d4 · 2018-11-19T18:46:28.000+03:00
diff --git a/expected/pathman_calamity.out b/expected/pathman_calamity.out
@@ -1005,7 +1005,7 @@ SHOW pg_pathman.enable;
 (1 row)
 
 SELECT add_to_pathman_config('calamity.survivor', 'val', '10');	/* not ok */
-ERROR:  pg_pathman is not initialized yet
+ERROR:  pg_pathman is disabled
 SELECT * FROM pathman_partition_list;							/* not ok */
 ERROR:  pg_pathman is not initialized yet
 SELECT get_part_range('calamity.survivor', 0, NULL::INT);		/* not ok */
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -740,6 +740,9 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 
 	PathmanInitState	init_state;
 
+	if (!IsPathmanReady())
+		elog(ERROR, "pg_pathman is disabled");
+
 	if (!PG_ARGISNULL(0))
 	{
 		relid = PG_GETARG_OID(0);

Original file line number	Diff line number	Diff line change
`@@ -740,6 +740,9 @@ add_to_pathman_config(PG_FUNCTION_ARGS)`
`740`	`740`
`741`	`741`	`PathmanInitState init_state;`
`742`	`742`
	`743`	`+ if (!IsPathmanReady())`
	`744`	`+ elog(ERROR, "pg_pathman is disabled");`
	`745`	`+`
`743`	`746`	`if (!PG_ARGISNULL(0))`
`744`	`747`	`{`
`745`	`748`	`relid = PG_GETARG_OID(0);`