Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 398f70e

Browse filesBrowse files
tglsfdctglsfdc
committed
Preserve column names in the execution-time tupledesc for a RowExpr.
The hstore and json datatypes both have record-conversion functions that pay attention to column names in the composite values they're handed. We used to not worry about inserting correct field names into tuple descriptors generated at runtime, but given these examples it seems useful to do so. Observe the nicer-looking results in the regression tests whose results changed. catversion bump because there is a subtle change in requirements for stored rule parsetrees: RowExprs from ROW() constructs now have to include field names. Andrew Dunstan and Tom Lane
1 parent c1d9df4 commit 398f70e
Copy full SHA for 398f70e

File tree

Expand file treeCollapse file tree

16 files changed

+158
-100
lines changed
Filter options
Expand file treeCollapse file tree

16 files changed

+158
-100
lines changed

‎contrib/hstore/expected/hstore.out

Copy file name to clipboardExpand all lines: contrib/hstore/expected/hstore.out
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -907,9 +907,9 @@ select pg_column_size(hstore(ARRAY['a','b','asd'], ARRAY['g','h','i']))
907907

908908
-- records
909909
select hstore(v) from (values (1, 'foo', 1.2, 3::float8)) v(a,b,c,d);
910-
hstore
911-
------------------------------------------------
912-
"f1"=>"1", "f2"=>"foo", "f3"=>"1.2", "f4"=>"3"
910+
hstore
911+
--------------------------------------------
912+
"a"=>"1", "b"=>"foo", "c"=>"1.2", "d"=>"3"
913913
(1 row)
914914

915915
create domain hstestdom1 as integer not null default 0;

‎src/backend/executor/execQual.c

Copy file name to clipboardExpand all lines: src/backend/executor/execQual.c
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4627,7 +4627,8 @@ ExecInitExpr(Expr *node, PlanState *parent)
46274627
if (rowexpr->row_typeid == RECORDOID)
46284628
{
46294629
/* generic record, use runtime type assignment */
4630-
rstate->tupdesc = ExecTypeFromExprList(rowexpr->args);
4630+
rstate->tupdesc = ExecTypeFromExprList(rowexpr->args,
4631+
rowexpr->colnames);
46314632
BlessTupleDesc(rstate->tupdesc);
46324633
/* we won't need to redo this at runtime */
46334634
}

‎src/backend/executor/execTuples.c

Copy file name to clipboardExpand all lines: src/backend/executor/execTuples.c
+10-9Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -954,27 +954,28 @@ ExecTypeFromTLInternal(List *targetList, bool hasoid, bool skipjunk)
954954
/*
955955
* ExecTypeFromExprList - build a tuple descriptor from a list of Exprs
956956
*
957-
* Here we must make up an arbitrary set of field names.
957+
* Caller must also supply a list of field names (String nodes).
958958
*/
959959
TupleDesc
960-
ExecTypeFromExprList(List *exprList)
960+
ExecTypeFromExprList(List *exprList, List *namesList)
961961
{
962962
TupleDesc typeInfo;
963-
ListCell *l;
963+
ListCell *le;
964+
ListCell *ln;
964965
int cur_resno = 1;
965-
char fldname[NAMEDATALEN];
966+
967+
Assert(list_length(exprList) == list_length(namesList));
966968

967969
typeInfo = CreateTemplateTupleDesc(list_length(exprList), false);
968970

969-
foreach(l, exprList)
971+
forboth(le, exprList, ln, namesList)
970972
{
971-
Node *e = lfirst(l);
972-
973-
sprintf(fldname, "f%d", cur_resno);
973+
Node *e = lfirst(le);
974+
char *n = strVal(lfirst(ln));
974975

975976
TupleDescInitEntry(typeInfo,
976977
cur_resno,
977-
fldname,
978+
n,
978979
exprType(e),
979980
exprTypmod(e),
980981
0);

‎src/backend/executor/nodeValuesscan.c

Copy file name to clipboardExpand all lines: src/backend/executor/nodeValuesscan.c
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "executor/executor.h"
2727
#include "executor/nodeValuesscan.h"
28+
#include "parser/parsetree.h"
2829

2930

3031
static TupleTableSlot *ValuesNext(ValuesScanState *node);
@@ -188,6 +189,8 @@ ValuesScanState *
188189
ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
189190
{
190191
ValuesScanState *scanstate;
192+
RangeTblEntry *rte = rt_fetch(node->scan.scanrelid,
193+
estate->es_range_table);
191194
TupleDesc tupdesc;
192195
ListCell *vtl;
193196
int i;
@@ -239,7 +242,8 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
239242
/*
240243
* get info about values list
241244
*/
242-
tupdesc = ExecTypeFromExprList((List *) linitial(node->values_lists));
245+
tupdesc = ExecTypeFromExprList((List *) linitial(node->values_lists),
246+
rte->eref->colnames);
243247

244248
ExecAssignScanType(&scanstate->ss, tupdesc);
245249

‎src/backend/optimizer/path/allpaths.c

Copy file name to clipboardExpand all lines: src/backend/optimizer/path/allpaths.c
+6-3Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,8 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
492492
* reconstitute the RestrictInfo layer.
493493
*/
494494
childquals = get_all_actual_clauses(rel->baserestrictinfo);
495-
childquals = (List *) adjust_appendrel_attrs((Node *) childquals,
495+
childquals = (List *) adjust_appendrel_attrs(root,
496+
(Node *) childquals,
496497
appinfo);
497498
childqual = eval_const_expressions(root, (Node *)
498499
make_ands_explicit(childquals));
@@ -532,10 +533,12 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
532533
* while constructing attr_widths estimates below, though.
533534
*/
534535
childrel->joininfo = (List *)
535-
adjust_appendrel_attrs((Node *) rel->joininfo,
536+
adjust_appendrel_attrs(root,
537+
(Node *) rel->joininfo,
536538
appinfo);
537539
childrel->reltargetlist = (List *)
538-
adjust_appendrel_attrs((Node *) rel->reltargetlist,
540+
adjust_appendrel_attrs(root,
541+
(Node *) rel->reltargetlist,
539542
appinfo);
540543

541544
/*

‎src/backend/optimizer/path/equivclass.c

Copy file name to clipboardExpand all lines: src/backend/optimizer/path/equivclass.c
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,8 @@ add_child_rel_equivalences(PlannerInfo *root,
18101810
Expr *child_expr;
18111811

18121812
child_expr = (Expr *)
1813-
adjust_appendrel_attrs((Node *) cur_em->em_expr,
1813+
adjust_appendrel_attrs(root,
1814+
(Node *) cur_em->em_expr,
18141815
appinfo);
18151816
(void) add_eq_member(cur_ec, child_expr, child_rel->relids,
18161817
true, cur_em->em_datatype);

‎src/backend/optimizer/plan/planner.c

Copy file name to clipboardExpand all lines: src/backend/optimizer/plan/planner.c
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,8 @@ inheritance_planner(PlannerInfo *root)
772772
* then fool around with subquery RTEs.
773773
*/
774774
subroot.parse = (Query *)
775-
adjust_appendrel_attrs((Node *) parse,
775+
adjust_appendrel_attrs(root,
776+
(Node *) parse,
776777
appinfo);
777778

778779
/*

‎src/backend/optimizer/prep/prepunion.c

Copy file name to clipboardExpand all lines: src/backend/optimizer/prep/prepunion.c
+61-37Lines changed: 61 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
#include "utils/selfuncs.h"
5050

5151

52+
typedef struct
53+
{
54+
PlannerInfo *root;
55+
AppendRelInfo *appinfo;
56+
} adjust_appendrel_attrs_context;
57+
5258
static Plan *recurse_set_operations(Node *setOp, PlannerInfo *root,
5359
double tuple_fraction,
5460
List *colTypes, List *colCollations,
@@ -99,7 +105,7 @@ static void make_inh_translation_list(Relation oldrelation,
99105
static Bitmapset *translate_col_privs(const Bitmapset *parent_privs,
100106
List *translated_vars);
101107
static Node *adjust_appendrel_attrs_mutator(Node *node,
102-
AppendRelInfo *context);
108+
adjust_appendrel_attrs_context *context);
103109
static Relids adjust_relid_set(Relids relids, Index oldrelid, Index newrelid);
104110
static List *adjust_inherited_tlist(List *tlist,
105111
AppendRelInfo *context);
@@ -1569,9 +1575,13 @@ translate_col_privs(const Bitmapset *parent_privs,
15691575
* maybe we should try to fold the two routines together.
15701576
*/
15711577
Node *
1572-
adjust_appendrel_attrs(Node *node, AppendRelInfo *appinfo)
1578+
adjust_appendrel_attrs(PlannerInfo *root, Node *node, AppendRelInfo *appinfo)
15731579
{
15741580
Node *result;
1581+
adjust_appendrel_attrs_context context;
1582+
1583+
context.root = root;
1584+
context.appinfo = appinfo;
15751585

15761586
/*
15771587
* Must be prepared to start with a Query or a bare expression tree.
@@ -1582,7 +1592,7 @@ adjust_appendrel_attrs(Node *node, AppendRelInfo *appinfo)
15821592

15831593
newnode = query_tree_mutator((Query *) node,
15841594
adjust_appendrel_attrs_mutator,
1585-
(void *) appinfo,
1595+
(void *) &context,
15861596
QTW_IGNORE_RC_SUBQUERIES);
15871597
if (newnode->resultRelation == appinfo->parent_relid)
15881598
{
@@ -1596,37 +1606,40 @@ adjust_appendrel_attrs(Node *node, AppendRelInfo *appinfo)
15961606
result = (Node *) newnode;
15971607
}
15981608
else
1599-
result = adjust_appendrel_attrs_mutator(node, appinfo);
1609+
result = adjust_appendrel_attrs_mutator(node, &context);
16001610

16011611
return result;
16021612
}
16031613

16041614
static Node *
1605-
adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
1615+
adjust_appendrel_attrs_mutator(Node *node,
1616+
adjust_appendrel_attrs_context *context)
16061617
{
1618+
AppendRelInfo *appinfo = context->appinfo;
1619+
16071620
if (node == NULL)
16081621
return NULL;
16091622
if (IsA(node, Var))
16101623
{
16111624
Var *var = (Var *) copyObject(node);
16121625

16131626
if (var->varlevelsup == 0 &&
1614-
var->varno == context->parent_relid)
1627+
var->varno == appinfo->parent_relid)
16151628
{
1616-
var->varno = context->child_relid;
1617-
var->varnoold = context->child_relid;
1629+
var->varno = appinfo->child_relid;
1630+
var->varnoold = appinfo->child_relid;
16181631
if (var->varattno > 0)
16191632
{
16201633
Node *newnode;
16211634

1622-
if (var->varattno > list_length(context->translated_vars))
1635+
if (var->varattno > list_length(appinfo->translated_vars))
16231636
elog(ERROR, "attribute %d of relation \"%s\" does not exist",
1624-
var->varattno, get_rel_name(context->parent_reloid));
1625-
newnode = copyObject(list_nth(context->translated_vars,
1637+
var->varattno, get_rel_name(appinfo->parent_reloid));
1638+
newnode = copyObject(list_nth(appinfo->translated_vars,
16261639
var->varattno - 1));
16271640
if (newnode == NULL)
16281641
elog(ERROR, "attribute %d of relation \"%s\" does not exist",
1629-
var->varattno, get_rel_name(context->parent_reloid));
1642+
var->varattno, get_rel_name(appinfo->parent_reloid));
16301643
return newnode;
16311644
}
16321645
else if (var->varattno == 0)
@@ -1637,36 +1650,47 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
16371650
* step to convert the tuple layout to the parent's rowtype.
16381651
* Otherwise we have to generate a RowExpr.
16391652
*/
1640-
if (OidIsValid(context->child_reltype))
1653+
if (OidIsValid(appinfo->child_reltype))
16411654
{
1642-
Assert(var->vartype == context->parent_reltype);
1643-
if (context->parent_reltype != context->child_reltype)
1655+
Assert(var->vartype == appinfo->parent_reltype);
1656+
if (appinfo->parent_reltype != appinfo->child_reltype)
16441657
{
16451658
ConvertRowtypeExpr *r = makeNode(ConvertRowtypeExpr);
16461659

16471660
r->arg = (Expr *) var;
1648-
r->resulttype = context->parent_reltype;
1661+
r->resulttype = appinfo->parent_reltype;
16491662
r->convertformat = COERCE_IMPLICIT_CAST;
16501663
r->location = -1;
16511664
/* Make sure the Var node has the right type ID, too */
1652-
var->vartype = context->child_reltype;
1665+
var->vartype = appinfo->child_reltype;
16531666
return (Node *) r;
16541667
}
16551668
}
16561669
else
16571670
{
16581671
/*
16591672
* Build a RowExpr containing the translated variables.
1673+
*
1674+
* In practice var->vartype will always be RECORDOID here,
1675+
* so we need to come up with some suitable column names.
1676+
* We use the parent RTE's column names.
1677+
*
1678+
* Note: we can't get here for inheritance cases, so there
1679+
* is no need to worry that translated_vars might contain
1680+
* some dummy NULLs.
16601681
*/
16611682
RowExpr *rowexpr;
16621683
List *fields;
1684+
RangeTblEntry *rte;
16631685

1664-
fields = (List *) copyObject(context->translated_vars);
1686+
rte = rt_fetch(appinfo->parent_relid,
1687+
context->root->parse->rtable);
1688+
fields = (List *) copyObject(appinfo->translated_vars);
16651689
rowexpr = makeNode(RowExpr);
16661690
rowexpr->args = fields;
16671691
rowexpr->row_typeid = var->vartype;
16681692
rowexpr->row_format = COERCE_IMPLICIT_CAST;
1669-
rowexpr->colnames = NIL;
1693+
rowexpr->colnames = copyObject(rte->eref->colnames);
16701694
rowexpr->location = -1;
16711695

16721696
return (Node *) rowexpr;
@@ -1680,16 +1704,16 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
16801704
{
16811705
CurrentOfExpr *cexpr = (CurrentOfExpr *) copyObject(node);
16821706

1683-
if (cexpr->cvarno == context->parent_relid)
1684-
cexpr->cvarno = context->child_relid;
1707+
if (cexpr->cvarno == appinfo->parent_relid)
1708+
cexpr->cvarno = appinfo->child_relid;
16851709
return (Node *) cexpr;
16861710
}
16871711
if (IsA(node, RangeTblRef))
16881712
{
16891713
RangeTblRef *rtr = (RangeTblRef *) copyObject(node);
16901714

1691-
if (rtr->rtindex == context->parent_relid)
1692-
rtr->rtindex = context->child_relid;
1715+
if (rtr->rtindex == appinfo->parent_relid)
1716+
rtr->rtindex = appinfo->child_relid;
16931717
return (Node *) rtr;
16941718
}
16951719
if (IsA(node, JoinExpr))
@@ -1701,8 +1725,8 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
17011725
adjust_appendrel_attrs_mutator,
17021726
(void *) context);
17031727
/* now fix JoinExpr's rtindex (probably never happens) */
1704-
if (j->rtindex == context->parent_relid)
1705-
j->rtindex = context->child_relid;
1728+
if (j->rtindex == appinfo->parent_relid)
1729+
j->rtindex = appinfo->child_relid;
17061730
return (Node *) j;
17071731
}
17081732
if (IsA(node, PlaceHolderVar))
@@ -1716,8 +1740,8 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
17161740
/* now fix PlaceHolderVar's relid sets */
17171741
if (phv->phlevelsup == 0)
17181742
phv->phrels = adjust_relid_set(phv->phrels,
1719-
context->parent_relid,
1720-
context->child_relid);
1743+
appinfo->parent_relid,
1744+
appinfo->child_relid);
17211745
return (Node *) phv;
17221746
}
17231747
/* Shouldn't need to handle planner auxiliary nodes here */
@@ -1749,20 +1773,20 @@ adjust_appendrel_attrs_mutator(Node *node, AppendRelInfo *context)
17491773

17501774
/* adjust relid sets too */
17511775
newinfo->clause_relids = adjust_relid_set(oldinfo->clause_relids,
1752-
context->parent_relid,
1753-
context->child_relid);
1776+
appinfo->parent_relid,
1777+
appinfo->child_relid);
17541778
newinfo->required_relids = adjust_relid_set(oldinfo->required_relids,
1755-
context->parent_relid,
1756-
context->child_relid);
1779+
appinfo->parent_relid,
1780+
appinfo->child_relid);
17571781
newinfo->nullable_relids = adjust_relid_set(oldinfo->nullable_relids,
1758-
context->parent_relid,
1759-
context->child_relid);
1782+
appinfo->parent_relid,
1783+
appinfo->child_relid);
17601784
newinfo->left_relids = adjust_relid_set(oldinfo->left_relids,
1761-
context->parent_relid,
1762-
context->child_relid);
1785+
appinfo->parent_relid,
1786+
appinfo->child_relid);
17631787
newinfo->right_relids = adjust_relid_set(oldinfo->right_relids,
1764-
context->parent_relid,
1765-
context->child_relid);
1788+
appinfo->parent_relid,
1789+
appinfo->child_relid);
17661790

17671791
/*
17681792
* Reset cached derivative fields, since these might need to have

‎src/backend/optimizer/util/var.c

Copy file name to clipboardExpand all lines: src/backend/optimizer/util/var.c
+9-4Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,13 +783,16 @@ flatten_join_alias_vars_mutator(Node *node,
783783
/* Must expand whole-row reference */
784784
RowExpr *rowexpr;
785785
List *fields = NIL;
786+
List *colnames = NIL;
786787
AttrNumber attnum;
787-
ListCell *l;
788+
ListCell *lv;
789+
ListCell *ln;
788790

789791
attnum = 0;
790-
foreach(l, rte->joinaliasvars)
792+
Assert(list_length(rte->joinaliasvars) == list_length(rte->eref->colnames));
793+
forboth(lv, rte->joinaliasvars, ln, rte->eref->colnames)
791794
{
792-
newvar = (Node *) lfirst(l);
795+
newvar = (Node *) lfirst(lv);
793796
attnum++;
794797
/* Ignore dropped columns */
795798
if (IsA(newvar, Const))
@@ -809,12 +812,14 @@ flatten_join_alias_vars_mutator(Node *node,
809812
/* (also takes care of setting inserted_sublink if needed) */
810813
newvar = flatten_join_alias_vars_mutator(newvar, context);
811814
fields = lappend(fields, newvar);
815+
/* We need the names of non-dropped columns, too */
816+
colnames = lappend(colnames, copyObject((Node *) lfirst(ln)));
812817
}
813818
rowexpr = makeNode(RowExpr);
814819
rowexpr->args = fields;
815820
rowexpr->row_typeid = var->vartype;
816821
rowexpr->row_format = COERCE_IMPLICIT_CAST;
817-
rowexpr->colnames = NIL;
822+
rowexpr->colnames = colnames;
818823
rowexpr->location = var->location;
819824

820825
return (Node *) rowexpr;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.