postgrespro
diff --git a/‎contrib/auto_explain/auto_explain.c
Lines changed: 1 addition & 2 deletions b/‎contrib/auto_explain/auto_explain.c
Lines changed: 1 addition & 2 deletions
diff --git a/‎doc/src/sgml/jit.sgml
Lines changed: 2 additions & 6 deletions b/‎doc/src/sgml/jit.sgml
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/backend/commands/explain.c
Lines changed: 27 additions & 2 deletions b/‎src/backend/commands/explain.c
Lines changed: 27 additions & 2 deletions
diff --git a/‎src/backend/executor/execMain.c
Lines changed: 0 additions & 15 deletions b/‎src/backend/executor/execMain.c
Lines changed: 0 additions & 15 deletions
diff --git a/‎src/backend/executor/execParallel.c
Lines changed: 4 additions & 5 deletions b/‎src/backend/executor/execParallel.c
Lines changed: 4 additions & 5 deletions
diff --git a/‎src/include/commands/explain.h
Lines changed: 1 addition & 0 deletions b/‎src/include/commands/explain.h
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/include/nodes/execnodes.h
Lines changed: 4 additions & 4 deletions b/‎src/include/nodes/execnodes.h
Lines changed: 4 additions & 4 deletions
@@ -336,8 +336,7 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
 			if (es->analyze && auto_explain_log_triggers)
 				ExplainPrintTriggers(es, queryDesc);
 			if (es->costs)
-				ExplainPrintJIT(es, queryDesc->estate->es_jit_flags,
-								queryDesc->estate->es_jit_combined_instr, -1);
+				ExplainPrintJITSummary(es, queryDesc);
 			ExplainEndOutput(es);
 
 			/* Remove last line break */
 
@@ -169,12 +169,8 @@ SET
  Planning Time: 0.133 ms
  JIT:
    Functi
8000
ons: 3
-   Generation Time: 1.259 ms
-   Inlining: false
-   Inlining Time: 0.000 ms
-   Optimization: false
-   Optimization Time: 0.797 ms
-   Emission Time: 5.048 ms
+   Options: Inlining false, Optimization false, Expressions true, Deforming true
+   Timing: Generation 1.259 ms, Inlining 0.000 ms, Optimization 0.797 ms, Emission 5.048 ms, Total 7.104 ms
  Execution Time: 7.416 ms
 </screen>
    As visible here, <acronym>JIT</acronym> was used, but inlining and
 
@@ -564,8 +564,7 @@ ExplainOnePlan(PlannedStmt *plannedstmt, IntoClause *into, ExplainState *es,
 	 * at a later stage.
 	 */
 	if (es->costs)
-		ExplainPrintJIT(es, queryDesc->estate->es_jit_flags,
-						queryDesc->estate->es_jit_combined_instr, -1);
+		ExplainPrintJITSummary(es, queryDesc);
 
 	/*
 	 * Close down the query and free resources.  Include time for this in the
@@ -688,6 +687,32 @@ ExplainPrintTriggers(ExplainState *es, QueryDesc *queryDesc)
 	ExplainCloseGroup("Triggers", "Triggers", false, es);
 }
 
+/*
+ * ExplainPrintJITSummary -
+ *    Print summarized JIT instrumentation from leader and workers
+ */
+void
+ExplainPrintJITSummary(ExplainState *es, QueryDesc *queryDesc)
+{
+	JitInstrumentation ji = {0};
+
+	if (!(queryDesc->estate->es_jit_flags & PGJIT_PERFORM))
+		return;
+
+	/*
+	 * Work with a copy instead of modifying the leader state, since this
+	 * function may be called twice
+	 */
+	if (queryDesc->estate->es_jit)
+		InstrJitAgg(&ji, &queryDesc->estate->es_jit->instr);
+
+	/* If this process has done JIT in parallel workers, merge stats */
+	if (queryDesc->estate->es_jit_worker_instr)
+		InstrJitAgg(&ji, queryDesc->estate->es_jit_worker_instr);
+
+	ExplainPrintJIT(es, queryDesc->estate->es_jit_flags, &ji, -1);
+}
+
 /*
  * ExplainPrintJIT -
  *	  Append information about JITing to es->str.
 
@@ -495,21 +495,6 @@ standard_ExecutorEnd(QueryDesc *queryDesc)
 
 	ExecEndPlan(queryDesc->planstate, estate);
 
-	/*
-	 * If this process has done JIT, either merge stats into worker stats, or
-	 * use this process' stats as the global stats if no parallelism was used
-	 * / no workers did JIT.
-	 */
-	if (estate->es_instrument && queryDesc->estate->es_jit)
-	{
-		if (queryDesc->estate->es_jit_combined_instr)
-			InstrJitAgg(queryDesc->estate->es_jit_combined_instr,
-						&queryDesc->estate->es_jit->instr);
-		else
-			queryDesc->estate->es_jit_combined_instr =
-				&queryDesc->estate->es_jit->instr;
-	}
-
 	/* do away with our snapshots */
 	UnregisterSnapshot(estate->es_snapshot);
 	UnregisterSnapshot(estate->es_crosscheck_snapshot);
 
@@ -1043,13 +1043,12 @@ ExecParallelRetrieveJitInstrumentation(PlanState *planstate,
 
 	/*
 	 * Accumulate worker JIT instrumentation into the combined JIT
-	 * instrumentation, allocating it if required. Note this is kept separate
-	 * from the leader's own instrumentation.
+	 * instrumentation, allocating it if required.
 	 */
-	if (!planstate->state->es_jit_combined_instr)
-		planstate->state->es_jit_combined_instr =
+	if (!planstate->state->es_jit_worker_instr)
+		planstate->state->es_jit_worker_instr =
 			MemoryContextAllocZero(planstate->state->es_query_cxt, sizeof(JitInstrumentation));
-	combined = planstate->state->es_jit_combined_instr;
+	combined = planstate->state->es_jit_worker_instr;
 
 	/* Accummulate all the workers' instrumentations. */
 	for (n = 0; n < shared_jit->num_workers; ++n)
 
@@ -81,6 +81,7 @@ extern void ExplainOnePlan(PlannedStmt *plannedstmt, IntoClause *into,
 extern void ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc);
 extern void ExplainPrintTriggers(ExplainState *es, QueryDesc *queryDesc);
 
+extern void ExplainPrintJITSummary(ExplainState *es, QueryDesc *queryDesc);
 extern void ExplainPrintJIT(ExplainState *es, int jit_flags,
 				struct JitInstrumentation *jit_instr, int worker_i);
 
 
@@ -570,13 +570,13 @@ typedef struct EState
 	 * and with which options.  es_jit is created on-demand when JITing is
 	 * performed.
 	 *
-	 * es_jit_combined_instr, at the end of query execution with
-	 * instrumentation enabled, is the the combined instrumentation
-	 * information of leader and followers.
+	 * es_jit_combined_instr is the the combined, on demand allocated,
+	 * instrumentation from all workers. The leader's instrumentation is kept
+	 * separate, and is combined on demand by ExplainPrintJITSummary().
 	 */
 	int			es_jit_flags;
 	struct JitContext *es_jit;
-	struct JitInstrumentation *es_jit_combined_instr;
+	struct JitInstrumentation *es_jit_worker_instr;
 } EState;