mirror of
https://github.com/postgres/postgres.git
synced 2026-03-18 00:22:18 -04:00
1d2fe56e42
PL/Python failed if a PL/Python function was invoked recursively via SPI, since arguments are passed to the function in its global dictionary (a horrible decision that's far too ancient to undo) and it would delete those dictionary entries on function exit, leaving the outer recursion level(s) without any arguments. Not deleting them would be little better, since the outer levels would then see the innermost level's arguments. Since PL/Python uses ValuePerCall mode for evaluating set-returning functions, it's possible for multiple executions of the same SRF to be interleaved within a query. PL/Python failed in such a case, because it stored only one iterator per function, directly in the function's PLyProcedure struct. Moreover, one interleaved instance of the SRF would see argument values that should belong to another. Hence, invent code for saving and restoring the argument entries. To fix the recursion case, we only need to save at recursive entry and restore at recursive exit, so the overhead in non-recursive cases is negligible. To fix the SRF case, we have to save when suspending a SRF and restore when resuming it, which is potentially not negligible; but fortunately this is mostly a matter of manipulating Python object refcounts and should not involve much physical data copying. Also, store the Python iterator and saved argument values in a structure associated with the SRF call site rather than the function itself. This requires adding a memory context deletion callback to ensure that the SRF state is cleaned up if the calling query exits before running the SRF to completion. Without that we'd leak a refcount to the iterator object in such a case, resulting in session-lifespan memory leakage. (In the pre-existing code, there was no memory leak because there was only one iterator pointer, but what would happen is that the previous iterator would be resumed by the next query attempting to use the SRF. Hardly the semantics we want.) We can buy back some of whatever overhead we've added by getting rid of PLy_function_delete_args(), which seems a useless activity: there is no need to delete argument entries from the global dictionary on exit, since the next time anyone would see the global dict is on the next fresh call of the PL/Python function, at which time we'd overwrite those entries with new arg values anyway. Also clean up some really ugly coding in the SRF implementation, including such gems as returning directly out of a PG_TRY block. (The only reason that failed to crash hard was that all existing call sites immediately exited their own PG_TRY blocks, popping the dangling longjmp pointer before there was any chance of it being used.) In principle this is a bug fix; but it seems a bit too invasive relative to its value for a back-patch, and besides the fix depends on memory context callbacks so it could not go back further than 9.5 anyway. Alexey Grishchenko and Tom Lane
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/*
|
|
* src/pl/plpython/plpy_procedure.h
|
|
*/
|
|
|
|
#ifndef PLPY_PROCEDURE_H
|
|
#define PLPY_PROCEDURE_H
|
|
|
|
#include "plpy_typeio.h"
|
|
|
|
|
|
extern void init_procedure_caches(void);
|
|
|
|
|
|
/* saved arguments for outer recursion level or set-returning function */
|
|
typedef struct PLySavedArgs
|
|
{
|
|
struct PLySavedArgs *next; /* linked-list pointer */
|
|
PyObject *args; /* "args" element of globals dict */
|
|
int nargs; /* length of namedargs array */
|
|
PyObject *namedargs[FLEXIBLE_ARRAY_MEMBER]; /* named args */
|
|
} PLySavedArgs;
|
|
|
|
/* cached procedure data */
|
|
typedef struct PLyProcedure
|
|
{
|
|
MemoryContext mcxt; /* context holding this PLyProcedure and its
|
|
* subsidiary data */
|
|
char *proname; /* SQL name of procedure */
|
|
char *pyname; /* Python name of procedure */
|
|
TransactionId fn_xmin;
|
|
ItemPointerData fn_tid;
|
|
bool fn_readonly;
|
|
bool is_setof; /* true, if procedure returns result set */
|
|
PLyTypeInfo result; /* also used to store info for trigger tuple
|
|
* type */
|
|
char *src; /* textual procedure code, after mangling */
|
|
char **argnames; /* Argument names */
|
|
PLyTypeInfo args[FUNC_MAX_ARGS];
|
|
int nargs;
|
|
Oid langid; /* OID of plpython pg_language entry */
|
|
List *trftypes; /* OID list of transform types */
|
|
PyObject *code; /* compiled procedure code */
|
|
PyObject *statics; /* data saved across calls, local scope */
|
|
PyObject *globals; /* data saved across calls, global scope */
|
|
long calldepth; /* depth of recursive calls of function */
|
|
PLySavedArgs *argstack; /* stack of outer-level call arguments */
|
|
} PLyProcedure;
|
|
|
|
/* the procedure cache key */
|
|
typedef struct PLyProcedureKey
|
|
{
|
|
Oid fn_oid; /* function OID */
|
|
Oid fn_rel; /* triggered-on relation or InvalidOid */
|
|
} PLyProcedureKey;
|
|
|
|
/* the procedure cache entry */
|
|
typedef struct PLyProcedureEntry
|
|
{
|
|
PLyProcedureKey key; /* hash key */
|
|
PLyProcedure *proc;
|
|
} PLyProcedureEntry;
|
|
|
|
/* PLyProcedure manipulation */
|
|
extern char *PLy_procedure_name(PLyProcedure *proc);
|
|
extern PLyProcedure *PLy_procedure_get(Oid fn_oid, Oid fn_rel, bool is_trigger);
|
|
extern void PLy_procedure_compile(PLyProcedure *proc, const char *src);
|
|
extern void PLy_procedure_delete(PLyProcedure *proc);
|
|
|
|
#endif /* PLPY_PROCEDURE_H */
|