NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit2a64931

committed

Salvage a little bit of work from a failed patch: simplify and speed up

set_rel_width(). The code had been catering for the possibility of differentvarnos in the relation targetlist, but this is impossible for a base relation(and if it were possible, putting all the widths in the same RelOptInfo wouldbe wrong anyway).

1 parentab16485 commit2a64931Copy full SHA for 2a64931

File tree

1 file changed

-19

lines changed

src/backend/optimizer/path
- costsize.c

1 file changed

-19

lines changed

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

Lines changed: 8 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`* Portions Copyright (c) 1994, Regents of the University of California`
`55`	`55`	`*`
`56`	`56`	`* IDENTIFICATION`
`57`		`- * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.198 2008/10/04 21:56:53 tgl Exp $`
	`57`	`+ * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.199 2008/10/17 20:27:24 tgl Exp $`
`58`	`58`	`*`
`59`	`59`	`*-------------------------------------------------------------------------`
`60`	`60`	`*/`
`@@ -2608,24 +2608,14 @@ set_cte_size_estimates(PlannerInfo root, RelOptInfo rel, Plan *cteplan)`
`2608`	`2608`	`staticvoid`
`2609`	`2609`	`set_rel_width(PlannerInforoot,RelOptInforel)`
`2610`	`2610`	`{`
	`2611`	`+Oidreloid=planner_rt_fetch(rel->relid,root)->relid;`
`2611`	`2612`	`int32tuple_width=0;`
`2612`	`2613`	`ListCell*tllist;`
`2613`		`-Oidrel_reloid;`
`2614`		`-`
`2615`		`-/*`
`2616`		`- * Usually (perhaps always), all the Vars have the same reloid, so we can`
`2617`		`- * save some redundant list-searching by doing getrelid just once.`
`2618`		`- */`
`2619`		`-if (rel->relid>0)`
`2620`		`-rel_reloid=getrelid(rel->relid,root->parse->rtable);`
`2621`		`-else`
`2622`		`-rel_reloid=InvalidOid;/* probably can't happen */`
`2623`	`2614`
`2624`	`2615`	`foreach(tllist,rel->reltargetlist)`
`2625`	`2616`	`{`
`2626`	`2617`	`Varvar= (Var)lfirst(tllist);`
`2627`	`2618`	`intndx;`
`2628`		`-Oidvar_reloid;`
`2629`	`2619`	`int32item_width;`
`2630`	`2620`
`2631`	`2621`	`/* For now, punt on whole-row child Vars */`
`@@ -2635,6 +2625,10 @@ set_rel_width(PlannerInfo root, RelOptInfo rel)`
`2635`	`2625`	`continue;`
`2636`	`2626`	`}`
`2637`	`2627`
	`2628`	`+Assert(var->varno==rel->relid);`
	`2629`	`+Assert(var->varattno >=rel->min_attr);`
	`2630`	`+Assert(var->varattno <=rel->max_attr);`
	`2631`	`+`
`2638`	`2632`	`ndx=var->varattno-rel->min_attr;`
`2639`	`2633`
`2640`	`2634`	`/*`
`@@ -2646,14 +2640,9 @@ set_rel_width(PlannerInfo root, RelOptInfo rel)`
`2646`	`2640`	`continue;`
`2647`	`2641`	`}`
`2648`	`2642`
`2649`		`-if (var->varno==rel->relid)`
`2650`		`-var_reloid=rel_reloid;`
`2651`		`-else`
`2652`		`-var_reloid=getrelid(var->varno,root->parse->rtable);`
`2653`		`-`
`2654`		`-if (var_reloid!=InvalidOid)`
	`2643`	`+if (reloid!=InvalidOid)`
`2655`	`2644`	`{`
`2656`		`-item_width=get_attavgwidth(var_reloid,var->varattno);`
	`2645`	`+item_width=get_attavgwidth(reloid,var->varattno);`
`2657`	`2646`	`if (item_width>0)`
`2658`	`2647`	`{`
`2659`	`2648`	`rel->attr_widths[ndx]=item_width;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2a64931

File tree

1 file changed

1 file changed

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

0 commit comments