diff options
| author | Andres Freund <andres@anarazel.de> | 2018-07-04 17:36:01 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2018-07-04 17:36:19 -0700 |
| commit | e60cfcefe635b90bab60e885be689700759a01c6 (patch) | |
| tree | 324f3b82f5668beafda0832e0ed2e93f328f49d6 | |
| parent | 0c69db762d886ce2c2b0cb311e24ab76c4740c0b (diff) | |
| download | postgresql-e60cfcefe635b90bab60e885be689700759a01c6.tar.gz postgresql-e60cfcefe635b90bab60e885be689700759a01c6.zip | |
Use context with correct lifetime in hypothetical_dense_rank_final.
The query lifetime expression context created in
hypothetical_dense_rank_final() was buggily allocated in the calling
memory context. I (Andres) broke that in bf6c614a2f2.
Reported-By: Rajkumar Raghuwanshi
Author: Amit Langote
Discussion: https://postgr.es/m/CAKcux6kmzWmur5HhA_aU6gYVFu0RLQdgJJ+aC9SLdcOvBSrpfA@mail.gmail.com
Backpatch: 11-
| -rw-r--r-- | src/backend/utils/adt/orderedsetaggs.c | 10 | ||||
| -rw-r--r-- | src/test/regress/expected/aggregates.out | 9 | ||||
| -rw-r--r-- | src/test/regress/sql/aggregates.sql | 3 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/backend/utils/adt/orderedsetaggs.c b/src/backend/utils/adt/orderedsetaggs.c index ed36851fddf..5867f3df070 100644 --- a/src/backend/utils/adt/orderedsetaggs.c +++ b/src/backend/utils/adt/orderedsetaggs.c @@ -1310,7 +1310,15 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS) osastate = (OSAPerGroupState *) PG_GETARG_POINTER(0); econtext = osastate->qstate->econtext; if (!econtext) - osastate->qstate->econtext = econtext = CreateStandaloneExprContext(); + { + MemoryContext oldcontext; + + /* Make sure to we create econtext under correct parent context. */ + oldcontext = MemoryContextSwitchTo(osastate->qstate->qcontext); + osastate->qstate->econtext = CreateStandaloneExprContext(); + econtext = osastate->qstate->econtext; + MemoryContextSwitchTo(oldcontext); + } /* Adjust nargs to be the number of direct (or aggregated) args */ if (nargs % 2 != 0) diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index 10d6bb68240..a120dd83f7b 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -2092,3 +2092,12 @@ SELECT variance(unique1::int4), sum(unique1::int8) FROM tenk1; (1 row) ROLLBACK; +-- test coverage for dense_rank +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; + dense_rank +------------ + 1 + 1 + 1 +(3 rows) + diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql index 1b6db509560..7e77467ecd4 100644 --- a/src/test/regress/sql/aggregates.sql +++ b/src/test/regress/sql/aggregates.sql @@ -925,3 +925,6 @@ EXPLAIN (COSTS OFF) SELECT variance(unique1::int4), sum(unique1::int8) FROM tenk1; ROLLBACK; + +-- test coverage for dense_rank +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; |