Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit933848d

Browse files
committed
Add missing query ID reporting in extended query protocol
This commit adds query ID reports for two code paths when processingextended query protocol messages:- When receiving a bind message, setting it to the first Query retrievedfrom a cached cache.- When receiving an execute message, setting it to the first PlannedStmtstored in a portal.An advantage of this method is that this is able to cover all the typesof portals handled in the extended query protocol, particularly thesetwo when the report done in ExecutorStart() is not enough (neither is anaddition in ExecutorRun(), actually, for the second point):- Multiple execute messages, with multiple ExecutorRun().- Portal with execute/fetch messages, like a query with a RETURNINGclause and a fetch size that stores the tuples in a first executemessage going though ExecutorStart() and ExecuteRun(), followed by oneor more execute messages doing only fetches from the tuplestore createdin the first message. This corresponds to the case whereexecute_is_fetch is set, for example.Note that the query ID reporting done in ExecutorStart() is stillnecessary, as an EXECUTE requires it. Query ID reporting is optimisticand more calls to pgstat_report_query_id() don't matter as the firstreport takes priority except if the report is forced. The comment inExecutorStart() is adjusted to reflect better the reality with theextended query protocol.The test added in pg_stat_statements is a courtesy of Robert Haas. Thisuses psql's \bind metacommand, hence this part is backpatched down tov16.Reported-by: Kaido Vaikla, Erik WienholdAuthor: Sami ImseihReviewed-by: Jian He, Andrei Lepikhov, Michael PaquierDiscussion:https://postgr.es/m/CA+427g8DiW3aZ6pOpVgkPbqK97ouBdf18VLiHFesea2jUk3XoQ@mail.gmail.comDiscussion:https://postgr.es/m/CA+TgmoZxtnf_jZ=VqBSyaU8hfUkkwoJCJ6ufy4LGpXaunKrjrg@mail.gmail.comDiscussion:https://postgr.es/m/1391613709.939460.1684777418070@office.mailbox.orgBackpatch-through: 14
1 parent70d38e3 commit933848d

File tree

4 files changed

+42
-4
lines changed

4 files changed

+42
-4
lines changed

‎contrib/pg_stat_statements/expected/extended.out

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
-- Tests with extended query protocol
22
SET pg_stat_statements.track_utility = FALSE;
3+
-- This test checks that an execute message sets a query ID.
4+
SELECT query_id IS NOT NULL AS query_id_set
5+
FROM pg_stat_activity WHERE pid = pg_backend_pid() \bind \g
6+
query_id_set
7+
--------------
8+
t
9+
(1 row)
10+
311
SELECT pg_stat_statements_reset() IS NOT NULL AS t;
412
t
513
---

‎contrib/pg_stat_statements/sql/extended.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
SETpg_stat_statements.track_utility= FALSE;
44

5+
-- This test checks that an execute message sets a query ID.
6+
SELECT query_idIS NOT NULLAS query_id_set
7+
FROM pg_stat_activityWHERE pid= pg_backend_pid() \bind \g
8+
59
SELECT pg_stat_statements_reset()IS NOT NULLAS t;
610
SELECT $1 \parse stmt1
711
SELECT $1, $2 \parse stmt2

‎src/backend/executor/execMain.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,12 @@ void
119119
ExecutorStart(QueryDesc*queryDesc,inteflags)
120120
{
121121
/*
122-
* In some cases (e.g. an EXECUTE statement) a query execution will skip
123-
* parse analysis, which means that the query_id won't be reported. Note
124-
* that it's harmless to report the query_id multiple times, as the call
125-
* will be ignored if the top level query_id has already been reported.
122+
* In some cases (e.g. an EXECUTE statement or an execute message with the
123+
* extended query protocol) the query_id won't be reported, so do it now.
124+
*
125+
* Note that it's harmless to report the query_id multiple times, as the
126+
* call will be ignored if the top level query_id has already been
127+
* reported.
126128
*/
127129
pgstat_report_query_id(queryDesc->plannedstmt->queryId, false);
128130

‎src/backend/tcop/postgres.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1654,6 +1654,7 @@ exec_bind_message(StringInfo input_message)
16541654
charmsec_str[32];
16551655
ParamsErrorCbDataparams_data;
16561656
ErrorContextCallbackparams_errcxt;
1657+
ListCell*lc;
16571658

16581659
/* Get the fixed part of the message */
16591660
portal_name=pq_getmsgstring(input_message);
@@ -1689,6 +1690,17 @@ exec_bind_message(StringInfo input_message)
16891690

16901691
pgstat_report_activity(STATE_RUNNING,psrc->query_string);
16911692

1693+
foreach(lc,psrc->query_list)
1694+
{
1695+
Query*query=lfirst_node(Query,lc);
1696+
1697+
if (query->queryId!=UINT64CONST(0))
1698+
{
1699+
pgstat_report_query_id(query->queryId, false);
1700+
break;
1701+
}
1702+
}
1703+
16921704
set_ps_display("BIND");
16931705

16941706
if (save_log_statement_stats)
@@ -2111,6 +2123,7 @@ exec_execute_message(const char *portal_name, long max_rows)
21112123
ErrorContextCallbackparams_errcxt;
21122124
constchar*cmdtagname;
21132125
size_tcmdtaglen;
2126+
ListCell*lc;
21142127

21152128
/* Adjust destination to tell printtup.c what to do */
21162129
dest=whereToSendOutput;
@@ -2157,6 +2170,17 @@ exec_execute_message(const char *portal_name, long max_rows)
21572170

21582171
pgstat_report_activity(STATE_RUNNING,sourceText);
21592172

2173+
foreach(lc,portal->stmts)
2174+
{
2175+
PlannedStmt*stmt=lfirst_node(PlannedStmt,lc);
2176+
2177+
if (stmt->queryId!=UINT64CONST(0))
2178+
{
2179+
pgstat_report_query_id(stmt->queryId, false);
2180+
break;
2181+
}
2182+
}
2183+
21602184
cmdtagname=GetCommandTagNameAndLen(portal->commandTag,&cmdtaglen);
21612185

21622186
set_ps_display_with_len(cmdtagname,cmdtaglen);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp