Commit9a1244f

authored and

Alena Rybakina

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 parent878cd55 commit9a1244fCopy full SHA for 9a1244f

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

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -443,18 +443,16 @@ get_path_clauses(Path path, PlannerInfo root, List **selectivities)`
`443`	`443`	`caseT_ForeignPath:`
`444`	`444`	`/* The same as in the default case */`
`445`	`445`	`default:`
`446`		`-cur=list_concat(aqo_get_clauses(root,`
`447`		`-path->parent->baserestrictinfo),`
	`446`	`+cur=list_concat(list_copy(path->parent->baserestrictinfo),`
`448`	`447`	`path->param_info ?`
`449`		`-aqo_get_clauses(root,`
`450`		`-path->param_info->ppi_clauses) :`
`451`		`-NIL);`
	`448`	`+path->param_info->ppi_clauses :NIL);`
`452`	`449`	`if (path->param_info)`
`453`	`450`	`cur_sel=get_selectivities(root,cur,path->parent->relid,`
`454`	`451`	`JOIN_INNER,NULL);`
`455`	`452`	`else`
`456`	`453`	`cur_sel=get_selectivities(root,cur,0,JOIN_INNER,NULL);`
`457`	`454`	`*selectivities=cur_sel;`
	`455`	`+cur=aqo_get_clauses(root,cur);`
`458`	`456`	`returncur;`
`459`	`457`	`break;`
`460`	`458`	`}`

Comments

(0)