mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-11-27 07:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add query text to auto_explain output.

Browse Source 
Still to be done: fix docs and fix regression failures under auto_explain.
This commit is contained in:
Andrew Dunstan 2010-02-16 22:19:59 +00:00
parent 56adf3703c
commit fc5173ad51
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/auto_explain/auto_explain.c
View File

@ -6,7 +6,7 @@
* Copyright (c) 2008-2010, PostgreSQL Global Development Group * Copyright (c) 2008-2010, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.12 2010/01/06 18:07:19 tgl Exp $ * $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.13 2010/02/16 22:19:59 adunstan Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -240,6 +240,7 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
es.format = auto_explain_log_format; es.format = auto_explain_log_format;
ExplainBeginOutput(&es); ExplainBeginOutput(&es);
ExplainQueryText(&es, queryDesc);
ExplainPrintPlan(&es, queryDesc); ExplainPrintPlan(&es, queryDesc);
ExplainEndOutput(&es); ExplainEndOutput(&es);
@ -255,7 +256,8 @@ explain_ExecutorEnd(QueryDesc *queryDesc)
*/ */
ereport(LOG, ereport(LOG,
(errmsg("duration: %.3f ms plan:\n%s", (errmsg("duration: %.3f ms plan:\n%s",
msec, es.str->data))); msec, es.str->data),
errhidestmt(true)));
pfree(es.str->data); pfree(es.str->data);
} }

17
src/backend/commands/explain.c
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1994-5, Regents of the University of California * Portions Copyright (c) 1994-5, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.202 2010/02/16 20:07:13 stark Exp $ * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.203 2010/02/16 22:19:59 adunstan Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -487,6 +487,21 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc)
NULL, NULL, NULL, es); NULL, NULL, NULL, es);
} }
/*
* ExplainQueryText -
* add a "Query Text" node that contains the actual text of the query
*
* The caller should have set up the options fields of *es, as well as
* initializing the output buffer es->str.
*
*/
void
ExplainQueryText(ExplainState *es, QueryDesc *queryDesc)
{
if (queryDesc->sourceText)
ExplainPropertyText("Query Text", queryDesc->sourceText, es);
}
/* /*
* report_triggers - * report_triggers -
* report execution stats for a single relation's triggers * report execution stats for a single relation's triggers

4
src/include/commands/explain.h
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1994-5, Regents of the University of California * Portions Copyright (c) 1994-5, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.45 2010/01/02 16:58:03 momjian Exp $ * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.46 2010/02/16 22:19:59 adunstan Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -66,6 +66,8 @@ extern void ExplainOnePlan(PlannedStmt *plannedstmt, ExplainState *es,
extern void ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc); extern void ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc);
extern void ExplainQueryText(ExplainState *es, QueryDesc *queryDesc);
extern void ExplainBeginOutput(ExplainState *es); extern void ExplainBeginOutput(ExplainState *es);
extern void ExplainEndOutput(ExplainState *es); extern void ExplainEndOutput(ExplainState *es);
extern void ExplainSeparatePlans(ExplainState *es); extern void ExplainSeparatePlans(ExplainState *es);