external/pg_stat_monitor
1
0
Fork 0
mirror of https://github.com/percona/pg_stat_monitor.git synced 2026-02-04 05:56:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84 from darkfronza/PG-197_fix_conflict_pg_stat_statements

Browse Source 
PG-197: Fix conflict with pg_stat_statements
This commit is contained in:
Ibrar Ahmed
2021-07-26 18:26:14 +05:00
committed by GitHub
parent 2200ba8659 a3a4c99011
commit c329646b0f
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pg_stat_monitor.c
View File

@@ -699,9 +699,17 @@ pgss_planner_hook(Query *parse, const char *query_string, int cursorOptions, Par
plan_nested_level++; plan_nested_level++;
PG_TRY(); PG_TRY();
{ {
if (planner_hook_next) /*
result = planner_hook_next(parse, query_string, cursorOptions, boundParams); * If there is a previous installed hook, then assume it's going to call
result = standard_planner(parse, query_string, cursorOptions, boundParams); * standard_planner() function, otherwise we call the function here.
* This is to avoid calling standard_planner() function twice, since it
* modifies the first argument (Query *), the second call would trigger an
* assertion failure.
*/
if (planner_hook_next)
result = planner_hook_next(parse, query_string, cursorOptions, boundParams);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
} }
PG_FINALLY(); PG_FINALLY();
{ {
@@ -734,9 +742,17 @@ pgss_planner_hook(Query *parse, const char *query_string, int cursorOptions, Par
} }
else else
{ {
/*
* If there is a previous installed hook, then assume it's going to call
* standard_planner() function, otherwise we call the function here.
* This is to avoid calling standard_planner() function twice, since it
* modifies the first argument (Query *), the second call would trigger an
* assertion failure.
*/
if (planner_hook_next) if (planner_hook_next)
result = planner_hook_next(parse, query_string, cursorOptions, boundParams); result = planner_hook_next(parse, query_string, cursorOptions, boundParams);
result = standard_planner(parse, query_string, cursorOptions, boundParams); else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
} }
return result; return result;
} }