NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc381326

committed

Guard against parallel-restricted functions in VALUES expressions.

Obvious brain fade in set_rel_consider_parallel(). Noticed it whileadjusting the adjacent RTE_FUNCTION case.In 9.6, also make the code look more like what I just did in HEADby removing the unnecessary function_rte_parallel_ok subroutine(it does nothing that expression_tree_walker wouldn't do).

1 parent0440f49 commitc381326Copy full SHA for c381326

File tree

1 file changed

-27

lines changed

src/backend/optimizer/path
- allpaths.c

1 file changed

-27

lines changed

`‎src/backend/optimizer/path/allpaths.c`

Lines changed: 4 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ static void set_plain_rel_size(PlannerInfo root, RelOptInfo rel,`
`78`	`78`	`staticvoidcreate_plain_partial_paths(PlannerInforoot,RelOptInforel);`
`79`	`79`	`staticvoidset_rel_consider_parallel(PlannerInforoot,RelOptInforel,`
`80`	`80`	`RangeTblEntry*rte);`
`81`		`-staticboolfunction_rte_parallel_ok(RangeTblEntry*rte);`
`82`	`81`	`staticvoidset_plain_rel_pathlist(PlannerInforoot,RelOptInforel,`
`83`	`82`	`RangeTblEntry*rte);`
`84`	`83`	`staticvoidset_tablesample_rel_size(PlannerInforoot,RelOptInforel,`
`@@ -596,16 +595,14 @@ set_rel_consider_parallel(PlannerInfo root, RelOptInfo rel,`
`596`	`595`
`597`	`596`	`caseRTE_FUNCTION:`
`598`	`597`	`/* Check for parallel-restricted functions. */`
`599`		`-if (!function_rte_parallel_ok(rte))`
	`598`	`+if (has_parallel_hazard((Node*)rte->functions, false))`
`600`	`599`	`return;`
`601`	`600`	`break;`
`602`	`601`
`603`	`602`	`caseRTE_VALUES:`
`604`		`-`
`605`		`-/*`
`606`		`- * The data for a VALUES clause is stored in the plan tree itself,`
`607`		`- * so scanning it in a worker is fine.`
`608`		`- */`
	`603`	`+/* Check for parallel-restricted functions. */`
	`604`	`+if (has_parallel_hazard((Node*)rte->values_lists, false))`
	`605`	`+return;`
`609`	`606`	`break;`
`610`	`607`
`611`	`608`	`caseRTE_CTE:`
`@@ -643,26 +640,6 @@ set_rel_consider_parallel(PlannerInfo root, RelOptInfo rel,`
`643`	`640`	`rel->consider_parallel= true;`
`644`	`641`	`}`
`645`	`642`
`646`		`-/*`
`647`		`- * Check whether a function RTE is scanning something parallel-restricted.`
`648`		`- */`
`649`		`-staticbool`
`650`		`-function_rte_parallel_ok(RangeTblEntry*rte)`
`651`		`-{`
`652`		`-ListCell*lc;`
`653`		`-`
`654`		`-foreach(lc,rte->functions)`
`655`		`-{`
`656`		`-RangeTblFunctionrtfunc= (RangeTblFunction)lfirst(lc);`
`657`		`-`
`658`		`-Assert(IsA(rtfunc,RangeTblFunction));`
`659`		`-if (has_parallel_hazard(rtfunc->funcexpr, false))`
`660`		`-return false;`
`661`		`-}`
`662`		`-`
`663`		`-return true;`
`664`		`-}`
`665`		`-`
`666`	`643`	`/*`
`667`	`644`	`* set_plain_rel_pathlist`
`668`	`645`	`* Build access paths for a plain relation (no subquery, no inheritance)`

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!

Commitc381326

File tree

1 file changed

1 file changed

`‎src/backend/optimizer/path/allpaths.c`

0 commit comments