From d4d469da18d6442fed5a6fd5824f827e28cf5bb3 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 11 Sep 2024 14:12:24 +0900 Subject: [PATCH 1/3] Fix reporting of query ID with extended query protocol A query run through the extended query protocol would miss reporting its query ID to pg_stat_statements, as the value is reset when beginning the processing of a new execute message. ExecutorStart() was calling pgstat_report_query_id(), but it missed the fact that multiple ExecutorRun() calls could be issued for a single query with an initial ExecutorStart() across multiple execute messages, hence the query ID would be missing in the second execute. Backpatch-through: 14 --- src/backend/executor/execMain.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 29e186fa73..94e18f2e36 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -119,10 +119,11 @@ void ExecutorStart(QueryDesc *queryDesc, int eflags) { /* - * In some cases (e.g. an EXECUTE statement) a query execution will skip - * parse analysis, which means that the query_id won't be reported. Note - * that it's harmless to report the query_id multiple times, as the call - * will be ignored if the top level query_id has already been reported. + * In some cases (e.g. an EXECUTE statement or an execute message with + * the extended query protocol) the query_id won't be reported, so do it + * now. Note that it's harmless to report the query_id multiple times, + * as the call will be ignored if the top level query_id has already been + * reported. */ pgstat_report_query_id(queryDesc->plannedstmt->queryId, false); @@ -293,6 +294,17 @@ ExecutorRun(QueryDesc *queryDesc, ScanDirection direction, uint64 count, bool execute_once) { + /* + * When executing a query with the extended query protocol, + * ExecutorStart() may not be called, causing the query ID to not be + * reported. Hence, do it again here in case it was missed. + * + * Reporting multiple times the query ID is harmless. + * + * See also comments in ExecutorStart(). + */ + pgstat_report_query_id(queryDesc->plannedstmt->queryId, false); + if (ExecutorRun_hook) (*ExecutorRun_hook) (queryDesc, direction, count, execute_once); else -- 2.45.2