Commit8de9ace

committed

pathman: initialization check added

1 parent4299f24 commit8de9aceCopy full SHA for 8de9ace

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 1 addition & 1 deletion

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, (constvoid*)&parent_oid,HASH_REMOVE,&found);`
`298`	`298`	`}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include"pathman.h"`
`2`	`2`	`#include"postgres.h"`
`3`	`3`	`#include"fmgr.h"`
	`4`	`+#include"miscadmin.h"`
`4`	`5`	`#include"nodes/nodeFuncs.h"`
`5`	`6`	`#include"nodes/pg_list.h"`
`6`	`7`	`#include"nodes/relation.h"`
`@@ -100,6 +101,14 @@ static void set_pathkeys(PlannerInfo root, RelOptInfo childrel, Path *path);`
`100`	`101`	`void`
`101`	`102`	`_PG_init(void)`
`102`	`103`	`{`
	`104`	`+if (IsUnderPostmaster)`
	`105`	`+{`
	`106`	`+elog(ERROR,"Pathman module must be initialized in postmaster. "`
	`107`	`+"Put the following line to configuration file: "`
	`108`	`+"shared_preload_library = 'pathman'");`
	`109`	`+initialization_needed= false;`
	`110`	`+}`
	`111`	`+`
`103`	`112`	`set_rel_pathlist_hook_original=set_rel_pathlist_hook;`
`104`	`113`	`set_rel_pathlist_hook=pathman_set_rel_pathlist_hook;`
`105`	`114`	`shmem_startup_hook_original=shmem_startup_hook;`

Comments

(0)