Commitb48b2f8

committed

Revert "Move portal pinning from PL/pgSQL to SPI"

This reverts commitb3617cd.This broke returning unnamed cursors from PL/pgSQL functions.Apparently, there are no test cases for this.

1 parent3afd75e commitb48b2f8Copy full SHA for b48b2f8

File tree

-9

lines changed

-9

lines changed

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1175,12 +1175,6 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,`
`1175`	`1175`	`{`
`1176`	`1176`	`/* Use a random nonconflicting name */`
`1177`	`1177`	`portal=CreateNewPortal();`
`1178`		`-`
`1179`		`-/*`
`1180`		`- * Make sure the portal doesn't get closed by the user statements we`
`1181`		`- * execute.`
`1182`		`- */`
`1183`		`-PinPortal(portal);`
`1184`	`1178`	`}`
`1185`	`1179`	`else`
`1186`	`1180`	`{`
`@@ -1419,9 +1413,6 @@ SPI_cursor_close(Portal portal)`
`1419`	`1413`	`if (!PortalIsValid(portal))`
`1420`	`1414`	`elog(ERROR,"invalid portal in SPI cursor operation");`
`1421`	`1415`
`1422`		`-if (portal->portalPinned)`
`1423`		`-UnpinPortal(portal);`
`1424`		`-`
`1425`	`1416`	`PortalDrop(portal, false);`
`1426`	`1417`	`}`
`1427`	`1418`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5257,6 +5257,12 @@ exec_for_query(PLpgSQL_execstate estate, PLpgSQL_stmt_forq stmt,`
`5257`	`5257`	`/* Fetch loop variable's datum entry */`
`5258`	`5258`	`var= (PLpgSQL_variable*)estate->datums[stmt->var->dno];`
`5259`	`5259`
	`5260`	`+/*`
	`5261`	`+ * Make sure the portal doesn't get closed by the user statements we`
	`5262`	`+ * execute.`
	`5263`	`+ */`
	`5264`	`+PinPortal(portal);`
	`5265`	`+`
`5260`	`5266`	`/*`
`5261`	`5267`	`* Fetch the initial tuple(s). If prefetching is allowed then we grab a`
`5262`	`5268`	`* few more rows to avoid multiple trips through executor startup`
`@@ -5318,6 +5324,8 @@ exec_for_query(PLpgSQL_execstate estate, PLpgSQL_stmt_forq stmt,`
`5318`	`5324`	`*/`
`5319`	`5325`	`SPI_freetuptable(tuptab);`
`5320`	`5326`
	`5327`	`+UnpinPortal(portal);`
	`5328`	`+`
`5321`	`5329`	`/*`
`5322`	`5330`	`* Set the FOUND variable to indicate the result of executing the loop`
`5323`	`5331`	`* (namely, whether we looped one or more times). This must be set last so`

Comments

(0)