rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid some code duplication in map_partition_varattnos(). 

Code to map attribute numbers in map_partition_varattnos() duplicates
what 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
This commit is contained in:
Robert Haas 2017-01-19 14:13:15 -05:00
parent 8a8afe2f54
commit cc144155f7
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/backend/catalog/partition.c
View File

@ -917,32 +917,19 @@ List *
map_partition_varattnos(List *expr, int target_varno,
Relation partrel, Relation parent)
{
TupleDesc tupdesc = RelationGetDescr(parent);
AttrNumber attno;
AttrNumber *part_attnos;
bool found_whole_row;
if (expr == NIL)
return NIL;
part_attnos = (AttrNumber *) palloc0(tupdesc->natts * sizeof(AttrNumber));
for (attno = 1; attno <= tupdesc->natts; attno++)
{
Form_pg_attribute attribute = tupdesc->attrs[attno - 1];
char *attname = NameStr(attribute->attname);
AttrNumber part_attno;
if (attribute->attisdropped)
continue;
part_attno = get_attnum(RelationGetRelid(partrel), attname);
part_attnos[attno - 1] = part_attno;
}
part_attnos = convert_tuples_by_name_map(RelationGetDescr(partrel),
RelationGetDescr(parent),
gettext_noop("could not convert row type"));
expr = (List *) map_variable_attnos((Node *) expr,
target_varno, 0,
part_attnos,
tupdesc->natts,
RelationGetDescr(parent)->natts,
&found_whole_row);
/* There can never be a whole-row reference here */
if (found_whole_row)