From 41d252c82eebf7dc9c06637996df7dcdb90a5061 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 18 Sep 2025 15:34:23 +0000 Subject: [PATCH v12 1/2] Fix temp file logging blame in extended query protocol MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the extended query protocol, temporary files created by unnamed portals could be blamed on the wrong statement. Because temp file logging happens when the portal is dropped, this patch ensures that unnamed portals are dropped before resetting debug_query_string, so that temp files are blamed on the correct statement. Author: Sami Imseih Author: Frédéric Yhuel Reviewed-by: Mircea Cadariu Discussion: https://www.postgresql.org/message-id/flat/3d07ee43-8855-42db-97e0-bad5db82d972@dalibo.com --- src/backend/tcop/postgres.c | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index d356830f756..80fffd7aada 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -148,6 +148,7 @@ static bool ignore_till_sync = false; * in order to reduce overhead for short-lived queries. */ static CachedPlanSource *unnamed_stmt_psrc = NULL; +static bool unnamed_portal = false; /* assorted command-line switches */ static const char *userDoption = NULL; /* -D switch */ @@ -182,6 +183,7 @@ static bool IsTransactionExitStmt(Node *parsetree); static bool IsTransactionExitStmtList(List *pstmts); static bool IsTransactionStmtList(List *pstmts); static void drop_unnamed_stmt(void); +static void drop_unnamed_portal(void); static void log_disconnections(int code, Datum arg); static void enable_statement_timeout(void); static void disable_statement_timeout(void); @@ -1024,6 +1026,12 @@ exec_simple_query(const char *query_string) bool use_implicit_block; char msec_str[32]; + /* + * Drop the unnamed portal before setting debug_query_string, to avoid + * attributing messages from the drop (e.g., temp usage) to the new query. + */ + drop_unnamed_portal(); + /* * Report query to various monitoring facilities. */ @@ -1676,6 +1684,12 @@ exec_bind_message(StringInfo input_message) errmsg("unnamed prepared statement does not exist"))); } + /* + * Same as exec_simple_query, drop the unnamed portal before setting + * debug_query_string. + */ + drop_unnamed_portal(); + /* * Report query to various monitoring facilities. */ @@ -1757,10 +1771,14 @@ exec_bind_message(StringInfo input_message) * if the unnamed portal is specified. */ if (portal_name[0] == '\0') + { portal = CreatePortal(portal_name, true, true); + unnamed_portal = true; + } else portal = CreatePortal(portal_name, false, false); + /* * Prepare to copy stuff into the portal's memory context. We do all this * copying first, because it could possibly fail (out-of-memory) and we @@ -5236,3 +5254,29 @@ disable_statement_timeout(void) if (get_timeout_active(STATEMENT_TIMEOUT)) disable_timeout(STATEMENT_TIMEOUT, false); } + +/* Drop the unnamed portal if one exists */ +static void +drop_unnamed_portal(void) +{ + Portal portal; + + if (!unnamed_portal) + return; + + /* Get the portal and drop it */ + portal = GetPortalByName(""); + if (PortalIsValid(portal)) + { + /* + * Set debug_query_string from the QueryDesc so that if logging occurs + * during PortalDrop, messages are attributed to the query being run. + */ + if (portal->queryDesc) + debug_query_string = portal->queryDesc->sourceText; + + PortalDrop(portal, false); + } + + unnamed_portal = false; +} -- 2.43.0