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

Commitcbcd4bb

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 parentfc2d1ac commitcbcd4bb

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

‎src/backend/executor/execMain.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@ void
131131
ExecutorStart(QueryDesc*queryDesc,inteflags)
132132
{
133133
/*
134-
* In some cases (e.g. an EXECUTE statement) a query execution will skip
135-
* parse analysis, which means that the query_id won't be reported. Note
136-
* that it's harmless to report the query_id multiple time, as the call
137-
* will be ignored if the top level query_id has already been reported.
134+
* In some cases (e.g. an EXECUTE statement or an execute message with the
135+
* extended query protocol) the query_id won't be reported, so do it now.
136+
*
137+
* Note that it's harmless to report the query_id multiple times, as the
138+
* call will be ignored if the top level query_id has already been
139+
* reported.
138140
*/
139141
pgstat_report_query_id(queryDesc->plannedstmt->queryId, false);
140142

‎src/backend/tcop/postgres.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,6 +1624,7 @@ exec_bind_message(StringInfo input_message)
16241624
charmsec_str[32];
16251625
ParamsErrorCbDataparams_data;
16261626
ErrorContextCallbackparams_errcxt;
1627+
ListCell*lc;
16271628

16281629
/* Get the fixed part of the message */
16291630
portal_name=pq_getmsgstring(input_message);
@@ -1659,6 +1660,17 @@ exec_bind_message(StringInfo input_message)
16591660

16601661
pgstat_report_activity(STATE_RUNNING,psrc->query_string);
16611662

1663+
foreach(lc,psrc->query_list)
1664+
{
1665+
Query*query=lfirst_node(Query,lc);
1666+
1667+
if (query->queryId!=UINT64CONST(0))
1668+
{
1669+
pgstat_report_query_id(query->queryId, false);
1670+
break;
1671+
}
1672+
}
1673+
16621674
set_ps_display("BIND");
16631675

16641676
if (save_log_statement_stats)
@@ -2082,6 +2094,7 @@ exec_execute_message(const char *portal_name, long max_rows)
20822094
charmsec_str[32];
20832095
ParamsErrorCbDataparams_data;
20842096
ErrorContextCallbackparams_errcxt;
2097+
ListCell*lc;
20852098

20862099
/* Adjust destination to tell printtup.c what to do */
20872100
dest=whereToSendOutput;
@@ -2128,6 +2141,17 @@ exec_execute_message(const char *portal_name, long max_rows)
21282141

21292142
pgstat_report_activity(STATE_RUNNING,sourceText);
21302143

2144+
foreach(lc,portal->stmts)
2145+
{
2146+
PlannedStmt*stmt=lfirst_node(PlannedStmt,lc);
2147+
2148+
if (stmt->queryId!=UINT64CONST(0))
2149+
{
2150+
pgstat_report_query_id(stmt->queryId, false);
2151+
break;
2152+
}
2153+
}
2154+
21312155
set_ps_display(GetCommandTagName(portal->commandTag));
21322156

21332157
if (save_log_statement_stats)

0 commit comments

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