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

Commitb3617cd

Browse files
committed
Move portal pinning from PL/pgSQL to SPI
PL/pgSQL "pins" internally generated (unnamed) portals so that user codecannot close them by guessing their names. This logic is also useful inother languages and really for any code. So move that logic into SPI.An unnamed portal obtained through SPI_cursor_open() and relatedfunctions is now automatically pinned, and SPI_cursor_close()automatically unpins a portal that is pinned.In the core distribution, this affects PL/Perl and PL/Python, preventingusers from manually closing cursors created by spi_query andplpy.cursor, respectively. (PL/Tcl does not currently offer any cursorfunctionality.)Reviewed-by: Andrew Dunstan <andrew.dunstan@2ndquadrant.com>
1 parentacc67ff commitb3617cd

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

‎src/backend/executor/spi.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,12 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
11751175
{
11761176
/* Use a random nonconflicting name */
11771177
portal=CreateNewPortal();
1178+
1179+
/*
1180+
* Make sure the portal doesn't get closed by the user statements we
1181+
* execute.
1182+
*/
1183+
PinPortal(portal);
11781184
}
11791185
else
11801186
{
@@ -1413,6 +1419,9 @@ SPI_cursor_close(Portal portal)
14131419
if (!PortalIsValid(portal))
14141420
elog(ERROR,"invalid portal in SPI cursor operation");
14151421

1422+
if (portal->portalPinned)
1423+
UnpinPortal(portal);
1424+
14161425
PortalDrop(portal, false);
14171426
}
14181427

‎src/pl/plpgsql/src/pl_exec.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5257,12 +5257,6 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
52575257
/* Fetch loop variable's datum entry */
52585258
var= (PLpgSQL_variable*)estate->datums[stmt->var->dno];
52595259

5260-
/*
5261-
* Make sure the portal doesn't get closed by the user statements we
5262-
* execute.
5263-
*/
5264-
PinPortal(portal);
5265-
52665260
/*
52675261
* Fetch the initial tuple(s). If prefetching is allowed then we grab a
52685262
* few more rows to avoid multiple trips through executor startup
@@ -5324,8 +5318,6 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
53245318
*/
53255319
SPI_freetuptable(tuptab);
53265320

5327-
UnpinPortal(portal);
5328-
53295321
/*
53305322
* Set the FOUND variable to indicate the result of executing the loop
53315323
* (namely, whether we looped one or more times). This must be set last so

0 commit comments

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