database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-09 17:03:00 +03:00
Code Activity

Fix plan cache issue in PL/pgSQL CALL

Browse Source 
If we are not going to save the plan, then we need to unset expr->plan
after we are done, also in error cases.  Otherwise, we get a dangling
pointer next time around.

This is not the ideal solution.  It would be better if we could convince
SPI not to associate a cached plan with a resource owner, and then we
could just save the plan in all cases.  But that would require bigger
surgery.

Reported-by: Pavel Stehule <pavel.stehule@gmail.com>
This commit is contained in:
Peter Eisentraut
2018-04-05 14:51:56 -04:00
parent 6a5f796b48
commit b9986551e0
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pl/plpgsql/src/expected/plpgsql_call.out
View File

@@ -53,6 +53,16 @@ SELECT * FROM test1;
66
(2 rows)
CALL test_proc4(66);
SELECT * FROM test1;
a
----
66
66
66
66
(4 rows)
-- output arguments
CREATE PROCEDURE test_proc5(INOUT a text)
LANGUAGE plpgsql

30
src/pl/plpgsql/src/pl_exec.c
View File

@@ -2060,6 +2060,7 @@ static int
exec_stmt_call(PLpgSQL_execstate *estate, PLpgSQL_stmt_call *stmt)
{
PLpgSQL_expr *expr = stmt->expr;
SPIPlanPtr plan;
ParamListInfo paramLI;
LocalTransactionId before_lxid;
LocalTransactionId after_lxid;
@@ -2069,7 +2070,9 @@ exec_stmt_call(PLpgSQL_execstate *estate, PLpgSQL_stmt_call *stmt)
{
/*
* Don't save the plan if not in atomic context. Otherwise,
* transaction ends would cause warnings about plan leaks.
* transaction ends would cause errors about plancache leaks. XXX
* This would be fixable with some plancache/resowner surgery
* elsewhere, but for now we'll just work around this here.
*/
exec_prepare_plan(estate, expr, 0, estate->atomic);
@@ -2084,8 +2087,27 @@ exec_stmt_call(PLpgSQL_execstate *estate, PLpgSQL_stmt_call *stmt)
before_lxid = MyProc->lxid;
rc = SPI_execute_plan_with_paramlist(expr->plan, paramLI,
estate->readonly_func, 0);
PG_TRY();
{
rc = SPI_execute_plan_with_paramlist(expr->plan, paramLI,
estate->readonly_func, 0);
}
PG_CATCH();
{
/*
* If we aren't saving the plan, unset the pointer. Note that it
* could have been unset already, in case of a recursive call.
*/
if (expr->plan && !expr->plan->saved)
expr->plan = NULL;
PG_RE_THROW();
}
PG_END_TRY();
plan = expr->plan;
if (expr->plan && !expr->plan->saved)
expr->plan = NULL;
after_lxid = MyProc->lxid;
@@ -2129,7 +2151,7 @@ exec_stmt_call(PLpgSQL_execstate *estate, PLpgSQL_stmt_call *stmt)
/*
* Get the original CallStmt
*/
node = linitial_node(Query, ((CachedPlanSource *) linitial(expr->plan->plancache_list))->query_list)->utilityStmt;
node = linitial_node(Query, ((CachedPlanSource *) linitial(plan->plancache_list))->query_list)->utilityStmt;
if (!IsA(node, CallStmt))
elog(ERROR, "returned row from not a CallStmt");

4
src/pl/plpgsql/src/sql/plpgsql_call.sql
View File

@@ -54,6 +54,10 @@ CALL test_proc4(66);
SELECT * FROM test1;
CALL test_proc4(66);
SELECT * FROM test1;
-- output arguments