mirror of
https://github.com/postgres/postgres.git
synced 2025-05-03 22:24:49 +03:00
Fix incorrect presorted DISTINCT aggregate if condition
Here we fix a faulty "if" condition which failed to correctly handle two or more consecutive NULL transition values when checking if the new value is DISTINCT from the old value for presorted aggregates. Given a suitably non-strict aggregate transition function, a byref aggregate could cause a crash due to calling the type's equality function and passing along a (Datum) 0 value to test for equality, the equality function would then try to dereference that 0 Datum and segfault. For byval types, there'd have been no crash and the equality function would have seen that the two 0 Datums matched, which (only by chance) meant the calling code would have worked correctly. Here we ensure that we only call the equality function when neither of the input values are NULL. This code is all new as of 1349d2790, so no backpatch needed. Reported-by: Fujii Masao Discussion: https://postgr.es/m/860c6d6f-a3c5-3ae9-9da2-827177bede06@oss.nttdata.com
This commit is contained in:
parent
836c31ba50
commit
7da51590ed
@ -4250,9 +4250,9 @@ ExecEvalPreOrderedDistinctSingle(AggState *aggstate, AggStatePerTrans pertrans)
|
||||
|
||||
if (!pertrans->haslast ||
|
||||
pertrans->lastisnull != isnull ||
|
||||
!DatumGetBool(FunctionCall2Coll(&pertrans->equalfnOne,
|
||||
pertrans->aggCollation,
|
||||
pertrans->lastdatum, value)))
|
||||
(!isnull && !DatumGetBool(FunctionCall2Coll(&pertrans->equalfnOne,
|
||||
pertrans->aggCollation,
|
||||
pertrans->lastdatum, value))))
|
||||
{
|
||||
if (pertrans->haslast && !pertrans->inputtypeByVal)
|
||||
pfree(DatumGetPointer(pertrans->lastdatum));
|
||||
|
@ -1506,6 +1506,14 @@ group by ten;
|
||||
-> Seq Scan on tenk1
|
||||
(5 rows)
|
||||
|
||||
-- Ensure consecutive NULLs are properly treated as distinct from each other
|
||||
select array_agg(distinct val)
|
||||
from (select null as val from generate_series(1, 2));
|
||||
array_agg
|
||||
-----------
|
||||
{NULL}
|
||||
(1 row)
|
||||
|
||||
-- Ensure no ordering is requested when enable_presorted_aggregate is off
|
||||
set enable_presorted_aggregate to off;
|
||||
explain (costs off)
|
||||
|
@ -567,6 +567,10 @@ select
|
||||
from tenk1
|
||||
group by ten;
|
||||
|
||||
-- Ensure consecutive NULLs are properly treated as distinct from each other
|
||||
select array_agg(distinct val)
|
||||
from (select null as val from generate_series(1, 2));
|
||||
|
||||
-- Ensure no ordering is requested when enable_presorted_aggregate is off
|
||||
set enable_presorted_aggregate to off;
|
||||
explain (costs off)
|
||||
|
Loading…
x
Reference in New Issue
Block a user