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

petere · petere · commit b48b2f8793ef · 2018-01-10T16:01:17.000-05:00
This reverts commit b3617cd. This broke returning unnamed cursors from PL/pgSQL functions. Apparently, there are no test cases for this.
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
@@ -1175,12 +1175,6 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	{
 		/* Use a random nonconflicting name */
 		portal = CreateNewPortal();
-
-		/*
-		 * Make sure the portal doesn't get closed by the user statements we
-		 * execute.
-		 */
-		PinPortal(portal);
 	}
 	else
 	{
@@ -1419,9 +1413,6 @@ SPI_cursor_close(Portal portal)
 	if (!PortalIsValid(portal))
 		elog(ERROR, "invalid portal in SPI cursor operation");
 
-	if (portal->portalPinned)
-		UnpinPortal(portal);
-
 	PortalDrop(portal, false);
 }
 
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -5257,6 +5257,12 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 	/* Fetch loop variable's datum entry */
 	var = (PLpgSQL_variable *) estate->datums[stmt->var->dno];
 
+	/*
+	 * Make sure the portal doesn't get closed by the user statements we
+	 * execute.
+	 */
+	PinPortal(portal);
+
 	/*
 	 * Fetch the initial tuple(s).  If prefetching is allowed then we grab a
 	 * few more rows to avoid multiple trips through executor startup
@@ -5318,6 +5324,8 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 	 */
 	SPI_freetuptable(tuptab);
 
+	UnpinPortal(portal);
+
 	/*
 	 * Set the FOUND variable to indicate the result of executing the loop
 	 * (namely, whether we looped one or more times). This must be set last so

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`