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

Commit9e8b994

Browse files
committed
Improve handling of group-column indexes in GroupingSetsPath.
Instead of having planner.c compute a groupColIdx array and store it inGroupingSetsPaths, make create_groupingsets_plan() find the groupingcolumns by searching in the child plan node's tlist. Although that'sprobably a bit slower for create_groupingsets_plan(), it's more likethe way every other plan node type does this, and it provides positiveconfirmation that we know which child output columns we're supposed to begrouping on. (Indeed, looking at this now, I'm not at all sure that itwasn't broken before, because create_groupingsets_plan() isn't demandingan exact tlist match from its child node.) Also, this allows substantialsimplification in planner.c, because it no longer needs to compute thegroupColIdx array at all; no other cases were using it.I'd intended to put off this refactoring until later (like 9.7), butin view of the likely bug fix and the need to rationalize planner.c'stlist handling so we can do something sane with Konstantin Knizhnik'sfunction-evaluation-postponement patch, I think it can't wait.
1 parenta40814d commit9e8b994

File tree

8 files changed

+57
-115
lines changed

8 files changed

+57
-115
lines changed

‎src/backend/nodes/outfuncs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,6 @@ _outGroupingSetsPath(StringInfo str, const GroupingSetsPath *node)
18751875
_outPathInfo(str, (constPath*)node);
18761876

18771877
WRITE_NODE_FIELD(subpath);
1878-
/* we don't bother to print groupColIdx */
18791878
WRITE_NODE_FIELD(rollup_groupclauses);
18801879
WRITE_NODE_FIELD(rollup_lists);
18811880
WRITE_NODE_FIELD(qual);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1640,13 +1640,11 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path)
16401640
{
16411641
Agg*plan;
16421642
Plan*subplan;
1643-
AttrNumber*groupColIdx=best_path->groupColIdx;
16441643
List*rollup_groupclauses=best_path->rollup_groupclauses;
16451644
List*rollup_lists=best_path->rollup_lists;
16461645
AttrNumber*grouping_map;
16471646
intmaxref;
16481647
List*chain;
1649-
inti;
16501648
ListCell*lc,
16511649
*lc2;
16521650

@@ -1662,8 +1660,9 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path)
16621660
subplan=create_plan_recurse(root,best_path->subpath,CP_LABEL_TLIST);
16631661

16641662
/*
1665-
* Compute the mapping from tleSortGroupRef to column index. First,
1666-
* identify max SortGroupRef in groupClause, for array sizing.
1663+
* Compute the mapping from tleSortGroupRef to column index in the child's
1664+
* tlist. First, identify max SortGroupRef in groupClause, for array
1665+
* sizing.
16671666
*/
16681667
maxref=0;
16691668
foreach(lc,root->parse->groupClause)
@@ -1676,12 +1675,13 @@ create_groupingsets_plan(PlannerInfo *root, GroupingSetsPath *best_path)
16761675

16771676
grouping_map= (AttrNumber*)palloc0((maxref+1)*sizeof(AttrNumber));
16781677

1679-
i=0;
1678+
/* Now look up the column numbers in the child's tlist */
16801679
foreach(lc,root->parse->groupClause)
16811680
{
16821681
SortGroupClause*gc= (SortGroupClause*)lfirst(lc);
1682+
TargetEntry*tle=get_sortgroupclause_tle(gc,subplan->targetlist);
16831683

1684-
grouping_map[gc->tleSortGroupRef]=groupColIdx[i++];
1684+
grouping_map[gc->tleSortGroupRef]=tle->resno;
16851685
}
16861686

16871687
/*

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

Lines changed: 28 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ static double get_number_of_groups(PlannerInfo *root,
104104
staticRelOptInfo*create_grouping_paths(PlannerInfo*root,
105105
RelOptInfo*input_rel,
106106
PathTarget*target,
107-
AttrNumber*groupColIdx,
108107
List*rollup_lists,
109108
List*rollup_groupclauses);
110109
staticRelOptInfo*create_window_paths(PlannerInfo*root,
@@ -125,9 +124,7 @@ static RelOptInfo *create_distinct_paths(PlannerInfo *root,
125124
staticRelOptInfo*create_ordered_paths(PlannerInfo*root,
126125
RelOptInfo*input_rel,
127126
doublelimit_tuples);
128-
staticPathTarget*make_scanjoin_target(PlannerInfo*root,List*tlist,
129-
AttrNumber**groupColIdx);
130-
staticintget_grouping_column_index(Query*parse,TargetEntry*tle);
127+
staticPathTarget*make_scanjoin_target(PlannerInfo*root,List*tlist);
131128
staticList*postprocess_setop_tlist(List*new_tlist,List*orig_tlist);
132129
staticList*select_active_windows(PlannerInfo*root,WindowFuncLists*wflists);
133130
staticList*make_windowInputTargetList(PlannerInfo*root,
@@ -1462,7 +1459,6 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
14621459
{
14631460
/* No set operations, do regular planning */
14641461
PathTarget*sub_target;
1465-
AttrNumber*groupColIdx;
14661462
doubletlist_rows;
14671463
List*grouping_tlist;
14681464
WindowFuncLists*wflists=NULL;
@@ -1656,8 +1652,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
16561652
* because the target width estimates can use per-Var width numbers
16571653
* that were obtained within query_planner().
16581654
*/
1659-
sub_target=make_scanjoin_target(root,tlist,
1660-
&groupColIdx);
1655+
sub_target=make_scanjoin_target(root,tlist);
16611656

16621657
/*
16631658
* Forcibly apply that tlist to all the Paths for the scan/join rel.
@@ -1714,7 +1709,6 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
17141709
current_rel,
17151710
create_pathtarget(root,
17161711
grouping_tlist),
1717-
groupColIdx,
17181712
rollup_lists,
17191713
rollup_groupclauses);
17201714
}
@@ -3077,7 +3071,6 @@ get_number_of_groups(PlannerInfo *root,
30773071
*
30783072
* input_rel: contains the source-data Paths
30793073
* target: the pathtarget for the result Paths to compute
3080-
* groupColIdx: array of indexes of grouping columns in the source data
30813074
* rollup_lists: list of grouping sets, or NIL if not doing grouping sets
30823075
* rollup_groupclauses: list of grouping clauses for grouping sets,
30833076
*or NIL if not doing grouping sets
@@ -3092,7 +3085,6 @@ static RelOptInfo *
30923085
create_grouping_paths(PlannerInfo*root,
30933086
RelOptInfo*input_rel,
30943087
PathTarget*target,
3095-
AttrNumber*groupColIdx,
30963088
List*rollup_lists,
30973089
List*rollup_groupclauses)
30983090
{
@@ -3236,7 +3228,6 @@ create_grouping_paths(PlannerInfo *root,
32363228
path,
32373229
target,
32383230
(List*)parse->havingQual,
3239-
groupColIdx,
32403231
rollup_lists,
32413232
rollup_groupclauses,
32423233
&agg_costs,
@@ -3766,24 +3757,19 @@ create_ordered_paths(PlannerInfo *root,
37663757
* into PathTarget format, which is more compact and includes cost/width.
37673758
*
37683759
* 'tlist' is the query's target list.
3769-
* 'groupColIdx' receives an array of column numbers for the GROUP BY
3770-
*expressions (if there are any) in the returned target list.
37713760
*
37723761
* The result is the PathTarget to be applied to the Paths returned from
37733762
* query_planner().
37743763
*/
37753764
staticPathTarget*
37763765
make_scanjoin_target(PlannerInfo*root,
3777-
List*tlist,
3778-
AttrNumber**groupColIdx)
3766+
List*tlist)
37793767
{
37803768
Query*parse=root->parse;
37813769
List*sub_tlist;
37823770
List*non_group_cols;
37833771
List*non_group_vars;
3784-
intnumCols;
3785-
3786-
*groupColIdx=NULL;
3772+
ListCell*tl;
37873773

37883774
/*
37893775
* If we're not grouping or aggregating or windowing, there's nothing to
@@ -3800,64 +3786,35 @@ make_scanjoin_target(PlannerInfo *root,
38003786
sub_tlist=NIL;
38013787
non_group_cols=NIL;
38023788

3803-
numCols=list_length(parse->groupClause);
3804-
if (numCols>0)
3789+
foreach(tl,tlist)
38053790
{
3806-
/*
3807-
* If grouping, create sub_tlist entries for all GROUP BY columns, and
3808-
* make an array showing where the group columns are in the sub_tlist.
3809-
*
3810-
* Note: with this implementation, the array entries will always be
3811-
* 1..N, but we don't want callers to assume that.
3812-
*/
3813-
AttrNumber*grpColIdx;
3814-
ListCell*tl;
3815-
3816-
grpColIdx= (AttrNumber*)palloc0(sizeof(AttrNumber)*numCols);
3817-
*groupColIdx=grpColIdx;
3791+
TargetEntry*tle= (TargetEntry*)lfirst(tl);
38183792

3819-
foreach(tl,tlist)
3793+
if (tle->ressortgroupref&&parse->groupClause&&
3794+
get_sortgroupref_clause_noerr(tle->ressortgroupref,
3795+
parse->groupClause)!=NULL)
38203796
{
3821-
TargetEntry*tle= (TargetEntry*)lfirst(tl);
3822-
intcolno;
3823-
3824-
colno=get_grouping_column_index(parse,tle);
3825-
if (colno >=0)
3826-
{
3827-
/*
3828-
* It's a grouping column, so add it to the result tlist and
3829-
* remember its resno in grpColIdx[].
3830-
*/
3831-
TargetEntry*newtle;
3832-
3833-
newtle=makeTargetEntry(tle->expr,
3834-
list_length(sub_tlist)+1,
3835-
NULL,
3836-
false);
3837-
newtle->ressortgroupref=tle->ressortgroupref;
3838-
sub_tlist=lappend(sub_tlist,newtle);
3797+
/*
3798+
* It's a grouping column, so add it to the result tlist as-is.
3799+
*/
3800+
TargetEntry*newtle;
38393801

3840-
Assert(grpColIdx[colno]==0);/* no dups expected */
3841-
grpColIdx[colno]=newtle->resno;
3842-
}
3843-
else
3844-
{
3845-
/*
3846-
* Non-grouping column, so just remember the expression for
3847-
* later call to pull_var_clause. There's no need for
3848-
* pull_var_clause to examine the TargetEntry node itself.
3849-
*/
3850-
non_group_cols=lappend(non_group_cols,tle->expr);
3851-
}
3802+
newtle=makeTargetEntry(tle->expr,
3803+
list_length(sub_tlist)+1,
3804+
NULL,
3805+
false);
3806+
newtle->ressortgroupref=tle->ressortgroupref;
3807+
sub_tlist=lappend(sub_tlist,newtle);
3808+
}
3809+
else
3810+
{
3811+
/*
3812+
* Non-grouping column, so just remember the expression for later
3813+
* call to pull_var_clause. There's no need for pull_var_clause
3814+
* to examine the TargetEntry node itself.
3815+
*/
3816+
non_group_cols=lappend(non_group_cols,tle->expr);
38523817
}
3853-
}
3854-
else
3855-
{
3856-
/*
3857-
* With no grouping columns, just pass whole tlist to pull_var_clause.
3858-
* Need (shallow) copy to avoid damaging input tlist below.
3859-
*/
3860-
non_group_cols=list_copy(tlist);
38613818
}
38623819

38633820
/*
@@ -3886,37 +3843,6 @@ make_scanjoin_target(PlannerInfo *root,
38863843
returncreate_pathtarget(root,sub_tlist);
38873844
}
38883845

3889-
/*
3890-
* get_grouping_column_index
3891-
*Get the GROUP BY column position, if any, of a targetlist entry.
3892-
*
3893-
* Returns the index (counting from 0) of the TLE in the GROUP BY list, or -1
3894-
* if it's not a grouping column. Note: the result is unique because the
3895-
* parser won't make multiple groupClause entries for the same TLE.
3896-
*/
3897-
staticint
3898-
get_grouping_column_index(Query*parse,TargetEntry*tle)
3899-
{
3900-
intcolno=0;
3901-
Indexressortgroupref=tle->ressortgroupref;
3902-
ListCell*gl;
3903-
3904-
/* No need to search groupClause if TLE hasn't got a sortgroupref */
3905-
if (ressortgroupref==0)
3906-
return-1;
3907-
3908-
foreach(gl,parse->groupClause)
3909-
{
3910-
SortGroupClause*grpcl= (SortGroupClause*)lfirst(gl);
3911-
3912-
if (grpcl->tleSortGroupRef==ressortgroupref)
3913-
returncolno;
3914-
colno++;
3915-
}
3916-
3917-
return-1;
3918-
}
3919-
39203846
/*
39213847
* postprocess_setop_tlist
39223848
* Fix up targetlist returned by plan_set_operations().

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,13 +2438,12 @@ create_agg_path(PlannerInfo *root,
24382438
*
24392439
* GroupingSetsPath represents sorted grouping with one or more grouping sets.
24402440
* The input path's result must be sorted to match the last entry in
2441-
* rollup_groupclauses, and groupColIdx[] identifies its sort columns.
2441+
* rollup_groupclauses.
24422442
*
24432443
* 'rel' is the parent relation associated with the result
24442444
* 'subpath' is the path representing the source of data
24452445
* 'target' is the PathTarget to be computed
24462446
* 'having_qual' is the HAVING quals if any
2447-
* 'groupColIdx' is an array of indexes of grouping columns in the source data
24482447
* 'rollup_lists' is a list of grouping sets
24492448
* 'rollup_groupclauses' is a list of grouping clauses for grouping sets
24502449
* 'agg_costs' contains cost info about the aggregate functions to be computed
@@ -2456,7 +2455,6 @@ create_groupingsets_path(PlannerInfo *root,
24562455
Path*subpath,
24572456
PathTarget*target,
24582457
List*having_qual,
2459-
AttrNumber*groupColIdx,
24602458
List*rollup_lists,
24612459
List*rollup_groupclauses,
24622460
constAggClauseCosts*agg_costs,
@@ -2487,7 +2485,6 @@ create_groupingsets_path(PlannerInfo *root,
24872485
else
24882486
pathnode->path.pathkeys=NIL;
24892487

2490-
pathnode->groupColIdx=groupColIdx;
24912488
pathnode->rollup_groupclauses=rollup_groupclauses;
24922489
pathnode->rollup_lists=rollup_lists;
24932490
pathnode->qual=having_qual;

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,26 @@ get_sortgroupref_clause(Index sortref, List *clauses)
444444
returnNULL;/* keep compiler quiet */
445445
}
446446

447+
/*
448+
* get_sortgroupref_clause_noerr
449+
*As above, but return NULL rather than throwing an error if not found.
450+
*/
451+
SortGroupClause*
452+
get_sortgroupref_clause_noerr(Indexsortref,List*clauses)
453+
{
454+
ListCell*l;
455+
456+
foreach(l,clauses)
457+
{
458+
SortGroupClause*cl= (SortGroupClause*)lfirst(l);
459+
460+
if (cl->tleSortGroupRef==sortref)
461+
returncl;
462+
}
463+
464+
returnNULL;
465+
}
466+
447467
/*
448468
* extract_grouping_ops - make an array of the equality operator OIDs
449469
*for a SortGroupClause list

‎src/include/nodes/relation.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,6 @@ typedef struct GroupingSetsPath
13111311
{
13121312
Pathpath;
13131313
Path*subpath;/* path representing input source */
1314-
AttrNumber*groupColIdx;/* grouping col indexes */
13151314
List*rollup_groupclauses;/* list of lists of SortGroupClause's */
13161315
List*rollup_lists;/* parallel list of lists of grouping sets */
13171316
List*qual;/* quals (HAVING quals), if any */

‎src/include/optimizer/pathnode.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ extern GroupingSetsPath *create_groupingsets_path(PlannerInfo *root,
173173
Path*subpath,
174174
PathTarget*target,
175175
List*having_qual,
176-
AttrNumber*groupColIdx,
177176
List*rollup_lists,
178177
List*rollup_groupclauses,
179178
constAggClauseCosts*agg_costs,

‎src/include/optimizer/tlist.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ extern List *get_sortgrouplist_exprs(List *sgClauses,
4646

4747
externSortGroupClause*get_sortgroupref_clause(Indexsortref,
4848
List*clauses);
49+
externSortGroupClause*get_sortgroupref_clause_noerr(Indexsortref,
50+
List*clauses);
4951

5052
externOid*extract_grouping_ops(List*groupClause);
5153
externAttrNumber*extract_grouping_cols(List*groupClause,List*tlist);

0 commit comments

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