Index: src/backend/commands/explain.c =================================================================== --- src/backend/commands/explain.c (8.4dev 2008-08-26) +++ src/backend/commands/explain.c (working copy) @@ -224,7 +224,6 @@ QueryDesc *queryDesc; instr_time starttime; double totaltime = 0; - ExplainState *es; StringInfoData buf; int eflags; @@ -265,17 +264,8 @@ totaltime += elapsed_time(&starttime); } - es = (ExplainState *) palloc0(sizeof(ExplainState)); - - es->printTList = stmt->verbose; - es->printAnalyze = stmt->analyze; - es->pstmt = queryDesc->plannedstmt; - es->rtable = queryDesc->plannedstmt->rtable; - initStringInfo(&buf); - explain_outNode(&buf, - queryDesc->plannedstmt->planTree, queryDesc->planstate, - NULL, 0, es); + ExplainOneResult(&buf, queryDesc, stmt->analyze, stmt->verbose); /* * If we ran the command, run any AFTER triggers it queued. (Note this @@ -290,7 +280,7 @@ } /* Print info about runtime of triggers */ - if (es->printAnalyze) + if (stmt->analyze) { ResultRelInfo *rInfo; bool show_relname; @@ -335,10 +325,29 @@ do_text_output_multiline(tstate, buf.data); pfree(buf.data); - pfree(es); } /* + * ExplainOneResult - + * converts a Plan node into ascii string and appends it to 'str' + */ +void +ExplainOneResult(StringInfo str, QueryDesc *queryDesc, + bool analyze, bool verbose) +{ + ExplainState es = { 0 }; + + es.printTList = verbose; + es.printAnalyze = analyze; + es.pstmt = queryDesc->plannedstmt; + es.rtable = queryDesc->plannedstmt->rtable; + + explain_outNode(str, + queryDesc->plannedstmt->planTree, queryDesc->planstate, + NULL, 0, &es); +} + +/* * report_triggers - * report execution stats for a single relation's triggers */ Index: src/include/commands/explain.h =================================================================== --- src/include/commands/explain.h (8.4dev 2008-08-26) +++ src/include/commands/explain.h (working copy) @@ -41,4 +41,7 @@ extern void ExplainOnePlan(PlannedStmt *plannedstmt, ParamListInfo params, ExplainStmt *stmt, TupOutputState *tstate); +extern void ExplainOneResult(StringInfo str, QueryDesc *queryDesc, + bool analyze, bool verbose); + #endif /* EXPLAIN_H */