Use already created EState while explaining FQS-ed query.

This ensures that we get details about supplied parameters correctly.

diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 38dec4d5e45ba185fb3d22fa6c3cff1ebc291512..23496b4f8fc890aae3a4824074af29c20cc944e4 100644 (file)
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -3614,13 +3614,9 @@ ExplainRemoteQuery(RemoteQuery *plan, PlanState *planstate, List *ancestors, Exp
                plan->scan.plan.targetlist = lappend(plan->scan.plan.targetlist,
                                makeTargetEntry((Expr *) dummy, 1, "QUERY PLAN", false));
 
-               /* Execute query on the data nodes */
-               estate = CreateExecutorState();
-
+               estate = planstate->state;
                oldcontext = MemoryContextSwitchTo(estate->es_query_cxt);
 
-               estate->es_snapshot = GetActiveSnapshot();
-
                node = ExecInitRemoteQuery(step, estate, 0);
                MemoryContextSwitchTo(oldcontext);
                result = ExecRemoteQuery(node);