Commitd40ade2

committed

Bugfix. Copy of clauses, have got by aqo_get_clauses() has a specific structure

and shouldn't be touched by any postgres machinery except node hash generator.

1 parentad4dd06 commitd40ade2Copy full SHA for d40ade2

File tree

+12

-7

lines changed

+12

-7

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,10 +234,17 @@ aqo_get_parameterized_baserel_size(PlannerInfo *root,`
`234`	`234`	`{`
`235`	`235`	`MemoryContextold_ctx_m;`
`236`	`236`
	`237`	`+selectivities=list_concat(`
	`238`	`+get_selectivities(root,param_clauses,rel->relid,`
	`239`	`+JOIN_INNER,NULL),`
	`240`	`+get_selectivities(root,rel->baserestrictinfo,`
	`241`	`+rel->relid,`
	`242`	`+JOIN_INNER,NULL));`
	`243`	`+`
	`244`	`+/* Make specific copy of clauses with mutated subplans */`
`237`	`245`	`allclauses=list_concat(aqo_get_clauses(root,param_clauses),`
`238`	`246`	`aqo_get_clauses(root,rel->baserestrictinfo));`
`239`		`-selectivities=get_selectivities(root,allclauses,rel->relid,`
`240`		`-JOIN_INNER,NULL);`
	`247`	`+`
`241`	`248`	`rte=planner_rt_fetch(rel->relid,root);`
`242`	`249`	`get_eclasses(allclauses,&nargs,&args_hash,&eclass_hash);`
`243`	`250`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -430,18 +430,16 @@ get_path_clauses(Path path, PlannerInfo root, List **selectivities)`
`430`	`430`	`caseT_ForeignPath:`
`431`	`431`	`/* The same as in the default case */`
`432`	`432`	`default:`
`433`		`-cur=list_concat(aqo_get_clauses(root,`
`434`		`-path->parent->baserestrictinfo),`
	`433`	`+cur=list_concat(list_copy(path->parent->baserestrictinfo),`
`435`	`434`	`path->param_info ?`
`436`		`-aqo_get_clauses(root,`
`437`		`-path->param_info->ppi_clauses) :`
`438`		`-NIL);`
	`435`	`+path->param_info->ppi_clauses :NIL);`
`439`	`436`	`if (path->param_info)`
`440`	`437`	`cur_sel=get_selectivities(root,cur,path->parent->relid,`
`441`	`438`	`JOIN_INNER,NULL);`
`442`	`439`	`else`
`443`	`440`	`cur_sel=get_selectivities(root,cur,0,JOIN_INNER,NULL);`
`444`	`441`	`*selectivities=cur_sel;`
	`442`	`+cur=aqo_get_clauses(root,cur);`
`445`	`443`	`returncur;`
`446`	`444`	`break;`
`447`	`445`	`}`

Comments

(0)