Skip to content
Snippets Groups Projects
Commit 5788cca5 authored by Neil Conway's avatar Neil Conway
Browse files

Remove unused 'printCost' field from ExplainState, and simplify the code

accordingly (this field was always initialized to true). Patch from
Alvaro Herrera.
parent ba420024
Branches
Tags
No related merge requests found
......@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994-5, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.136 2005/06/03 23:05:28 tgl Exp $
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.137 2005/06/04 02:07:09 neilc Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -38,7 +38,6 @@
typedef struct ExplainState
{
/* options */
bool printCost; /* print cost */
bool printNodes; /* do nodeToString() too */
bool printAnalyze; /* print actual times */
/* other states */
......@@ -246,7 +245,6 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
es = (ExplainState *) palloc0(sizeof(ExplainState));
es->printCost = true; /* default */
es->printNodes = stmt->verbose;
es->printAnalyze = stmt->analyze;
es->rtable = queryDesc->parsetree->rtable;
......@@ -266,18 +264,14 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
pfree(s);
do_text_output_multiline(tstate, f);
pfree(f);
if (es->printCost)
do_text_output_oneline(tstate, ""); /* separator line */
}
}
str = makeStringInfo();
if (es->printCost)
{
explain_outNode(str, queryDesc->plantree, queryDesc->planstate,
NULL, 0, es);
}
/*
* If we ran the command, run any AFTER triggers it queued. (Note this
......@@ -358,13 +352,10 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt,
totaltime += elapsed_time(&starttime);
if (es->printCost)
{
if (stmt->analyze)
appendStringInfo(str, "Total runtime: %.3f ms\n",
1000.0 * totaltime);
do_text_output_multiline(tstate, str->data);
}
pfree(str->data);
pfree(str);
......@@ -667,8 +658,7 @@ explain_outNode(StringInfo str,
default:
break;
}
if (es->printCost)
{
appendStringInfo(str, " (cost=%.2f..%.2f rows=%.0f width=%d)",
plan->startup_cost, plan->total_cost,
plan->plan_rows, plan->plan_width);
......@@ -692,7 +682,6 @@ explain_outNode(StringInfo str,
}
else if (es->printAnalyze)
appendStringInfo(str, " (never executed)");
}
appendStringInfoChar(str, '\n');
/* quals, sort keys, etc */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment