Commitcc14415

committed

Avoid some code duplication in map_partition_varattnos().

Code to map attribute numbers in map_partition_varattnos() duplicateswhat convert_tuples_by_name_map() does. Avoid that.Amit Langote, per a report from Álvaro Herrera.Discussion:http://postgr.es/m/9ce97382-54c8-deb3-9ee9-a2ec271d866b%40lab.ntt.co.jp

1 parent8a8afe2 commitcc14415Copy full SHA for cc14415

File tree

-17

lines changed

-17

lines changed

Lines changed: 4 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -917,32 +917,19 @@ List *`
`917`	`917`	`map_partition_varattnos(List*expr,inttarget_varno,`
`918`	`918`	`Relationpartrel,Relationparent)`
`919`	`919`	`{`
`920`		`-TupleDesctupdesc=RelationGetDescr(parent);`
`921`		`-AttrNumberattno;`
`922`	`920`	`AttrNumber*part_attnos;`
`923`	`921`	`boolfound_whole_row;`
`924`	`922`
`925`	`923`	`if (expr==NIL)`
`926`	`924`	`returnNIL;`
`927`	`925`
`928`		`-part_attnos= (AttrNumber)palloc0(tupdesc->nattssizeof(AttrNumber));`
`929`		`-for (attno=1;attno <=tupdesc->natts;attno++)`
`930`		`-{`
`931`		`-Form_pg_attributeattribute=tupdesc->attrs[attno-1];`
`932`		`-char*attname=NameStr(attribute->attname);`
`933`		`-AttrNumberpart_attno;`
`934`		`-`
`935`		`-if (attribute->attisdropped)`
`936`		`-continue;`
`937`		`-`
`938`		`-part_attno=get_attnum(RelationGetRelid(partrel),attname);`
`939`		`-part_attnos[attno-1]=part_attno;`
`940`		`-}`
`941`		`-`
	`926`	`+part_attnos=convert_tuples_by_name_map(RelationGetDescr(partrel),`
	`927`	`+RelationGetDescr(parent),`
	`928`	`+gettext_noop("could not convert row type"));`
`942`	`929`	`expr= (List)map_variable_attnos((Node)expr,`
`943`	`930`	`target_varno,0,`
`944`	`931`	`part_attnos,`
`945`		`-tupdesc->natts,`
	`932`	`+RelationGetDescr(parent)->natts,`
`946`	`933`	`&found_whole_row);`
`947`	`934`	`/* There can never be a whole-row reference here */`
`948`	`935`	`if (found_whole_row)`

Comments

(0)