Commitfc5173a

committed

Add query text to auto_explain output.

Still to be done: fix docs and fix regression failures under auto_explain.

1 parent56adf37 commitfc5173aCopy full SHA for fc5173a

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 2008-2010, PostgreSQL Global Development Group`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.12 2010/01/06 18:07:19 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.13 2010/02/16 22:19:59 adunstan Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -240,6 +240,7 @@ explain_ExecutorEnd(QueryDesc *queryDesc)`
`240`	`240`	`es.format=auto_explain_log_format;`
`241`	`241`
`242`	`242`	`ExplainBeginOutput(&es);`
	`243`	`+ExplainQueryText(&es,queryDesc);`
`243`	`244`	`ExplainPrintPlan(&es,queryDesc);`
`244`	`245`	`ExplainEndOutput(&es);`
`245`	`246`
`@@ -255,7 +256,8 @@ explain_ExecutorEnd(QueryDesc *queryDesc)`
`255`	`256`	`*/`
`256`	`257`	`ereport(LOG,`
`257`	`258`	`(errmsg("duration: %.3f ms plan:\n%s",`
`258`		`-msec,es.str->data)));`
	`259`	`+msec,es.str->data),`
	`260`	`+errhidestmt(true)));`
`259`	`261`
`260`	`262`	`pfree(es.str->data);`
`261`	`263`	`}`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1994-5, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.202 2010/02/1620:07:13 stark Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.203 2010/02/1622:19:59 adunstan Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -487,6 +487,21 @@ ExplainPrintPlan(ExplainState es, QueryDesc queryDesc)`
`487`	`487`	`NULL,NULL,NULL,es);`
`488`	`488`	`}`
`489`	`489`
	`490`	`+/*`
	`491`	`+ * ExplainQueryText -`
	`492`	`+ * add a "Query Text" node that contains the actual text of the query`
	`493`	`+ *`
	`494`	`+ * The caller should have set up the options fields of *es, as well as`
	`495`	`+ * initializing the output buffer es->str.`
	`496`	`+ *`
	`497`	`+ */`
	`498`	`+void`
	`499`	`+ExplainQueryText(ExplainStatees,QueryDescqueryDesc)`
	`500`	`+{`
	`501`	`+if (queryDesc->sourceText)`
	`502`	`+ExplainPropertyText("Query Text",queryDesc->sourceText,es);`
	`503`	`+}`
	`504`	`+`
`490`	`505`	`/*`
`491`	`506`	`* report_triggers -`
`492`	`507`	`*report execution stats for a single relation's triggers`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994-5, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.45 2010/01/02 16:58:03 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.46 2010/02/16 22:19:59 adunstan Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -66,6 +66,8 @@ extern void ExplainOnePlan(PlannedStmt plannedstmt, ExplainState es,`
`66`	`66`
`67`	`67`	`externvoidExplainPrintPlan(ExplainStatees,QueryDescqueryDesc);`
`68`	`68`
	`69`	`+externvoidExplainQueryText(ExplainStatees,QueryDescqueryDesc);`
	`70`	`+`
`69`	`71`	`externvoidExplainBeginOutput(ExplainState*es);`
`70`	`72`	`externvoidExplainEndOutput(ExplainState*es);`
`71`	`73`	`externvoidExplainSeparatePlans(ExplainState*es);`

Comments

(0)