NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit006850e

committed

Load configuration in post_parse_analyze hook

1 parent5ee80cc commit006850eCopy full SHA for 006850e

File tree

1 file changed

+20

-5

lines changed

pg_pathman.c

1 file changed

+20

-5

lines changed

`‎pg_pathman.c`

Lines changed: 20 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include"optimizer/planner.h"`
`23`	`23`	`#include"optimizer/restrictinfo.h"`
`24`	`24`	`#include"optimizer/cost.h"`
	`25`	`+#include"parser/analyze.h"`
`25`	`26`	`#include"parser/parsetree.h"`
`26`	`27`	`#include"utils/hsearch.h"`
`27`	`28`	`#include"utils/tqual.h"`
`@@ -56,6 +57,7 @@ typedef struct`
`56`	`57`	`/* Original hooks */`
`57`	`58`	`staticset_rel_pathlist_hook_typeset_rel_pathlist_hook_original=NULL;`
`58`	`59`	`staticshmem_startup_hook_typeshmem_startup_hook_original=NULL;`
	`60`	`+staticpost_parse_analyze_hook_typepost_parse_analyze_hook_original=NULL;`
`59`	`61`	`staticplanner_hook_typeplanner_hook_original=NULL;`
`60`	`62`
`61`	`63`	`/* pg module functions */`
`@@ -65,6 +67,7 @@ void _PG_fini(void);`
`65`	`67`	`/* Hook functions */`
`66`	`68`	`staticvoidpathman_shmem_startup(void);`
`67`	`69`	`staticvoidpathman_set_rel_pathlist_hook(PlannerInforoot,RelOptInforel,Indexrti,RangeTblEntry*rte);`
	`70`	`+voidpathman_post_parse_analysis_hook(ParseStatepstate,Queryquery);`
`68`	`71`	`staticPlannedStmtpathman_planner_hook(Queryparse,intcursorOptions,ParamListInfoboundParams);`
`69`	`72`
`70`	`73`	`/* Utility functions */`
`@@ -135,6 +138,8 @@ _PG_init(void)`
`135`	`138`	`set_rel_pathlist_hook=pathman_set_rel_pathlist_hook;`
`136`	`139`	`shmem_startup_hook_original=shmem_startup_hook;`
`137`	`140`	`shmem_startup_hook=pathman_shmem_startup;`
	`141`	`+post_parse_analyze_hook_original=post_parse_analyze_hook;`
	`142`	`+post_parse_analyze_hook=pathman_post_parse_analysis_hook;`
`138`	`143`	`planner_hook_original=planner_hook;`
`139`	`144`	`planner_hook=pathman_planner_hook;`
`140`	`145`	`}`
`@@ -144,6 +149,7 @@ _PG_fini(void)`
`144`	`149`	`{`
`145`	`150`	`set_rel_pathlist_hook=set_rel_pathlist_hook_original;`
`146`	`151`	`shmem_startup_hook=shmem_startup_hook_original;`
	`152`	`+post_parse_analyze_hook=post_parse_analyze_hook_original;`
`147`	`153`	`planner_hook=planner_hook_original;`
`148`	`154`	`}`
`149`	`155`
`@@ -186,6 +192,20 @@ get_cmp_func(Oid type1, Oid type2)`
`186`	`192`	`returncmp_func;`
`187`	`193`	`}`
`188`	`194`
	`195`	`+/*`
	`196`	`+ * Post parse analysis hook. It makes sure the config is loaded before executing`
	`197`	`+ * any statement, including utility commands`
	`198`	`+ */`
	`199`	`+void`
	`200`	`+pathman_post_parse_analysis_hook(ParseStatepstate,Queryquery)`
	`201`	`+{`
	`202`	`+if (initialization_needed)`
	`203`	`+load_config();`
	`204`	`+`
	`205`	`+if (post_parse_analyze_hook_original)`
	`206`	`+post_parse_analyze_hook_original(pstate,query);`
	`207`	`+}`
	`208`	`+`
`189`	`209`	`/*`
`190`	`210`	`* Planner hook. It disables inheritance for tables that have been partitioned`
`191`	`211`	`* by pathman to prevent standart PostgreSQL partitioning mechanism from`
`@@ -197,11 +217,6 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)`
`197`	`217`	`PlannedStmt*result;`
`198`	`218`	`ListCell*lc;`
`199`	`219`
`200`		`-if (initialization_needed)`
`201`		`-{`
`202`		`-load_config();`
`203`		`-}`
`204`		`-`
`205`	`220`	`inheritance_disabled= false;`
`206`	`221`	`switch(parse->commandType)`
`207`	`222`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit006850e

File tree

1 file changed

1 file changed

`‎pg_pathman.c`

0 commit comments