Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a3367aa

Browse files
committed
Don't add bailout adjustment for non-strict deserialize calls.
When building aggregate expression steps, strict checks need a bailout jump for when a null value is encountered, so there is a list of steps that require later adjustment. Adding entries to that list for steps that aren't actually strict would be harmless, except that there is an Assert which catches them. This leads to spurious errors on asserts builds, for data sets that trigger parallel aggregation of an aggregate with a non-strict deserialization function (no such aggregates exist in the core system). Repair by not adding the adjustment entry when it's not needed. Backpatch back to 11 where the code was introduced. Per a report from Darafei (Komzpa) of the PostGIS project; analysis and patch by me. Discussion: https://postgr.es/m/87mty7peb3.fsf@news-spur.riddles.org.uk
1 parent bca96dd commit a3367aa

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/backend/executor/execExpr.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -3067,8 +3067,10 @@ ExecBuildAggTrans(AggState *aggstate, AggStatePerPhase phase,
30673067
scratch.resnull = &trans_fcinfo->args[argno + 1].isnull;
30683068

30693069
ExprEvalPushStep(state, &scratch);
3070-
adjust_bailout = lappend_int(adjust_bailout,
3071-
state->steps_len - 1);
3070+
/* don't add an adjustment unless the function is strict */
3071+
if (pertrans->deserialfn.fn_strict)
3072+
adjust_bailout = lappend_int(adjust_bailout,
3073+
state->steps_len - 1);
30723074

30733075
/* restore normal settings of scratch fields */
30743076
scratch.resvalue = &state->resvalue;

0 commit comments

Comments
 (0)