Commitcc5263d

michaelpq

authored and

pull[bot]

committed

Add some sanity checks in executor for query ID reporting

This commit adds three sanity checks in code paths of the executor whereit is possible to use hooks, checking that a query ID is reported inpg_stat_activity if compute_query_id is enabled:- ExecutorRun()- ExecutorFinish()- ExecutorEnd()This causes the test in pg_stat_statements added in933848d tocomplain immediately in ExecutorRun(). The idea behind this commit isto help extensions to detect if they are missing query ID reports when aquery goes through the executor. Perhaps this will prove to be a badidea, but let's see where this experience goes in v18 and newerversions.Reviewed-by: Sami ImseihDiscussion:https://postgr.es/m/ZuJb5xCKHH0A9tMN@paquier.xyz

1 parent9b1a3e3 commitcc5263dCopy full SHA for cc5263d

File tree

1 file changed

+10

-0

lines changed

src/backend/executor
- execMain.c

1 file changed

+10

-0

lines changed

`‎src/backend/executor/execMain.c`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`#include"foreign/fdwapi.h"`
`51`	`51`	`#include"mb/pg_wchar.h"`
`52`	`52`	`#include"miscadmin.h"`
	`53`	`+#include"nodes/queryjumble.h"`
`53`	`54`	`#include"parser/parse_relation.h"`
`54`	`55`	`#include"rewrite/rewriteHandler.h"`
`55`	`56`	`#include"tcop/utility.h"`
`@@ -295,6 +296,9 @@ ExecutorRun(QueryDesc *queryDesc,`
`295`	`296`	`ScanDirectiondirection,uint64count,`
`296`	`297`	`boolexecute_once)`
`297`	`298`	`{`
	`299`	`+/* If enabled, the query ID should be set. */`
	`300`	`+Assert(!IsQueryIdEnabled()\|\|pgstat_get_my_query_id()!=0);`
	`301`	`+`
`298`	`302`	`if (ExecutorRun_hook)`
`299`	`303`	`(*ExecutorRun_hook) (queryDesc,direction,count,execute_once);`
`300`	`304`	`else`
`@@ -403,6 +407,9 @@ standard_ExecutorRun(QueryDesc *queryDesc,`
`403`	`407`	`void`
`404`	`408`	`ExecutorFinish(QueryDesc*queryDesc)`
`405`	`409`	`{`
	`410`	`+/* If enabled, the query ID should be set. */`
	`411`	`+Assert(!IsQueryIdEnabled()\|\|pgstat_get_my_query_id()!=0);`
	`412`	`+`
`406`	`413`	`if (ExecutorFinish_hook)`
`407`	`414`	`(*ExecutorFinish_hook) (queryDesc);`
`408`	`415`	`else`
`@@ -463,6 +470,9 @@ standard_ExecutorFinish(QueryDesc *queryDesc)`
`463`	`470`	`void`
`464`	`471`	`ExecutorEnd(QueryDesc*queryDesc)`
`465`	`472`	`{`
	`473`	`+/* If enabled, the query ID should be set. */`
	`474`	`+Assert(!IsQueryIdEnabled()\|\|pgstat_get_my_query_id()!=0);`
	`475`	`+`
`466`	`476`	`if (ExecutorEnd_hook)`
`467`	`477`	`(*ExecutorEnd_hook) (queryDesc);`
`468`	`478`	`else`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcc5263d

File tree

1 file changed

1 file changed

`‎src/backend/executor/execMain.c`

0 commit comments