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

Commit307c788

Browse files
committed
Rethink representation of PathTargets.
In commit19a5411 I did not make PathTarget a subtype of Node,and embedded a RelOptInfo's reltarget directly into it rather than havinga separately-allocated Node. In hindsight that was misguidedmicro-optimization, enabled by the fact that at that point we didn't haveany Paths with custom PathTargets. Now that PathTarget processing hasbeen fleshed out some more, it's easier to see that it's better to havePathTarget as an indepedent Node type, even if it does cost us one morepalloc to create a RelOptInfo. So change it while we still can.This commit just changes the representation, without doing anything moreinteresting than that.
1 parent07341a2 commit307c788

File tree

18 files changed

+143
-138
lines changed

18 files changed

+143
-138
lines changed

‎contrib/file_fdw/file_fdw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,
821821
}
822822

823823
/* Collect all the attributes needed for joins or final output. */
824-
pull_varattnos((Node*)baserel->reltarget.exprs,baserel->relid,
824+
pull_varattnos((Node*)baserel->reltarget->exprs,baserel->relid,
825825
&attrs_used);
826826

827827
/* Add all the attributes used by restriction clauses. */
@@ -953,7 +953,7 @@ estimate_size(PlannerInfo *root, RelOptInfo *baserel,
953953
*/
954954
inttuple_width;
955955

956-
tuple_width=MAXALIGN(baserel->reltarget.width)+
956+
tuple_width=MAXALIGN(baserel->reltarget->width)+
957957
MAXALIGN(SizeofHeapTupleHeader);
958958
ntuples=clamp_row_est((double)stat_buf.st_size /
959959
(double)tuple_width);

‎contrib/postgres_fdw/deparse.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,10 +728,10 @@ build_tlist_to_deparse(RelOptInfo *foreignrel)
728728
PgFdwRelationInfo*fpinfo= (PgFdwRelationInfo*)foreignrel->fdw_private;
729729

730730
/*
731-
* We require columns specified in foreignrel->reltarget.exprs and those
731+
* We require columns specified in foreignrel->reltarget->exprs and those
732732
* required for evaluating the local conditions.
733733
*/
734-
tlist=add_to_flat_tlist(tlist,foreignrel->reltarget.exprs);
734+
tlist=add_to_flat_tlist(tlist,foreignrel->reltarget->exprs);
735735
tlist=add_to_flat_tlist(tlist,
736736
pull_var_clause((Node*)fpinfo->local_conds,
737737
PVC_RECURSE_PLACEHOLDERS));

‎contrib/postgres_fdw/postgres_fdw.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
481481
* columns used in them. Doesn't seem worth detecting that case though.)
482482
*/
483483
fpinfo->attrs_used=NULL;
484-
pull_varattnos((Node*)baserel->reltarget.exprs,baserel->relid,
484+
pull_varattnos((Node*)baserel->reltarget->exprs,baserel->relid,
485485
&fpinfo->attrs_used);
486486
foreach(lc,fpinfo->local_conds)
487487
{
@@ -532,7 +532,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
532532

533533
/* Report estimated baserel size to planner. */
534534
baserel->rows=fpinfo->rows;
535-
baserel->reltarget.width=fpinfo->width;
535+
baserel->reltarget->width=fpinfo->width;
536536
}
537537
else
538538
{
@@ -549,7 +549,7 @@ postgresGetForeignRelSize(PlannerInfo *root,
549549
{
550550
baserel->pages=10;
551551
baserel->tuples=
552-
(10*BLCKSZ) / (baserel->reltarget.width+
552+
(10*BLCKSZ) / (baserel->reltarget->width+
553553
MAXALIGN(SizeofHeapTupleHeader));
554554
}
555555

@@ -2164,7 +2164,7 @@ estimate_path_cost_size(PlannerInfo *root,
21642164
* between foreign relations.
21652165
*/
21662166
rows=foreignrel->rows;
2167-
width=foreignrel->reltarget.width;
2167+
width=foreignrel->reltarget->width;
21682168

21692169
/* Back into an estimate of the number of retrieved rows. */
21702170
retrieved_rows=clamp_row_est(rows /fpinfo->local_conds_sel);
@@ -3690,7 +3690,7 @@ postgresGetForeignJoinPaths(PlannerInfo *root,
36903690
&width,&startup_cost,&total_cost);
36913691
/* Now update this information in the joinrel */
36923692
joinrel->rows=rows;
3693-
joinrel->reltarget.width=width;
3693+
joinrel->reltarget->width=width;
36943694
fpinfo->rows=rows;
36953695
fpinfo->width=width;
36963696
fpinfo->startup_cost=startup_cost;

‎doc/src/sgml/fdwhandler.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ GetForeignServerByName(const char *name, bool missing_ok);
11731173
it contains restriction quals (<literal>WHERE</> clauses) that should be
11741174
used to filter the rows to be fetched. (The FDW itself is not required
11751175
to enforce these quals, as the core executor can check them instead.)
1176-
<literal>baserel-&gt;reltarget.exprs</> can be used to determine which
1176+
<literal>baserel-&gt;reltarget-&gt;exprs</> can be used to determine which
11771177
columns need to be fetched; but note that it only lists columns that
11781178
have to be emitted by the <structname>ForeignScan</> plan node, not
11791179
columns that are used in qual evaluation but not output by the query.

‎src/backend/nodes/outfuncs.c

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,22 +1598,8 @@ _outPathInfo(StringInfo str, const Path *node)
15981598
WRITE_ENUM_FIELD(pathtype,NodeTag);
15991599
appendStringInfoString(str," :parent_relids ");
16001600
_outBitmapset(str,node->parent->relids);
1601-
if (node->pathtarget!=&(node->parent->reltarget))
1602-
{
1603-
WRITE_NODE_FIELD(pathtarget->exprs);
1604-
if (node->pathtarget->sortgrouprefs)
1605-
{
1606-
inti;
1607-
1608-
appendStringInfoString(str," :pathtarget->sortgrouprefs");
1609-
for (i=0;i<list_length(node->pathtarget->exprs);i++)
1610-
appendStringInfo(str," %u",
1611-
node->pathtarget->sortgrouprefs[i]);
1612-
}
1613-
WRITE_FLOAT_FIELD(pathtarget->cost.startup,"%.2f");
1614-
WRITE_FLOAT_FIELD(pathtarget->cost.per_tuple,"%.2f");
1615-
WRITE_INT_FIELD(pathtarget->width);
1616-
}
1601+
if (node->pathtarget!=node->parent->reltarget)
1602+
WRITE_NODE_FIELD(pathtarget);
16171603
appendStringInfoString(str," :required_outer ");
16181604
if (node->param_info)
16191605
_outBitmapset(str,node->param_info->ppi_req_outer);
@@ -2094,11 +2080,7 @@ _outRelOptInfo(StringInfo str, const RelOptInfo *node)
20942080
WRITE_BOOL_FIELD(consider_startup);
20952081
WRITE_BOOL_FIELD(consider_param_startup);
20962082
WRITE_BOOL_FIELD(consider_parallel);
2097-
WRITE_NODE_FIELD(reltarget.exprs);
2098-
/* reltarget.sortgrouprefs is never interesting, at present anyway */
2099-
WRITE_FLOAT_FIELD(reltarget.cost.startup,"%.2f");
2100-
WRITE_FLOAT_FIELD(reltarget.cost.per_tuple,"%.2f");
2101-
WRITE_INT_FIELD(reltarget.width);
2083+
WRITE_NODE_FIELD(reltarget);
21022084
WRITE_NODE_FIELD(pathlist);
21032085
WRITE_NODE_FIELD(ppilist);
21042086
WRITE_NODE_FIELD(partial_pathlist);
@@ -2201,6 +2183,25 @@ _outPathKey(StringInfo str, const PathKey *node)
22012183
WRITE_BOOL_FIELD(pk_nulls_first);
22022184
}
22032185

2186+
staticvoid
2187+
_outPathTarget(StringInfostr,constPathTarget*node)
2188+
{
2189+
WRITE_NODE_TYPE("PATHTARGET");
2190+
2191+
WRITE_NODE_FIELD(exprs);
2192+
if (node->sortgrouprefs)
2193+
{
2194+
inti;
2195+
2196+
appendStringInfoString(str," :sortgrouprefs");
2197+
for (i=0;i<list_length(node->exprs);i++)
2198+
appendStringInfo(str," %u",node->sortgrouprefs[i]);
2199+
}
2200+
WRITE_FLOAT_FIELD(cost.startup,"%.2f");
2201+
WRITE_FLOAT_FIELD(cost.per_tuple,"%.2f");
2202+
WRITE_INT_FIELD(width);
2203+
}
2204+
22042205
staticvoid
22052206
_outParamPathInfo(StringInfostr,constParamPathInfo*node)
22062207
{
@@ -3612,6 +3613,9 @@ _outNode(StringInfo str, const void *obj)
36123613
caseT_PathKey:
36133614
_outPathKey(str,obj);
36143615
break;
3616+
caseT_PathTarget:
3617+
_outPathTarget(str,obj);
3618+
break;
36153619
caseT_ParamPathInfo:
36163620
_outParamPathInfo(str,obj);
36173621
break;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
936936
/*
937937
* CE failed, so finish copying/modifying targetlist and join quals.
938938
*
939-
*Note: the resulting childrel->reltarget.exprs may contain arbitrary
939+
*NB: the resulting childrel->reltarget->exprs may contain arbitrary
940940
* expressions, which otherwise would not occur in a rel's targetlist.
941941
* Code that might be looking at an appendrel child must cope with
942942
* such. (Normally, a rel's targetlist would only include Vars and
@@ -947,9 +947,9 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
947947
adjust_appendrel_attrs(root,
948948
(Node*)rel->joininfo,
949949
appinfo);
950-
childrel->reltarget.exprs= (List*)
950+
childrel->reltarget->exprs= (List*)
951951
adjust_appendrel_attrs(root,
952-
(Node*)rel->reltarget.exprs,
952+
(Node*)rel->reltarget->exprs,
953953
appinfo);
954954

955955
/*
@@ -994,7 +994,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
994994
Assert(childrel->rows>0);
995995

996996
parent_rows+=childrel->rows;
997-
parent_size+=childrel->reltarget.width*childrel->rows;
997+
parent_size+=childrel->reltarget->width*childrel->rows;
998998

999999
/*
10001000
* Accumulate per-column estimates too. We need not do anything for
@@ -1004,8 +1004,8 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
10041004
*
10051005
* By construction, child's targetlist is 1-to-1 with parent's.
10061006
*/
1007-
forboth(parentvars,rel->reltarget.exprs,
1008-
childvars,childrel->reltarget.exprs)
1007+
forboth(parentvars,rel->reltarget->exprs,
1008+
childvars,childrel->reltarget->exprs)
10091009
{
10101010
Var*parentvar= (Var*)lfirst(parentvars);
10111011
Node*childvar= (Node*)lfirst(childvars);
@@ -1040,7 +1040,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
10401040

10411041
Assert(parent_rows>0);
10421042
rel->rows=parent_rows;
1043-
rel->reltarget.width=rint(parent_size /parent_rows);
1043+
rel->reltarget->width=rint(parent_size /parent_rows);
10441044
for (i=0;i<nattrs;i++)
10451045
rel->attr_widths[i]=rint(parent_attrsizes[i] /parent_rows);
10461046

@@ -1515,7 +1515,7 @@ set_dummy_rel_pathlist(RelOptInfo *rel)
15151515
{
15161516
/* Set dummy size estimates --- we leave attr_widths[] as zeroes */
15171517
rel->rows=0;
1518-
rel->reltarget.width=0;
1518+
rel->reltarget->width=0;
15191519

15201520
/* Discard any pre-existing paths; no further need for them */
15211521
rel->pathlist=NIL;
@@ -1771,7 +1771,7 @@ set_function_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
17711771
* not reference the ordinality column, or at least not in any way
17721772
* that would be interesting for sorting.
17731773
*/
1774-
foreach(lc,rel->reltarget.exprs)
1774+
foreach(lc,rel->reltarget->exprs)
17751775
{
17761776
Var*node= (Var*)lfirst(lc);
17771777

@@ -2717,7 +2717,7 @@ remove_unused_subquery_outputs(Query *subquery, RelOptInfo *rel)
27172717
* isn't computed for inheritance child rels, cf set_append_rel_size().
27182718
* (XXX might be worth changing that sometime.)
27192719
*/
2720-
pull_varattnos((Node*)rel->reltarget.exprs,rel->relid,&attrs_used);
2720+
pull_varattnos((Node*)rel->reltarget->exprs,rel->relid,&attrs_used);
27212721

27222722
/* Add all the attributes used by un-pushed-down restriction clauses. */
27232723
foreach(lc,rel->baserestrictinfo)
@@ -3028,7 +3028,7 @@ debug_print_rel(PlannerInfo *root, RelOptInfo *rel)
30283028

30293029
printf("RELOPTINFO (");
30303030
print_relids(rel->relids);
3031-
printf("): rows=%.0f width=%d\n",rel->rows,rel->reltarget.width);
3031+
printf("): rows=%.0f width=%d\n",rel->rows,rel->reltarget->width);
30323032

30333033
if (rel->baserestrictinfo)
30343034
{

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4218,7 +4218,7 @@ set_foreign_size_estimates(PlannerInfo *root, RelOptInfo *rel)
42184218
* that have to be calculated at this relation. This is the amount of data
42194219
* we'd need to pass upwards in case of a sort, hash, etc.
42204220
*
4221-
* This function also sets reltarget.cost, so it's a bit misnamed now.
4221+
* This function also sets reltarget->cost, so it's a bit misnamed now.
42224222
*
42234223
* NB: this works best on plain relations because it prefers to look at
42244224
* real Vars. For subqueries, set_subquery_size_estimates will already have
@@ -4239,10 +4239,10 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
42394239
ListCell*lc;
42404240

42414241
/* Vars are assumed to have cost zero, but other exprs do not */
4242-
rel->reltarget.cost.startup=0;
4243-
rel->reltarget.cost.per_tuple=0;
4242+
rel->reltarget->cost.startup=0;
4243+
rel->reltarget->cost.per_tuple=0;
42444244

4245-
foreach(lc,rel->reltarget.exprs)
4245+
foreach(lc,rel->reltarget->exprs)
42464246
{
42474247
Node*node= (Node*)lfirst(lc);
42484248

@@ -4309,16 +4309,16 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
43094309
{
43104310
/*
43114311
* We will need to evaluate the PHV's contained expression while
4312-
* scanning this rel, so be sure to include it in reltarget.cost.
4312+
* scanning this rel, so be sure to include it in reltarget->cost.
43134313
*/
43144314
PlaceHolderVar*phv= (PlaceHolderVar*)node;
43154315
PlaceHolderInfo*phinfo=find_placeholder_info(root,phv, false);
43164316
QualCostcost;
43174317

43184318
tuple_width+=phinfo->ph_width;
43194319
cost_qual_eval_node(&cost, (Node*)phv->phexpr,root);
4320-
rel->reltarget.cost.startup+=cost.startup;
4321-
rel->reltarget.cost.per_tuple+=cost.per_tuple;
4320+
rel->reltarget->cost.startup+=cost.startup;
4321+
rel->reltarget->cost.per_tuple+=cost.per_tuple;
43224322
}
43234323
else
43244324
{
@@ -4335,8 +4335,8 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
43354335
tuple_width+=item_width;
43364336
/* Not entirely clear if we need to account for cost, but do so */
43374337
cost_qual_eval_node(&cost,node,root);
4338-
rel->reltarget.cost.startup+=cost.startup;
4339-
rel->reltarget.cost.per_tuple+=cost.per_tuple;
4338+
rel->reltarget->cost.startup+=cost.startup;
4339+
rel->reltarget->cost.per_tuple+=cost.per_tuple;
43404340
}
43414341
}
43424342

@@ -4373,7 +4373,7 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel)
43734373
}
43744374

43754375
Assert(tuple_width >=0);
4376-
rel->reltarget.width=tuple_width;
4376+
rel->reltarget->width=tuple_width;
43774377
}
43784378

43794379
/*

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,7 @@ bitmap_scan_cost_est(PlannerInfo *root, RelOptInfo *rel, Path *ipath)
15501550
bpath.path.type=T_BitmapHeapPath;
15511551
bpath.path.pathtype=T_BitmapHeapScan;
15521552
bpath.path.parent=rel;
1553-
bpath.path.pathtarget=&(rel->reltarget);
1553+
bpath.path.pathtarget=rel->reltarget;
15541554
bpath.path.param_info=get_baserel_parampathinfo(root,rel,
15551555
required_outer);
15561556
bpath.path.pathkeys=NIL;
@@ -1579,7 +1579,7 @@ bitmap_and_cost_est(PlannerInfo *root, RelOptInfo *rel, List *paths)
15791579
apath.path.type=T_BitmapAndPath;
15801580
apath.path.pathtype=T_BitmapAnd;
15811581
apath.path.parent=rel;
1582-
apath.path.pathtarget=&(rel->reltarget);
1582+
apath.path.pathtarget=rel->reltarget;
15831583
apath.path.param_info=NULL;/* not used in bitmap trees */
15841584
apath.path.pathkeys=NIL;
15851585
apath.bitmapquals=paths;
@@ -1592,7 +1592,7 @@ bitmap_and_cost_est(PlannerInfo *root, RelOptInfo *rel, List *paths)
15921592
bpath.path.type=T_BitmapHeapPath;
15931593
bpath.path.pathtype=T_BitmapHeapScan;
15941594
bpath.path.parent=rel;
1595-
bpath.path.pathtarget=&(rel->reltarget);
1595+
bpath.path.pathtarget=rel->reltarget;
15961596
bpath.path.param_info=get_baserel_parampathinfo(root,rel,
15971597
required_outer);
15981598
bpath.path.pathkeys=NIL;
@@ -1815,7 +1815,7 @@ check_index_only(RelOptInfo *rel, IndexOptInfo *index)
18151815
* look at rel's targetlist, not the attr_needed data, because attr_needed
18161816
* isn't computed for inheritance child rels.
18171817
*/
1818-
pull_varattnos((Node*)rel->reltarget.exprs,rel->relid,&attrs_used);
1818+
pull_varattnos((Node*)rel->reltarget->exprs,rel->relid,&attrs_used);
18191819

18201820
/* Add all the attributes used by restriction clauses. */
18211821
foreach(lc,rel->baserestrictinfo)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3279,7 +3279,7 @@ create_foreignscan_plan(PlannerInfo *root, ForeignPath *best_path,
32793279
* Note: we must look at rel's targetlist, not the attr_needed data,
32803280
* because attr_needed isn't computed for inheritance child rels.
32813281
*/
3282-
pull_varattnos((Node*)rel->reltarget.exprs,scan_relid,&attrs_used);
3282+
pull_varattnos((Node*)rel->reltarget->exprs,scan_relid,&attrs_used);
32833283

32843284
/* Add all the attributes used by restriction clauses. */
32853285
foreach(lc,rel->baserestrictinfo)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ add_vars_to_targetlist(PlannerInfo *root, List *vars,
215215
{
216216
/* Variable not yet requested, so add to rel's targetlist */
217217
/* XXX is copyObject necessary here? */
218-
rel->reltarget.exprs=lappend(rel->reltarget.exprs,
219-
copyObject(var));
218+
rel->reltarget->exprs=lappend(rel->reltarget->exprs,
219+
copyObject(var));
220220
/* reltarget cost and width will be computed later */
221221
}
222222
rel->attr_needed[attno]=bms_add_members(rel->attr_needed[attno],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ query_planner(PlannerInfo *root, List *tlist,
8383
/* The only path for it is a trivial Result path */
8484
add_path(final_rel, (Path*)
8585
create_result_path(root,final_rel,
86-
&(final_rel->reltarget),
86+
final_rel->reltarget,
8787
(List*)parse->jointree->quals));
8888

8989
/* Select cheapest path (pretty easy in this case...) */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4534,7 +4534,7 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid)
45344534
* set_baserel_size_estimates, just do a quick hack for rows and width.
45354535
*/
45364536
rel->rows=rel->tuples;
4537-
rel->reltarget.width=get_relation_data_width(tableOid,NULL);
4537+
rel->reltarget->width=get_relation_data_width(tableOid,NULL);
45384538

45394539
root->total_table_pages=rel->pages;
45404540

@@ -4550,7 +4550,7 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid)
45504550
/* Estimate the cost of seq scan + sort */
45514551
seqScanPath=create_seqscan_path(root,rel,NULL,0);
45524552
cost_sort(&seqScanAndSortPath,root,NIL,
4553-
seqScanPath->total_cost,rel->tuples,rel->reltarget.width,
4553+
seqScanPath->total_cost,rel->tuples,rel->reltarget->width,
45544554
comparisonCost,maintenance_work_mem,-1.0);
45554555

45564556
/* Estimate the cost of index scan */

0 commit comments

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