Commit249126e

committed

Use context with correct lifetime in hypothetical_dense_rank_final.

The query lifetime expression context created inhypothetical_dense_rank_final() was buggily allocated in the callingmemory context. I (Andres) broke that inbf6c614.Reported-By: Rajkumar RaghuwanshiAuthor: Amit LangoteDiscussion:https://postgr.es/m/CAKcux6kmzWmur5HhA_aU6gYVFu0RLQdgJJ+aC9SLdcOvBSrpfA@mail.gmail.comBackpatch: 11-

1 parent3a01f68 commit249126eCopy full SHA for 249126e

File tree

+21

-1

lines changed

+21

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1310,7 +1310,15 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)`
`1310`	`1310`	`osastate= (OSAPerGroupState*)PG_GETARG_POINTER(0);`
`1311`	`1311`	`econtext=osastate->qstate->econtext;`
`1312`	`1312`	`if (!econtext)`
`1313`		`-osastate->qstate->econtext=econtext=CreateStandaloneExprContext();`
	`1313`	`+{`
	`1314`	`+MemoryContextoldcontext;`
	`1315`	`+`
	`1316`	`+/* Make sure to we create econtext under correct parent context. */`
	`1317`	`+oldcontext=MemoryContextSwitchTo(osastate->qstate->qcontext);`
	`1318`	`+osastate->qstate->econtext=CreateStandaloneExprContext();`
	`1319`	`+econtext=osastate->qstate->econtext;`
	`1320`	`+MemoryContextSwitchTo(oldcontext);`
	`1321`	`+}`
`1314`	`1322`
`1315`	`1323`	`/* Adjust nargs to be the number of direct (or aggregated) args */`
`1316`	`1324`	`if (nargs %2!=0)`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2092,3 +2092,12 @@ SELECT variance(unique1::int4), sum(unique1::int8) FROM tenk1;`
`2092`	`2092`	`(1 row)`
`2093`	`2093`
`2094`	`2094`	`ROLLBACK;`
	`2095`	`+-- test coverage for dense_rank`
	`2096`	`+SELECT dense_rank(x) WITHIN GROUP (ORDER BY x) FROM (VALUES (1),(1),(2),(2),(3),(3)) v(x) GROUP BY (x) ORDER BY 1;`
	`2097`	`+ dense_rank`
	`2098`	`+------------`
	`2099`	`+ 1`
	`2100`	`+ 1`
	`2101`	`+ 1`
	`2102`	`+(3 rows)`
	`2103`	`+`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -925,3 +925,6 @@ EXPLAIN (COSTS OFF)`
`925`	`925`	`SELECT variance(unique1::int4),sum(unique1::int8)FROM tenk1;`
`926`	`926`
`927`	`927`	`ROLLBACK;`
	`928`	`+`
	`929`	`+-- test coverage for dense_rank`
	`930`	`+SELECT dense_rank(x) WITHIN GROUP (ORDER BY x)FROM (VALUES (1),(1),(2),(2),(3),(3)) v(x)GROUP BY (x)ORDER BY1;`

Comments

(0)