mirror of
https://github.com/postgres/postgres.git
synced 2025-07-12 21:01:52 +03:00
Allow nodeSort to perform Datum sorts for byref types
Here we add a new 'copy' parameter to tuplesort_getdatum so that we can instruct the function not to datumCopy() byref Datums before returning. Similar to91e9e89dc
, this can provide significant performance improvements in nodeSort when sorting by a single byref column and the sort's targetlist contains only that column. This allows us to re-enable Datum sorts for byref types which was disabled in3a5817695
due to a reported memory leak. Additionally, here we slightly optimize DISTINCT aggregates so that we no longer perform any datumCopy() when we find the current value not to be distinct from the previous value. Previously the code would always take a copy of the most recent Datum and pfree the previous value, even when the values were the same. Testing shows a small but noticeable performance increase when aggregate transitions are skipped due to the current transition value being the same as the prior one. Author: David Rowley Discussion: https://postgr.es/m/CAApHDvqS6wC5U==k9Hd26E4EQXH3QR67-T4=Q1rQ36NGvjfVSg@mail.gmail.com Discussion: https://postgr.es/m/CAApHDvqHonfe9G1cVaKeHbDx70R_zCrM3qP2AGXpGrieSKGnhA@mail.gmail.com
This commit is contained in:
@ -879,7 +879,7 @@ process_ordered_aggregate_single(AggState *aggstate,
|
||||
*/
|
||||
|
||||
while (tuplesort_getdatum(pertrans->sortstates[aggstate->current_set],
|
||||
true, newVal, isNull, &newAbbrevVal))
|
||||
true, false, newVal, isNull, &newAbbrevVal))
|
||||
{
|
||||
/*
|
||||
* Clear and select the working context for evaluation of the equality
|
||||
@ -900,24 +900,33 @@ process_ordered_aggregate_single(AggState *aggstate,
|
||||
pertrans->aggCollation,
|
||||
oldVal, *newVal)))))
|
||||
{
|
||||
/* equal to prior, so forget this one */
|
||||
if (!pertrans->inputtypeByVal && !*isNull)
|
||||
pfree(DatumGetPointer(*newVal));
|
||||
MemoryContextSwitchTo(oldContext);
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
advance_transition_function(aggstate, pertrans, pergroupstate);
|
||||
/* forget the old value, if any */
|
||||
if (!oldIsNull && !pertrans->inputtypeByVal)
|
||||
pfree(DatumGetPointer(oldVal));
|
||||
/* and remember the new one for subsequent equality checks */
|
||||
oldVal = *newVal;
|
||||
|
||||
MemoryContextSwitchTo(oldContext);
|
||||
|
||||
/*
|
||||
* Forget the old value, if any, and remember the new one for
|
||||
* subsequent equality checks.
|
||||
*/
|
||||
if (!pertrans->inputtypeByVal)
|
||||
{
|
||||
if (!oldIsNull)
|
||||
pfree(DatumGetPointer(oldVal));
|
||||
if (!*isNull)
|
||||
oldVal = datumCopy(*newVal, pertrans->inputtypeByVal,
|
||||
pertrans->inputtypeLen);
|
||||
}
|
||||
else
|
||||
oldVal = *newVal;
|
||||
oldAbbrevVal = newAbbrevVal;
|
||||
oldIsNull = *isNull;
|
||||
haveOldVal = true;
|
||||
}
|
||||
|
||||
MemoryContextSwitchTo(oldContext);
|
||||
}
|
||||
|
||||
if (!oldIsNull && !pertrans->inputtypeByVal)
|
||||
|
Reference in New Issue
Block a user