NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitbd54b37

committed

Merge branch 'picky_nodes' into arrange_append

2 parentsfc50c38 +bc3ec59 commitbd54b37Copy full SHA for bd54b37

File tree

3 files changed

+16

-13

lines changed

3 files changed

+16

-13

lines changed

`‎pg_pathman.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,14 +161,14 @@ _PG_init(void)`
`161`	`161`	`runtimeappend_plan_methods.CustomName="RuntimeAppend";`
`162`	`162`	`runtimeappend_plan_methods.CreateCustomScanState=runtimeappend_create_scan_state;`
`163`	`163`
`164`		`-runtimeppend_exec_methods.CustomName="RuntimeAppend";`
`165`		`-runtimeppend_exec_methods.BeginCustomScan=runtimeappend_begin;`
`166`		`-runtimeppend_exec_methods.ExecCustomScan=runtimeappend_exec;`
`167`		`-runtimeppend_exec_methods.EndCustomScan=runtimeappend_end;`
`168`		`-runtimeppend_exec_methods.ReScanCustomScan=runtimeappend_rescan;`
`169`		`-runtimeppend_exec_methods.MarkPosCustomScan=NULL;`
`170`		`-runtimeppend_exec_methods.RestrPosCustomScan=NULL;`
`171`		`-runtimeppend_exec_methods.ExplainCustomScan=runtimeppend_explain;`
	`164`	`+runtimeappend_exec_methods.CustomName="RuntimeAppend";`
	`165`	`+runtimeappend_exec_methods.BeginCustomScan=runtimeappend_begin;`
	`166`	`+runtimeappend_exec_methods.ExecCustomScan=runtimeappend_exec;`
	`167`	`+runtimeappend_exec_methods.EndCustomScan=runtimeappend_end;`
	`168`	`+runtimeappend_exec_methods.ReScanCustomScan=runtimeappend_rescan;`
	`169`	`+runtimeappend_exec_methods.MarkPosCustomScan=NULL;`
	`170`	`+runtimeappend_exec_methods.RestrPosCustomScan=NULL;`
	`171`	`+runtimeappend_exec_methods.ExplainCustomScan=runtimeappend_explain;`
`172`	`172`
`173`	`173`	`DefineCustomBoolVariable("pg_pathman.enable",`
`174`	`174`	`"Enables pg_pathman's optimizations during the planner stage",`

`‎runtimeappend.c`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`* ------------------------------------------------------------------------`
`9`	`9`	`*/`
`10`	`10`	`#include"postgres.h"`
	`11`	`+#include"utils/memutils.h"`
`11`	`12`	`#include"runtimeappend.h"`
`12`	`13`	`#include"pathman.h"`
`13`	`14`
`@@ -16,7 +17,7 @@ boolpg_pathman_enable_runtimeappend = true;`
`16`	`17`
`17`	`18`	`CustomPathMethodsruntimeappend_path_methods;`
`18`	`19`	`CustomScanMethodsruntimeappend_plan_methods;`
`19`		`-CustomExecMethodsruntimeppend_exec_methods;`
	`20`	`+CustomExecMethodsruntimeappend_exec_methods;`
`20`	`21`
`21`	`22`
`22`	`23`	`Path*`
`@@ -48,7 +49,7 @@ Node *`
`48`	`49`	`runtimeappend_create_scan_state(CustomScan*node)`
`49`	`50`	`{`
`50`	`51`	`returncreate_append_scan_state_common(node,`
`51`		`-&runtimeppend_exec_methods,`
	`52`	`+&runtimeappend_exec_methods,`
`52`	`53`	`sizeof(RuntimeAppendState));`
`53`	`54`	`}`
`54`	`55`
`@@ -84,6 +85,8 @@ runtimeappend_exec(CustomScanState *node)`
`84`	`85`	`quals=ExecQual(scan_state->custom_expr_states,`
`85`	`86`	`node->ss.ps.ps_ExprContext, false);`
`86`	`87`
	`88`	`+ResetExprContext(node->ss.ps.ps_ExprContext);`
	`89`	`+`
`87`	`90`	`if (quals)`
`88`	`91`	`returnslot;`
`89`	`92`	`}`
`@@ -109,7 +112,7 @@ runtimeappend_rescan(CustomScanState *node)`
`109`	`112`	`}`
`110`	`113`
`111`	`114`	`void`
`112`		`-runtimeppend_explain(CustomScanStatenode,Listancestors,ExplainState*es)`
	`115`	`+runtimeappend_explain(CustomScanStatenode,Listancestors,ExplainState*es)`
`113`	`116`	`{`
`114`	`117`	`RuntimeAppendStatescan_state= (RuntimeAppendState)node;`
`115`	`118`

`‎runtimeappend.h`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ extern boolpg_pathman_enable_runtimeappend;`
`54`	`54`
`55`	`55`	`externCustomPathMethodsruntimeappend_path_methods;`
`56`	`56`	`externCustomScanMethodsruntimeappend_plan_methods;`
`57`		`-externCustomExecMethodsruntimeppend_exec_methods;`
	`57`	`+externCustomExecMethodsruntimeappend_exec_methods;`
`58`	`58`
`59`	`59`	`Pathcreate_runtimeappend_path(PlannerInforoot,AppendPath*inner_append,`
`60`	`60`	`ParamPathInfoparam_info,Listruntime_clauses,`
`@@ -74,6 +74,6 @@ void runtimeappend_end(CustomScanState *node);`
`74`	`74`
`75`	`75`	`voidruntimeappend_rescan(CustomScanState*node);`
`76`	`76`
`77`		`-voidruntimeppend_explain(CustomScanStatenode,Listancestors,ExplainState*es);`
	`77`	`+voidruntimeappend_explain(CustomScanStatenode,Listancestors,ExplainState*es);`
`78`	`78`
`79`	`79`	`#endif`

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!

Commitbd54b37

File tree

3 files changed

3 files changed

`‎pg_pathman.c`

`‎runtimeappend.c`

`‎runtimeappend.h`

0 commit comments