git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 643428c)

Fix thinko in plpgsql memory leak fix.

author Tom Lane <tgl@sss.pgh.pa.us>

2020年12月28日 16:41:25 +0000 (11:41 -0500)

committer Tom Lane <tgl@sss.pgh.pa.us>

2020年12月28日 16:41:25 +0000 (11:41 -0500)

Commit a6b1f5365 intended to place the transient "target" list of
a CALL statement in the function's statement-lifespan context,
but I fat-fingered that and used get_eval_mcontext() instead of
get_stmt_mcontext(). The eval_mcontext belongs to the "simple
expression" infrastructure, which is destroyed at transaction end.
The net effect is that a CALL in a procedure to another procedure
that has OUT or INOUT parameters would fail if the called procedure
did a COMMIT.

Per report from Peter Eisentraut. Back-patch to v11, like the
prior patch.

Discussion: https://postgr.es/m/f075f7be-c654-9aa8-3ffc-e9214622f02a@enterprisedb.com

src/pl/plpgsql/src/expected/plpgsql_call.out patch | blob | blame | history

src/pl/plpgsql/src/pl_exec.c patch | blob | blame | history

src/pl/plpgsql/src/sql/plpgsql_call.sql patch | blob | blame | history

diff --git a/src/pl/plpgsql/src/expected/plpgsql_call.out b/src/pl/plpgsql/src/expected/plpgsql_call.out

index 973857161105ad00772c98064b6a780e820d7a77..c804a3ffbfe52fcf75e854f83f524a703ca1b1f2 100644 (file)

--- a/src/pl/plpgsql/src/expected/plpgsql_call.out

+++ b/src/pl/plpgsql/src/expected/plpgsql_call.out

@@ -152,6 +152,27 @@ CALL test_proc7(100, -1, -1);

0 | 1

(1 row)

+-- inner COMMIT with output arguments

+CREATE PROCEDURE test_proc7c(x int, INOUT a int, INOUT b numeric)

+LANGUAGE plpgsql

+AS $$

+BEGIN

+ a := x / 10;

+ b := x / 2;

+ COMMIT;

+END;

+$$;

+CREATE PROCEDURE test_proc7cc(_x int)

+LANGUAGE plpgsql

+AS $$

+DECLARE _a int; _b numeric;

+BEGIN

+ CALL test_proc7c(_x, _a, _b);

+ RAISE NOTICE '_x: %,_a: %, _b: %', _x, _a, _b;

+END

+$$;

+CALL test_proc7cc(10);

+NOTICE: _x: 10,_a: 1, _b: 5

-- named parameters and defaults

CREATE PROCEDURE test_proc8a(INOUT a int, INOUT b int)

LANGUAGE plpgsql

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c

index 112f6ab0ae0092eaeb05c466945e4a5d9cf3a354..733ad44c74b47a2a63ea7ff06e2dc72917a78570 100644 (file)

--- a/src/pl/plpgsql/src/pl_exec.c

+++ b/src/pl/plpgsql/src/pl_exec.c

@@ -2235,8 +2235,8 @@ exec_stmt_call(PLpgSQL_execstate *estate, PLpgSQL_stmt_call *stmt)

int i;

ListCell *lc;

- /* Use eval_mcontext for any cruft accumulated here */

- oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));

+ /* Use stmt_mcontext for any cruft accumulated here */

+ oldcontext = MemoryContextSwitchTo(get_stmt_mcontext(estate));

/*

* Get the parsed CallStmt, and look up the called procedure

diff --git a/src/pl/plpgsql/src/sql/plpgsql_call.sql b/src/pl/plpgsql/src/sql/plpgsql_call.sql

index d506809ddbf63ebd819f1a382f0b07d6a04abdd6..c61a75be9bda7b90bc804c326f497704ca6a2800 100644 (file)

--- a/src/pl/plpgsql/src/sql/plpgsql_call.sql

+++ b/src/pl/plpgsql/src/sql/plpgsql_call.sql

@@ -141,6 +141,30 @@ $$;

CALL test_proc7(100, -1, -1);

+-- inner COMMIT with output arguments

+

+CREATE PROCEDURE test_proc7c(x int, INOUT a int, INOUT b numeric)

+LANGUAGE plpgsql

+AS $$

+BEGIN

+ a := x / 10;

+ b := x / 2;

+ COMMIT;

+END;

+$$;

+

+CREATE PROCEDURE test_proc7cc(_x int)

+LANGUAGE plpgsql

+AS $$

+DECLARE _a int; _b numeric;

+BEGIN

+ CALL test_proc7c(_x, _a, _b);

+ RAISE NOTICE '_x: %,_a: %, _b: %', _x, _a, _b;

+END

+$$;

+

+CALL test_proc7cc(10);

+

-- named parameters and defaults

This is the main PostgreSQL git repository.