On Wed, Nov 12, 2025 at 11:14:26AM +0000, Mircea Cadariu wrote: > I understand the point that’s been raised. Would it be an option to indeed > revert the portal drop in postgres.c, but then append the right query in the > "temporary file: ..." log line instead? This would work at least for me.
This is new, attaching the information to a Vfd in fd.c. Not sure that adding this information to this structure is a good concept. This layer of the code has no idea of query strings currently, so that feels a bit like a layer violation. Thinking a bit outside the box.. I was wondering about a plan D (plan A is what's on HEAD, plan B is copying around the query string, plan C this Vfd approach) where we shut down the executor when we have finished the execution of an unnamed portal, with something like the attached based on a more aggressive PortalCleanup(). However, that would not fly far if the client decides to send an extra execute message post-portal-completion where we'd still want the executor to be around, even if there are no rows to process. We presumably do not need the temp files anymore at this stage, but I don't really like the fact that we'd need to somehow take a shortcut if we want only to clean up the temp files. Perhaps the best answer for now is to revert and continue the discussion for this cycle as there seem to be little love for the current HEAD's solution with the protocol change. If folks have more ideas or input, please feel free. -- Michael
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 2bd89102686e..8d3739298afe 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -38,6 +38,7 @@ #include "commands/async.h" #include "commands/event_trigger.h" #include "commands/explain_state.h" +#include "commands/portalcmds.h" #include "commands/prepare.h" #include "common/pg_prng.h" #include "jit/jit.h" @@ -2330,13 +2331,14 @@ exec_execute_message(const char *portal_name, long max_rows) /* * We completed fetching from an unnamed portal. There is no need - * for it beyond this point, so drop it now rather than wait for + * for it beyond this point, so clean it now rather than wait for * the next Bind message to do this cleanup. This ensures that * the correct statement is logged when cleaning up temporary file - * usage. + * usage with the executor shutdown. */ - if (portal->name[0] == '\0') - PortalDrop(portal, false); + if (portal->name[0] == '\0' && + portal->cleanup) + PortalCleanup(portal); } /* Send appropriate CommandComplete to client */
signature.asc
Description: PGP signature
