database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-17 17:02:08 +03:00
Code Activity

Allow the planner-related functions and hook to accept the query string.

Browse Source 
This commit adds query_string argument into the planner-related functions
and hook and allows us to pass the query string to them.

Currently there is no user of the query string passed. But the upcoming patch
for the planning counters will add the planning hook function into
pg_stat_statements and the function will need the query string. So this change
will be necessary for that patch.

Also this change is useful for some extensions that want to use the query
string in their planner hook function.

Author: Pascal Legrand, Julien Rouhaud
Reviewed-by: Yoshikazu Imai, Tom Lane, Fujii Masao
Discussion: https://postgr.es/m/CAOBaU_bU1m3_XF5qKYtSj1ua4dxd=FWDyh2SH4rSJAUUfsGmAQ@mail.gmail.com
Discussion: https://postgr.es/m/1583789487074-0.post@n3.nabble.com
This commit is contained in:
Fujii Masao
2020-03-30 13:51:05 +09:00
parent 4a539a25eb
commit 6aba63ef3e
13 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/tcop/postgres.c
View File

@ -854,7 +854,8 @@ pg_rewrite_query(Query *query)
* This is a thin wrapper around planner() and takes the same parameters.
*/
PlannedStmt *
pg_plan_query(Query *querytree, int cursorOptions, ParamListInfo boundParams)
pg_plan_query(Query *querytree, const char *query_string, int cursorOptions,
ParamListInfo boundParams)
{
PlannedStmt *plan;
@ -871,7 +872,7 @@ pg_plan_query(Query *querytree, int cursorOptions, ParamListInfo boundParams)
ResetUsage();
/* call the optimizer */
plan = planner(querytree, cursorOptions, boundParams);
plan = planner(querytree, query_string, cursorOptions, boundParams);
if (log_planner_stats)
ShowUsage("PLANNER STATISTICS");
@ -939,7 +940,8 @@ pg_plan_query(Query *querytree, int cursorOptions, ParamListInfo boundParams)
* The result is a list of PlannedStmt nodes.
*/
List *
pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams)
pg_plan_queries(List *querytrees, const char *query_string, int cursorOptions,
ParamListInfo boundParams)
{
List *stmt_list = NIL;
ListCell *query_list;
@ -961,7 +963,8 @@ pg_plan_queries(List *querytrees, int cursorOptions, ParamListInfo boundParams)
}
else
{
stmt = pg_plan_query(query, cursorOptions, boundParams);
stmt = pg_plan_query(query, query_string, cursorOptions,
boundParams);
}
stmt_list = lappend(stmt_list, stmt);
@ -1152,7 +1155,7 @@ exec_simple_query(const char *query_string)
querytree_list = pg_analyze_and_rewrite(parsetree, query_string,
NULL, 0, NULL);
plantree_list = pg_plan_queries(querytree_list,
plantree_list = pg_plan_queries(querytree_list, query_string,
CURSOR_OPT_PARALLEL_OK, NULL);
/*