NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0babd10

committed

Revert "Use CP_SMALL_TLIST for hash aggregate"

This reverts commit4cad253 due to aperformance regression. It will be replaced by a new approach in anupcoming commit.Reported-by: Andres FreundDiscussion:https://postgr.es/m/20200614181418.mx4bvljmfkkhoqzl@alap3.anarazel.deBackpatch-through: 13

1 parentd973747 commit0babd10Copy full SHA for 0babd10

File tree

2 files changed

-26

lines changed

contrib/postgres_fdw/expected
- postgres_fdw.out
src/backend/optimizer/plan
- createplan.c

2 files changed

-26

lines changed

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2715,7 +2715,7 @@ select sum(c1) from ft1 group by c2 having avg(c1 * (random() <= 1)::int) > 100`
`2715`	`2715`	`Group Key: ft1.c2`
`2716`	`2716`	`Filter: (avg((ft1.c1 * ((random() <= '1'::double precision))::integer)) > '100'::numeric)`
`2717`	`2717`	`-> Foreign Scan on public.ft1`
`2718`		`- Output:c2, c1`
	`2718`	`+ Output:c1, c2`
`2719`	`2719`	`Remote SQL: SELECT "C 1", c2 FROM "S 1"."T 1"`
`2720`	`2720`	`(10 rows)`
`2721`	`2721`
`@@ -2964,7 +2964,7 @@ select sum(c1) filter (where (c1 / c1) * random() <= 1) from ft1 group by c2 ord`
`2964`	`2964`	`Output: sum(c1) FILTER (WHERE ((((c1 / c1))::double precision * random()) <= '1'::double precision)), c2`
`2965`	`2965`	`Group Key: ft1.c2`
`2966`	`2966`	`-> Foreign Scan on public.ft1`
`2967`		`- Output:c2, c1`
	`2967`	`+ Output:c1, c2`
`2968`	`2968`	`Remote SQL: SELECT "C 1", c2 FROM "S 1"."T 1"`
`2969`	`2969`	`(9 rows)`
`2970`	`2970`

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

Lines changed: 4 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -2113,22 +2113,12 @@ create_agg_plan(PlannerInfo root, AggPath best_path)`
`2113`	`2113`	`Plan*subplan;`
`2114`	`2114`	`List*tlist;`
`2115`	`2115`	`List*quals;`
`2116`		`-intflags;`
`2117`	`2116`
`2118`	`2117`	`/*`
`2119`	`2118`	`* Agg can project, so no need to be terribly picky about child tlist, but`
`2120`		`- * we do need grouping columns to be available. We are a bit more careful`
`2121`		`- * with hash aggregate, where we explicitly request small tlist to`
`2122`		`- * minimize I/O needed for spilling (we can't be sure spilling won't be`
`2123`		`- * necessary, so we just do it every time).`
	`2119`	`+ * we do need grouping columns to be available`
`2124`	`2120`	`*/`
`2125`		`-flags=CP_LABEL_TLIST;`
`2126`		`-`
`2127`		`-/* ensure small tlist for hash aggregate */`
`2128`		`-if (best_path->aggstrategy==AGG_HASHED)`
`2129`		`-flags \|=CP_SMALL_TLIST;`
`2130`		`-`
`2131`		`-subplan=create_plan_recurse(root,best_path->subpath,flags);`
	`2121`	`+subplan=create_plan_recurse(root,best_path->subpath,CP_LABEL_TLIST);`
`2132`	`2122`
`2133`	`2123`	`tlist=build_path_tlist(root,&best_path->path);`
`2134`	`2124`
`@@ -2210,26 +2200,16 @@ create_groupingsets_plan(PlannerInfo root, GroupingSetsPath best_path)`
`2210`	`2200`	`intmaxref;`
`2211`	`2201`	`List*chain;`
`2212`	`2202`	`ListCell*lc;`
`2213`		`-intflags;`
`2214`	`2203`
`2215`	`2204`	`/* Shouldn't get here without grouping sets */`
`2216`	`2205`	`Assert(root->parse->groupingSets);`
`2217`	`2206`	`Assert(rollups!=NIL);`
`2218`	`2207`
`2219`	`2208`	`/*`
`2220`	`2209`	`* Agg can project, so no need to be terribly picky about child tlist, but`
`2221`		`- * we do need grouping columns to be available. We are a bit more careful`
`2222`		`- * with hash aggregate, where we explicitly request small tlist to`
`2223`		`- * minimize I/O needed for spilling (we can't be sure spilling won't be`
`2224`		`- * necessary, so we just do it every time).`
	`2210`	`+ * we do need grouping columns to be available`
`2225`	`2211`	`*/`
`2226`		`-flags=CP_LABEL_TLIST;`
`2227`		`-`
`2228`		`-/* ensure small tlist for hash aggregate */`
`2229`		`-if (best_path->aggstrategy==AGG_HASHED)`
`2230`		`-flags \|=CP_SMALL_TLIST;`
`2231`		`-`
`2232`		`-subplan=create_plan_recurse(root,best_path->subpath,flags);`
	`2212`	`+subplan=create_plan_recurse(root,best_path->subpath,CP_LABEL_TLIST);`
`2233`	`2213`
`2234`	`2214`	`/*`
`2235`	`2215`	`* Compute the mapping from tleSortGroupRef to column index in the child's`

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!

Commit0babd10

File tree

2 files changed

2 files changed

`‎contrib/postgres_fdw/expected/postgres_fdw.out`

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

0 commit comments