Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcf5ba7c

Browse files
committed
Treat aggregate direct arguments as per-agg data not per-trans data.
There is no reason to insist that direct arguments must match beforewe can merge transition states of two aggregate calls. They're onlyused during the finalfn call, so we can treat them as like the finalfnitself. This allows, eg, merging ofselect percentile_cont(0.25) within group (order by a), percentile_disc(0.5) within group (order by a)from ...This didn't matter (and could not have been tested) before we allowedstate merging of OSAs otherwise.Discussion:https://postgr.es/m/CAB4ELO5RZhOamuT9Xsf72ozbenDLLXZKSk07FiSVsuJNZB861A@mail.gmail.com
1 parentbe0ebb6 commitcf5ba7c

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

‎src/backend/executor/nodeAgg.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,6 @@ typedef struct AggStatePerTransData
259259
*/
260260
boolaggshared;
261261

262-
/*
263-
* Nominal number of arguments for aggregate function. For plain aggs,
264-
* this excludes any ORDER BY expressions. For ordered-set aggs, this
265-
* counts both the direct and aggregated (ORDER BY) arguments.
266-
*/
267-
intnumArguments;
268-
269262
/*
270263
* Number of aggregated input columns. This includes ORDER BY expressions
271264
* in both the plain-agg and ordered-set cases. Ordered-set direct args
@@ -302,9 +295,6 @@ typedef struct AggStatePerTransData
302295
/* Oid of state value's datatype */
303296
Oidaggtranstype;
304297

305-
/* ExprStates for any direct-argument expressions */
306-
List*aggdirectargs;
307-
308298
/*
309299
* fmgr lookup data for transition function or combine function. Note in
310300
* particular that the fn_strict flag is kept here.
@@ -444,6 +434,9 @@ typedef struct AggStatePerAggData
444434
*/
445435
intnumFinalArgs;
446436

437+
/* ExprStates for any direct-argument expressions */
438+
List*aggdirectargs;
439+
447440
/*
448441
* We need the len and byval info for the agg's result data type in order
449442
* to know how to copy/delete values.
@@ -1544,7 +1537,7 @@ finalize_aggregate(AggState *aggstate,
15441537
* for the transition state value.
15451538
*/
15461539
i=1;
1547-
foreach(lc,pertrans->aggdirectargs)
1540+
foreach(lc,peragg->aggdirectargs)
15481541
{
15491542
ExprState*expr= (ExprState*)lfirst(lc);
15501543

@@ -3313,6 +3306,10 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
33133306
else
33143307
peragg->numFinalArgs=numDirectArgs+1;
33153308

3309+
/* Initialize any direct-argument expressions */
3310+
peragg->aggdirectargs=ExecInitExprList(aggref->aggdirectargs,
3311+
(PlanState*)aggstate);
3312+
33163313
/*
33173314
* build expression trees using actual argument & result types for the
33183315
* finalfn, if it exists and is required.
@@ -3657,10 +3654,6 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
36573654

36583655
}
36593656

3660-
/* Initialize any direct-argument expressions */
3661-
pertrans->aggdirectargs=ExecInitExprList(aggref->aggdirectargs,
3662-
(PlanState*)aggstate);
3663-
36643657
/*
36653658
* If we're doing either DISTINCT or ORDER BY for a plain agg, then we
36663659
* have a list of SortGroupClause nodes; fish out the data in them and
@@ -3847,7 +3840,6 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
38473840
newagg->aggstar!=existingRef->aggstar||
38483841
newagg->aggvariadic!=existingRef->aggvariadic||
38493842
newagg->aggkind!=existingRef->aggkind||
3850-
!equal(newagg->aggdirectargs,existingRef->aggdirectargs)||
38513843
!equal(newagg->args,existingRef->args)||
38523844
!equal(newagg->aggorder,existingRef->aggorder)||
38533845
!equal(newagg->aggdistinct,existingRef->aggdistinct)||
@@ -3857,7 +3849,8 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
38573849
/* if it's the same aggregate function then report exact match */
38583850
if (newagg->aggfnoid==existingRef->aggfnoid&&
38593851
newagg->aggtype==existingRef->aggtype&&
3860-
newagg->aggcollid==existingRef->aggcollid)
3852+
newagg->aggcollid==existingRef->aggcollid&&
3853+
equal(newagg->aggdirectargs,existingRef->aggdirectargs))
38613854
{
38623855
list_free(*same_input_transnos);
38633856
*same_input_transnos=NIL;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp