Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit55a1954

Browse files
committed
Fix EXPLAIN's column alias output for mismatched child tables.
If an inheritance/partitioning parent table is assigned some columnalias names in the query, EXPLAIN mapped those aliases onto thechild tables' columns by physical position, resulting in bogus outputif a child table's columns aren't one-for-one with the parent's.To fix, make expand_single_inheritance_child() generate a correctlyre-mapped column alias list, rather than just copying the parentRTE's alias node. (We have to fill the alias field, not justadjust the eref field, because ruleutils.c will ignore eref infavor of looking at the real column names.)This means that child tables will now always have alias fields inplan rtables, where before they might not have. That results ina rather substantial set of regression test output changes:EXPLAIN will now always show child tables with aliases that matchthe parent table (usually with "_N" appended for uniqueness).But that seems like a net positive for understandability, sincethe parent alias corresponds to something that actually appearedin the original query, while the child table names didn't.(Note that this does not change anything for cases where an explicittable alias was written in the query for the parent table; itjust makes cases without such aliases behave similarly to that.)Hence, while we could avoid these subsidiary changes if we madeinherit.c more complicated, we choose not to.Discussion:https://postgr.es/m/12424.1575168015@sss.pgh.pa.us
1 parentce76c0b commit55a1954

File tree

16 files changed

+2072
-1982
lines changed

16 files changed

+2072
-1982
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

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

Lines changed: 69 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,21 +421,28 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
421421
RangeTblEntry*childrte;
422422
IndexchildRTindex;
423423
AppendRelInfo*appinfo;
424+
TupleDescchild_tupdesc;
425+
List*parent_colnames;
426+
List*child_colnames;
424427

425428
/*
426429
* Build an RTE for the child, and attach to query's rangetable list. We
427-
* copy most fields of the parent's RTE, but replace relation OID,
430+
* copy mostscalarfields of the parent's RTE, but replace relation OID,
428431
* relkind, and inh for the child. Also, set requiredPerms to zero since
429432
* all required permissions checks are done on the original RTE. Likewise,
430433
* set the child's securityQuals to empty, because we only want to apply
431434
* the parent's RLS conditions regardless of what RLS properties
432435
* individual children may have. (This is an intentional choice to make
433436
* inherited RLS work like regular permissions checks.) The parent
434437
* securityQuals will be propagated to children along with other base
435-
* restriction clauses, so we don't need to do it here.
438+
* restriction clauses, so we don't need to do it here. Other
439+
* infrastructure of the parent RTE has to be translated to match the
440+
* child table's column ordering, which we do below, so a "flat" copy is
441+
* sufficient to start with.
436442
*/
437-
childrte=copyObject(parentrte);
438-
*childrte_p=childrte;
443+
childrte=makeNode(RangeTblEntry);
444+
memcpy(childrte,parentrte,sizeof(RangeTblEntry));
445+
Assert(parentrte->rtekind==RTE_RELATION);/* else this is dubious */
439446
childrte->relid=childOID;
440447
childrte->relkind=childrel->rd_rel->relkind;
441448
/* A partitioned child will need to be expanded further. */
@@ -448,8 +455,11 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
448455
childrte->inh= false;
449456
childrte->requiredPerms=0;
450457
childrte->securityQuals=NIL;
458+
459+
/* Link not-yet-fully-filled child RTE into data structures */
451460
parse->rtable=lappend(parse->rtable,childrte);
452461
childRTindex=list_length(parse->rtable);
462+
*childrte_p=childrte;
453463
*childRTindex_p=childRTindex;
454464

455465
/*
@@ -459,10 +469,57 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
459469
parentRTindex,childRTindex);
460470
root->append_rel_list=lappend(root->append_rel_list,appinfo);
461471

472+
/* tablesample is probably null, but copy it */
473+
childrte->tablesample=copyObject(parentrte->tablesample);
474+
475+
/*
476+
* Construct an alias clause for the child, which we can also use as eref.
477+
* This is important so that EXPLAIN will print the right column aliases
478+
* for child-table columns. (Since ruleutils.c doesn't have any easy way
479+
* to reassociate parent and child columns, we must get the child column
480+
* aliases right to start with. Note that setting childrte->alias forces
481+
* ruleutils.c to use these column names, which it otherwise would not.)
482+
*/
483+
child_tupdesc=RelationGetDescr(childrel);
484+
parent_colnames=parentrte->eref->colnames;
485+
child_colnames=NIL;
486+
for (intcattno=0;cattno<child_tupdesc->natts;cattno++)
487+
{
488+
Form_pg_attributeatt=TupleDescAttr(child_tupdesc,cattno);
489+
constchar*attname;
490+
491+
if (att->attisdropped)
492+
{
493+
/* Always insert an empty string for a dropped column */
494+
attname="";
495+
}
496+
elseif (appinfo->parent_colnos[cattno]>0&&
497+
appinfo->parent_colnos[cattno] <=list_length(parent_colnames))
498+
{
499+
/* Duplicate the query-assigned name for the parent column */
500+
attname=strVal(list_nth(parent_colnames,
501+
appinfo->parent_colnos[cattno]-1));
502+
}
503+
else
504+
{
505+
/* New column, just use its real name */
506+
attname=NameStr(att->attname);
507+
}
508+
child_colnames=lappend(child_colnames,makeString(pstrdup(attname)));
509+
}
510+
511+
/*
512+
* We just duplicate the parent's table alias name for each child. If the
513+
* plan gets printed, ruleutils.c has to sort out unique table aliases to
514+
* use, which it can handle.
515+
*/
516+
childrte->alias=childrte->eref=makeAlias(parentrte->eref->aliasname,
517+
child_colnames);
518+
462519
/*
463520
* Translate the column permissions bitmaps to the child's attnums (we
464521
* have to build the translated_vars list before we can do this). But if
465-
* this is the parent table, we canleave copyObject'sresult alone.
522+
* this is the parent table, we canjust duplicate the parent'sbitmaps.
466523
*
467524
* Note: we need to do this even though the executor won't run any
468525
* permissions checks on the child RTE. The insertedCols/updatedCols
@@ -479,6 +536,13 @@ expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
479536
childrte->extraUpdatedCols=translate_col_privs(parentrte->extraUpdatedCols,
480537
appinfo->translated_vars);
481538
}
539+
else
540+
{
541+
childrte->selectedCols=bms_copy(parentrte->selectedCols);
542+
childrte->insertedCols=bms_copy(parentrte->insertedCols);
543+
childrte->updatedCols=bms_copy(parentrte->updatedCols);
544+
childrte->extraUpdatedCols=bms_copy(parentrte->extraUpdatedCols);
545+
}
482546

483547
/*
484548
* Store the RTE and appinfo in the respective PlannerInfo arrays, which

‎src/test/regress/expected/aggregates.out

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -998,31 +998,31 @@ insert into minmaxtest2 values(15), (16);
998998
insert into minmaxtest3 values(17), (18);
999999
explain (costs off)
10001000
select min(f1), max(f1) from minmaxtest;
1001-
QUERY PLAN
1002-
----------------------------------------------------------------------------------------------
1001+
QUERY PLAN
1002+
---------------------------------------------------------------------------------------------
10031003
Result
10041004
InitPlan 1 (returns $0)
10051005
-> Limit
10061006
-> Merge Append
10071007
Sort Key: minmaxtest.f1
10081008
-> Index Only Scan using minmaxtesti on minmaxtest
10091009
Index Cond: (f1 IS NOT NULL)
1010-
-> Index Only Scan using minmaxtest1i on minmaxtest1
1010+
-> Index Only Scan using minmaxtest1i on minmaxtest1 minmaxtest_1
10111011
Index Cond: (f1 IS NOT NULL)
1012-
-> Index Only Scan Backward using minmaxtest2i on minmaxtest2
1012+
-> Index Only Scan Backward using minmaxtest2i on minmaxtest2 minmaxtest_2
10131013
Index Cond: (f1 IS NOT NULL)
1014-
-> Index Only Scan using minmaxtest3i on minmaxtest3
1014+
-> Index Only Scan using minmaxtest3i on minmaxtest3 minmaxtest_3
10151015
InitPlan 2 (returns $1)
10161016
-> Limit
10171017
-> Merge Append
1018-
Sort Key:minmaxtest_1.f1 DESC
1019-
-> Index Only Scan Backward using minmaxtesti on minmaxtestminmaxtest_1
1018+
Sort Key:minmaxtest_4.f1 DESC
1019+
-> Index Only Scan Backward using minmaxtesti on minmaxtestminmaxtest_4
10201020
Index Cond: (f1 IS NOT NULL)
1021-
-> Index Only Scan Backward using minmaxtest1i on minmaxtest1minmaxtest1_1
1021+
-> Index Only Scan Backward using minmaxtest1i on minmaxtest1minmaxtest_5
10221022
Index Cond: (f1 IS NOT NULL)
1023-
-> Index Only Scan using minmaxtest2i on minmaxtest2minmaxtest2_1
1023+
-> Index Only Scan using minmaxtest2i on minmaxtest2minmaxtest_6
10241024
Index Cond: (f1 IS NOT NULL)
1025-
-> Index Only Scan Backward using minmaxtest3i on minmaxtest3minmaxtest3_1
1025+
-> Index Only Scan Backward using minmaxtest3i on minmaxtest3minmaxtest_7
10261026
(23 rows)
10271027

10281028
select min(f1), max(f1) from minmaxtest;
@@ -1034,31 +1034,31 @@ select min(f1), max(f1) from minmaxtest;
10341034
-- DISTINCT doesn't do anything useful here, but it shouldn't fail
10351035
explain (costs off)
10361036
select distinct min(f1), max(f1) from minmaxtest;
1037-
QUERY PLAN
1038-
----------------------------------------------------------------------------------------------
1037+
QUERY PLAN
1038+
---------------------------------------------------------------------------------------------
10391039
Unique
10401040
InitPlan 1 (returns $0)
10411041
-> Limit
10421042
-> Merge Append
10431043
Sort Key: minmaxtest.f1
10441044
-> Index Only Scan using minmaxtesti on minmaxtest
10451045
Index Cond: (f1 IS NOT NULL)
1046-
-> Index Only Scan using minmaxtest1i on minmaxtest1
1046+
-> Index Only Scan using minmaxtest1i on minmaxtest1 minmaxtest_1
10471047
Index Cond: (f1 IS NOT NULL)
1048-
-> Index Only Scan Backward using minmaxtest2i on minmaxtest2
1048+
-> Index Only Scan Backward using minmaxtest2i on minmaxtest2 minmaxtest_2
10491049
Index Cond: (f1 IS NOT NULL)
1050-
-> Index Only Scan using minmaxtest3i on minmaxtest3
1050+
-> Index Only Scan using minmaxtest3i on minmaxtest3 minmaxtest_3
10511051
InitPlan 2 (returns $1)
10521052
-> Limit
10531053
-> Merge Append
1054-
Sort Key:minmaxtest_1.f1 DESC
1055-
-> Index Only Scan Backward using minmaxtesti on minmaxtestminmaxtest_1
1054+
Sort Key:minmaxtest_4.f1 DESC
1055+
-> Index Only Scan Backward using minmaxtesti on minmaxtestminmaxtest_4
10561056
Index Cond: (f1 IS NOT NULL)
1057-
-> Index Only Scan Backward using minmaxtest1i on minmaxtest1minmaxtest1_1
1057+
-> Index Only Scan Backward using minmaxtest1i on minmaxtest1minmaxtest_5
10581058
Index Cond: (f1 IS NOT NULL)
1059-
-> Index Only Scan using minmaxtest2i on minmaxtest2minmaxtest2_1
1059+
-> Index Only Scan using minmaxtest2i on minmaxtest2minmaxtest_6
10601060
Index Cond: (f1 IS NOT NULL)
1061-
-> Index Only Scan Backward using minmaxtest3i on minmaxtest3minmaxtest3_1
1061+
-> Index Only Scan Backward using minmaxtest3i on minmaxtest3minmaxtest_7
10621062
-> Sort
10631063
Sort Key: ($0), ($1)
10641064
-> Result
@@ -1156,7 +1156,7 @@ explain (costs off) select * from t1 group by a,b,c,d;
11561156
Group Key: t1.a, t1.b, t1.c, t1.d
11571157
-> Append
11581158
-> Seq Scan on t1
1159-
-> Seq Scan on t1c
1159+
-> Seq Scan on t1c t1_1
11601160
(5 rows)
11611161

11621162
-- Okay to remove columns if we're only querying the parent.
@@ -1179,13 +1179,13 @@ create temp table p_t1_1 partition of p_t1 for values in(1);
11791179
create temp table p_t1_2 partition of p_t1 for values in(2);
11801180
-- Ensure we can remove non-PK columns for partitioned tables.
11811181
explain (costs off) select * from p_t1 group by a,b,c,d;
1182-
QUERY PLAN
1183-
---------------------------------
1182+
QUERY PLAN
1183+
---------------------------------------
11841184
HashAggregate
1185-
Group Key:p_t1_1.a,p_t1_1.b
1185+
Group Key:p_t1.a,p_t1.b
11861186
-> Append
1187-
-> Seq Scan on p_t1_1
1188-
-> Seq Scan on p_t1_2
1187+
-> Seq Scan on p_t1_1 p_t1
1188+
-> Seq Scan on p_t1_2 p_t1_1
11891189
(5 rows)
11901190

11911191
drop table t1 cascade;

‎src/test/regress/expected/alter_table.out

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ explain (costs off) select * from nv_parent where d between '2011-08-01' and '20
542542
Append
543543
-> Seq Scan on nv_parent
544544
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
545-
-> Seq Scan on nv_child_2010
545+
-> Seq Scan on nv_child_2010 nv_parent_1
546546
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
547-
-> Seq Scan on nv_child_2011
547+
-> Seq Scan on nv_child_2011 nv_parent_2
548548
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
549549
(7 rows)
550550

@@ -555,9 +555,9 @@ explain (costs off) select * from nv_parent where d between '2011-08-01'::date a
555555
Append
556556
-> Seq Scan on nv_parent
557557
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
558-
-> Seq Scan on nv_child_2010
558+
-> Seq Scan on nv_child_2010 nv_parent_1
559559
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
560-
-> Seq Scan on nv_child_2011
560+
-> Seq Scan on nv_child_2011 nv_parent_2
561561
Filter: ((d >= '08-01-2011'::date) AND (d <= '08-31-2011'::date))
562562
(7 rows)
563563

@@ -567,11 +567,11 @@ explain (costs off) select * from nv_parent where d between '2009-08-01'::date a
567567
Append
568568
-> Seq Scan on nv_parent
569569
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
570-
-> Seq Scan on nv_child_2010
570+
-> Seq Scan on nv_child_2010 nv_parent_1
571571
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
572-
-> Seq Scan on nv_child_2011
572+
-> Seq Scan on nv_child_2011 nv_parent_2
573573
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
574-
-> Seq Scan on nv_child_2009
574+
-> Seq Scan on nv_child_2009 nv_parent_3
575575
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
576576
(9 rows)
577577

@@ -583,9 +583,9 @@ explain (costs off) select * from nv_parent where d between '2009-08-01'::date a
583583
Append
584584
-> Seq Scan on nv_parent
585585
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
586-
-> Seq Scan on nv_child_2010
586+
-> Seq Scan on nv_child_2010 nv_parent_1
587587
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
588-
-> Seq Scan on nv_child_2009
588+
-> Seq Scan on nv_child_2009 nv_parent_2
589589
Filter: ((d >= '08-01-2009'::date) AND (d <= '08-31-2009'::date))
590590
(7 rows)
591591

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp