database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Fix assertion failure with PL/Python exceptions

Browse Source 
PLy_elog() was not able to handle correctly cases where a SPI called
failed, which would fill in a DETAIL string able to trigger an
assertion.  We may want to improve this infrastructure so as it is able
to provide any extra detail information provided by an error stack, but
this is left as a future improvement as it could impact existing error
stacks and any applications that depend on them.  For now, the assertion
is removed and a regression test is added to cover the case of a failure
with a detail string.

This problem exists since 2bd78eb8d51c, so backpatch all the way down
with tweaks to the regression tests output added where required.

Author: Alexander Lakhin
Discussion: https://postgr.es/m/18070-ab9c171cbf4ebb0f@postgresql.org
Backpatch-through: 11
This commit is contained in:
Michael Paquier 2023-09-19 08:31:27 +09:00
parent e6e50ada07
commit 35e8ba3e54
4 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pl/plpython/expected/plpython_error.out
View File

@ -445,3 +445,16 @@ PL/Python function "notice_outerfunc"
1
(1 row)
/* test error logged with an underlying exception that includes a detail
* string (bug #18070).
*/
CREATE FUNCTION python_error_detail() RETURNS SETOF text AS $$
plan = plpy.prepare("SELECT to_date('xy', 'DD') d")
for row in plpy.cursor(plan):
yield row['d']
$$ LANGUAGE plpythonu;
SELECT python_error_detail();
ERROR: error fetching next item from iterator
DETAIL: spiexceptions.InvalidDatetimeFormat: invalid value "xy" for "DD"
CONTEXT: Traceback (most recent call last):
PL/Python function "python_error_detail"

13
src/pl/plpython/expected/plpython_error_5.out
View File

@ -445,3 +445,16 @@ PL/Python function "notice_outerfunc"
1
(1 row)
/* test error logged with an underlying exception that includes a detail
* string (bug #18070).
*/
CREATE FUNCTION python_error_detail() RETURNS SETOF text AS $$
plan = plpy.prepare("SELECT to_date('xy', 'DD') d")
for row in plpy.cursor(plan):
yield row['d']
$$ LANGUAGE plpythonu;
SELECT python_error_detail();
ERROR: error fetching next item from iterator
DETAIL: spiexceptions.InvalidDatetimeFormat: invalid value "xy" for "DD"
CONTEXT: Traceback (most recent call last):
PL/Python function "python_error_detail"

3
src/pl/plpython/plpy_elog.c
View File

@ -103,9 +103,6 @@ PLy_elog_impl(int elevel, const char *fmt,...)
}
primary = emsg.data;
/* Since we have a format string, we cannot have a SPI detail. */
Assert(detail == NULL);
/* If there's an exception message, it goes in the detail. */
if (xmsg)
detail = xmsg;

11
src/pl/plpython/sql/plpython_error.sql
View File

@ -344,3 +344,14 @@ $$ LANGUAGE plpythonu;
\set SHOW_CONTEXT always
SELECT notice_outerfunc();
/* test error logged with an underlying exception that includes a detail
* string (bug #18070).
*/
CREATE FUNCTION python_error_detail() RETURNS SETOF text AS $$
plan = plpy.prepare("SELECT to_date('xy', 'DD') d")
for row in plpy.cursor(plan):
yield row['d']
$$ LANGUAGE plpythonu;
SELECT python_error_detail();