From 9c64ddd414855fb10e0355e887745270a4464c50 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 6 Dec 2017 08:42:50 -0500 Subject: [PATCH] Fix Parallel Append crash. Reported by Tom Lane and the buildfarm. Amul Sul and Amit Khandekar Discussion: http://postgr.es/m/17868.1512519318@sss.pgh.pa.us Discussion: http://postgr.es/m/CAJ3gD9cJQ4d-XhmZ6BqM9rMM2KDBfpkdgOAb4+psz56uBuMQ_A@mail.gmail.com --- src/backend/executor/nodeAppend.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 246a0b2d85..0e9371373c 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -506,8 +506,16 @@ choose_next_subplan_for_worker(AppendState *node) node->as_whichplan = pstate->pa_next_plan++; if (pstate->pa_next_plan >= node->as_nplans) { - Assert(append->first_partial_plan < node->as_nplans); - pstate->pa_next_plan = append->first_partial_plan; + if (append->first_partial_plan < node->as_nplans) + pstate->pa_next_plan = append->first_partial_plan; + else + { + /* + * We have only non-partial plans, and we already chose the last + * one; so arrange for the other workers to immediately bail out. + */ + pstate->pa_next_plan = INVALID_SUBPLAN_INDEX; + } } /* If non-partial, immediately mark as finished. */ -- 2.40.0