Add QueryEnvironment to ExplainOneQuery_hook's parameter list.

tglsfdc · tglsfdc · commit 4d41b2e09265 · 2018-01-11T12:16:18.000-05:00
This should have been done in commit 18ce3a4, which added that parameter to ExplainOneQuery, but it was overlooked. This makes it impossible for a user of the hook to pass the queryEnv down to ExplainOnePlan. It's too late to change this API in v10, I suppose, but fortunately passing NULL to ExplainOnePlan will work in nearly all interesting cases in v10. That might not be true forever, so we'd better fix it. Tatsuro Yamada, reviewed by Thomas Munro Discussion: https://postgr.es/m/890e8dd9-c1c7-a422-6892-874f5eaee048@lab.ntt.co.jp
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
@@ -351,7 +351,7 @@ ExplainOneQuery(Query *query, int cursorOptions,
 	/* if an advisor plugin is present, let it manage things */
 	if (ExplainOneQuery_hook)
 		(*ExplainOneQuery_hook) (query, cursorOptions, into, es,
-								 queryString, params);
+								 queryString, params, queryEnv);
 	else
 	{
 		PlannedStmt *plan;
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
@@ -53,7 +53,8 @@ typedef void (*ExplainOneQuery_hook_type) (Query *query,
 										   IntoClause *into,
 										   ExplainState *es,
 										   const char *queryString,
-										   ParamListInfo params);
+										   ParamListInfo params,
+										   QueryEnvironment *queryEnv);
 extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
 
 /* Hook for plugins to get control in explain_get_index_name() */

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ ExplainOneQuery(Query *query, int cursorOptions,`
`351`	`351`	`/* if an advisor plugin is present, let it manage things */`
`352`	`352`	`if (ExplainOneQuery_hook)`
`353`	`353`	`(*ExplainOneQuery_hook) (query, cursorOptions, into, es,`
`354`		`- queryString, params);`
	`354`	`+ queryString, params, queryEnv);`
`355`	`355`	`else`
`356`	`356`	`{`
`357`	`357`	`PlannedStmt *plan;`