Commit98d44c0

committed

check for all param types in rel_pathlist_hook, fixes

1 parentc4b0063 commit98d44c0Copy full SHA for 98d44c0

File tree

+11

-14

lines changed

+11

-14

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -272,8 +272,11 @@ pathman_rel_pathlist_hook(PlannerInfo root, RelOptInfo rel, Index rti, RangeTb`
`272`	`272`	`quals=extract_actual_clauses(child_rel->baserestrictinfo, false);`
`273`	`273`
`274`	`274`	`/* Do not proceed if there's a rel containing quals without params */`
`275`		`-if (!clause_contains_extern_params((Node*)quals))`
	`275`	`+if (!clause_contains_params((Node*)quals))`
	`276`	`+{`
	`277`	`+picky_quals=NIL;/* skip this path */`
`276`	`278`	`break;`
	`279`	`+}`
`277`	`280`
`278`	`281`	`/* Replace child Vars with a parent rel's Var */`
`279`	`282`	`quals= (List)replace_child_vars_with_parent_var((Node)quals,`

Lines changed: 6 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,31 +5,25 @@`
`5`	`5`	`#include"rewrite/rewriteManip.h"`
`6`	`6`
`7`	`7`
`8`		`-staticboolclause_contains_extern_params_walker(Nodenode,voidcontext);`
	`8`	`+staticboolclause_contains_params_walker(Nodenode,voidcontext);`
`9`	`9`
`10`	`10`	`bool`
`11`		`-clause_contains_extern_params(Node*clause)`
	`11`	`+clause_contains_params(Node*clause)`
`12`	`12`	`{`
`13`	`13`	`returnexpression_tree_walker(clause,`
`14`		`-clause_contains_extern_params_walker,`
	`14`	`+clause_contains_params_walker,`
`15`	`15`	`NULL);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`staticbool`
`19`		`-clause_contains_extern_params_walker(Nodenode,voidcontext)`
	`19`	`+clause_contains_params_walker(Nodenode,voidcontext)`
`20`	`20`	`{`
`21`	`21`	`if (node==NULL)`
`22`	`22`	`return false;`
`23`	`23`	`if (IsA(node,Param))`
`24`		`-{`
`25`		`-Paramparam= (Param)node;`
`26`		`-`
`27`		`-if (param->paramkind==PARAM_EXTERN)`
`28`		`-return true;`
`29`		`-return false;`
`30`		`-}`
	`24`	`+return true;`
`31`	`25`	`returnexpression_tree_walker(node,`
`32`		`-clause_contains_extern_params_walker,`
	`26`	`+clause_contains_params_walker,`
`33`	`27`	`context);`
`34`	`28`	`}`
`35`	`29`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ typedef struct`
`12`	`12`	`intsublevels_up;`
`13`	`13`	`}ReplaceVarsContext;`
`14`	`14`
`15`		`-boolclause_contains_extern_params(Node*clause);`
	`15`	`+boolclause_contains_params(Node*clause);`
`16`	`16`
`17`	`17`	`Nodereplace_child_vars_with_parent_var(Nodenode,`
`18`	`18`	`ReplaceVarsContext*context);`

Comments

(0)