|
|
|
/*
|
|
|
|
* Python procedure manipulation for plpython
|
|
|
|
*
|
|
|
|
* src/pl/plpython/plpy_procedure.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "postgres.h"
|
|
|
|
|
|
|
|
#include "access/htup_details.h"
|
|
|
|
#include "access/transam.h"
|
|
|
|
#include "funcapi.h"
|
|
|
|
#include "catalog/pg_proc.h"
|
|
|
|
#include "catalog/pg_proc_fn.h"
|
|
|
|
#include "catalog/pg_type.h"
|
|
|
|
#include "utils/builtins.h"
|
|
|
|
#include "utils/hsearch.h"
|
|
|
|
#include "utils/inval.h"
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
#include "utils/lsyscache.h"
|
|
|
|
#include "utils/memutils.h"
|
|
|
|
#include "utils/syscache.h"
|
|
|
|
|
|
|
|
#include "plpython.h"
|
|
|
|
|
|
|
|
#include "plpy_procedure.h"
|
|
|
|
|
|
|
|
#include "plpy_elog.h"
|
|
|
|
#include "plpy_main.h"
|
|
|
|
|
|
|
|
|
|
|
|
static HTAB *PLy_procedure_cache = NULL;
|
|
|
|
|
|
|
|
static PLyProcedure *PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger);
|
|
|
|
static bool PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup);
|
|
|
|
static char *PLy_procedure_munge_source(const char *name, const char *src);
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
init_procedure_caches(void)
|
|
|
|
{
|
|
|
|
HASHCTL hash_ctl;
|
|
|
|
|
|
|
|
memset(&hash_ctl, 0, sizeof(hash_ctl));
|
|
|
|
hash_ctl.keysize = sizeof(PLyProcedureKey);
|
|
|
|
hash_ctl.entrysize = sizeof(PLyProcedureEntry);
|
|
|
|
PLy_procedure_cache = hash_create("PL/Python procedures", 32, &hash_ctl,
|
Improve hash_create's API for selecting simple-binary-key hash functions.
Previously, if you wanted anything besides C-string hash keys, you had to
specify a custom hashing function to hash_create(). Nearly all such
callers were specifying tag_hash or oid_hash; which is tedious, and rather
error-prone, since a caller could easily miss the opportunity to optimize
by using hash_uint32 when appropriate. Replace this with a design whereby
callers using simple binary-data keys just specify HASH_BLOBS and don't
need to mess with specific support functions. hash_create() itself will
take care of optimizing when the key size is four bytes.
This nets out saving a few hundred bytes of code space, and offers
a measurable performance improvement in tidbitmap.c (which was not
exploiting the opportunity to use hash_uint32 for its 4-byte keys).
There might be some wins elsewhere too, I didn't analyze closely.
In future we could look into offering a similar optimized hashing function
for 8-byte keys. Under this design that could be done in a centralized
and machine-independent fashion, whereas getting it right for keys of
platform-dependent sizes would've been notationally painful before.
For the moment, the old way still works fine, so as not to break source
code compatibility for loadable modules. Eventually we might want to
remove tag_hash and friends from the exported API altogether, since there's
no real need for them to be explicitly referenced from outside dynahash.c.
Teodor Sigaev and Tom Lane
11 years ago
|
|
|
HASH_ELEM | HASH_BLOBS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PLy_procedure_name: get the name of the specified procedure.
|
|
|
|
*
|
|
|
|
* NB: this returns the SQL name, not the internal Python procedure name
|
|
|
|
*/
|
|
|
|
char *
|
|
|
|
PLy_procedure_name(PLyProcedure *proc)
|
|
|
|
{
|
|
|
|
if (proc == NULL)
|
|
|
|
return "<unknown procedure>";
|
|
|
|
return proc->proname;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* PLy_procedure_get: returns a cached PLyProcedure, or creates, stores and
|
|
|
|
* returns a new PLyProcedure.
|
|
|
|
*
|
|
|
|
* fn_oid is the OID of the function requested
|
|
|
|
* fn_rel is InvalidOid or the relation this function triggers on
|
|
|
|
* is_trigger denotes whether the function is a trigger function
|
|
|
|
*
|
|
|
|
* The reason that both fn_rel and is_trigger need to be passed is that when
|
|
|
|
* trigger functions get validated we don't know which relation(s) they'll
|
|
|
|
* be used with, so no sensible fn_rel can be passed.
|
|
|
|
*/
|
|
|
|
PLyProcedure *
|
|
|
|
PLy_procedure_get(Oid fn_oid, Oid fn_rel, bool is_trigger)
|
|
|
|
{
|
|
|
|
bool use_cache = !(is_trigger && fn_rel == InvalidOid);
|
|
|
|
HeapTuple procTup;
|
|
|
|
PLyProcedureKey key;
|
|
|
|
PLyProcedureEntry *volatile entry = NULL;
|
|
|
|
PLyProcedure *volatile proc = NULL;
|
|
|
|
bool found = false;
|
|
|
|
|
|
|
|
procTup = SearchSysCache1(PROCOID, ObjectIdGetDatum(fn_oid));
|
|
|
|
if (!HeapTupleIsValid(procTup))
|
|
|
|
elog(ERROR, "cache lookup failed for function %u", fn_oid);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Look for the function in the cache, unless we don't have the necessary
|
|
|
|
* information (e.g. during validation). In that case we just don't cache
|
|
|
|
* anything.
|
|
|
|
*/
|
|
|
|
if (use_cache)
|
|
|
|
{
|
|
|
|
key.fn_oid = fn_oid;
|
|
|
|
key.fn_rel = fn_rel;
|
|
|
|
entry = hash_search(PLy_procedure_cache, &key, HASH_ENTER, &found);
|
|
|
|
proc = entry->proc;
|
|
|
|
}
|
|
|
|
|
|
|
|
PG_TRY();
|
|
|
|
{
|
|
|
|
if (!found)
|
|
|
|
{
|
|
|
|
/* Haven't found it, create a new procedure */
|
|
|
|
proc = PLy_procedure_create(procTup, fn_oid, is_trigger);
|
|
|
|
if (use_cache)
|
|
|
|
entry->proc = proc;
|
|
|
|
}
|
|
|
|
else if (!PLy_procedure_valid(proc, procTup))
|
|
|
|
{
|
|
|
|
/* Found it, but it's invalid, free and reuse the cache entry */
|
|
|
|
entry->proc = NULL;
|
|
|
|
if (proc)
|
|
|
|
PLy_procedure_delete(proc);
|
|
|
|
proc = PLy_procedure_create(procTup, fn_oid, is_trigger);
|
|
|
|
entry->proc = proc;
|
|
|
|
}
|
|
|
|
/* Found it and it's valid, it's fine to use it */
|
|
|
|
}
|
|
|
|
PG_CATCH();
|
|
|
|
{
|
|
|
|
/* Do not leave an uninitialized entry in the cache */
|
|
|
|
if (use_cache)
|
|
|
|
hash_search(PLy_procedure_cache, &key, HASH_REMOVE, NULL);
|
|
|
|
PG_RE_THROW();
|
|
|
|
}
|
|
|
|
PG_END_TRY();
|
|
|
|
|
|
|
|
ReleaseSysCache(procTup);
|
|
|
|
|
|
|
|
return proc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Create a new PLyProcedure structure
|
|
|
|
*/
|
|
|
|
static PLyProcedure *
|
|
|
|
PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
|
|
|
|
{
|
|
|
|
char procName[NAMEDATALEN + 256];
|
|
|
|
Form_pg_proc procStruct;
|
|
|
|
PLyProcedure *volatile proc;
|
|
|
|
MemoryContext cxt;
|
|
|
|
MemoryContext oldcxt;
|
|
|
|
int rv;
|
|
|
|
char *ptr;
|
|
|
|
|
|
|
|
procStruct = (Form_pg_proc) GETSTRUCT(procTup);
|
|
|
|
rv = snprintf(procName, sizeof(procName),
|
|
|
|
"__plpython_procedure_%s_%u",
|
|
|
|
NameStr(procStruct->proname),
|
|
|
|
fn_oid);
|
|
|
|
if (rv >= sizeof(procName) || rv < 0)
|
|
|
|
elog(ERROR, "procedure name would overrun buffer");
|
|
|
|
|
|
|
|
/* Replace any not-legal-in-Python-names characters with '_' */
|
|
|
|
for (ptr = procName; *ptr; ptr++)
|
|
|
|
{
|
|
|
|
if (!((*ptr >= 'A' && *ptr <= 'Z') ||
|
|
|
|
(*ptr >= 'a' && *ptr <= 'z') ||
|
|
|
|
(*ptr >= '0' && *ptr <= '9')))
|
|
|
|
*ptr = '_';
|
|
|
|
}
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
/* Create long-lived context that all procedure info will live in */
|
Rethink MemoryContext creation to improve performance.
This patch makes a number of interrelated changes to reduce the overhead
involved in creating/deleting memory contexts. The key ideas are:
* Include the AllocSetContext header of an aset.c context in its first
malloc request, rather than allocating it separately in TopMemoryContext.
This means that we now always create an initial or "keeper" block in an
aset, even if it never receives any allocation requests.
* Create freelists in which we can save and recycle recently-destroyed
asets (this idea is due to Robert Haas).
* In the common case where the name of a context is a constant string,
just store a pointer to it in the context header, rather than copying
the string.
The first change eliminates a palloc/pfree cycle per context, and
also avoids bloat in TopMemoryContext, at the price that creating
a context now involves a malloc/free cycle even if the context never
receives any allocations. That would be a loser for some common
usage patterns, but recycling short-lived contexts via the freelist
eliminates that pain.
Avoiding copying constant strings not only saves strlen() and strcpy()
overhead, but is an essential part of the freelist optimization because
it makes the context header size constant. Currently we make no
attempt to use the freelist for contexts with non-constant names.
(Perhaps someday we'll need to think harder about that, but in current
usage, most contexts with custom names are long-lived anyway.)
The freelist management in this initial commit is pretty simplistic,
and we might want to refine it later --- but in common workloads that
will never matter because the freelists will never get full anyway.
To create a context with a non-constant name, one is now required to
call AllocSetContextCreateExtended and specify the MEMCONTEXT_COPY_NAME
option. AllocSetContextCreate becomes a wrapper macro, and it includes
a test that will complain about non-string-literal context name
parameters on gcc and similar compilers.
An unfortunate side effect of making AllocSetContextCreate a macro is
that one is now *required* to use the size parameter abstraction macros
(ALLOCSET_DEFAULT_SIZES and friends) with it; the pre-9.6 habit of
writing out individual size parameters no longer works unless you
switch to AllocSetContextCreateExtended.
Internally to the memory-context-related modules, the context creation
APIs are simplified, removing the rather baroque original design whereby
a context-type module called mcxt.c which then called back into the
context-type module. That saved a bit of code duplication, but not much,
and it prevented context-type modules from exercising control over the
allocation of context headers.
In passing, I converted the test-and-elog validation of aset size
parameters into Asserts to save a few more cycles. The original thought
was that callers might compute size parameters on the fly, but in practice
nobody does that, so it's useless to expend cycles on checking those
numbers in production builds.
Also, mark the memory context method-pointer structs "const",
just for cleanliness.
Discussion: https://postgr.es/m/2264.1512870796@sss.pgh.pa.us
8 years ago
|
|
|
cxt = AllocSetContextCreateExtended(TopMemoryContext,
|
|
|
|
procName,
|
|
|
|
MEMCONTEXT_COPY_NAME,
|
|
|
|
ALLOCSET_DEFAULT_SIZES);
|
|
|
|
|
|
|
|
oldcxt = MemoryContextSwitchTo(cxt);
|
|
|
|
|
|
|
|
proc = (PLyProcedure *) palloc0(sizeof(PLyProcedure));
|
|
|
|
proc->mcxt = cxt;
|
|
|
|
|
|
|
|
PG_TRY();
|
|
|
|
{
|
|
|
|
Datum protrftypes_datum;
|
|
|
|
Datum prosrcdatum;
|
|
|
|
bool isnull;
|
|
|
|
char *procSource;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
proc->proname = pstrdup(NameStr(procStruct->proname));
|
|
|
|
proc->pyname = pstrdup(procName);
|
|
|
|
proc->fn_xmin = HeapTupleHeaderGetRawXmin(procTup->t_data);
|
|
|
|
proc->fn_tid = procTup->t_self;
|
Fix PL/Python for recursion and interleaved set-returning functions.
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
10 years ago
|
|
|
proc->fn_readonly = (procStruct->provolatile != PROVOLATILE_VOLATILE);
|
|
|
|
proc->is_setof = procStruct->proretset;
|
|
|
|
proc->is_procedure = (procStruct->prokind == PROKIND_PROCEDURE);
|
Fix PL/Python for recursion and interleaved set-returning functions.
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
10 years ago
|
|
|
proc->src = NULL;
|
|
|
|
proc->argnames = NULL;
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
proc->args = NULL;
|
|
|
|
proc->nargs = 0;
|
|
|
|
proc->langid = procStruct->prolang;
|
|
|
|
protrftypes_datum = SysCacheGetAttr(PROCOID, procTup,
|
|
|
|
Anum_pg_proc_protrftypes,
|
|
|
|
&isnull);
|
|
|
|
proc->trftypes = isnull ? NIL : oid_array_to_list(protrftypes_datum);
|
Fix PL/Python for recursion and interleaved set-returning functions.
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
10 years ago
|
|
|
proc->code = NULL;
|
|
|
|
proc->statics = NULL;
|
|
|
|
proc->globals = NULL;
|
Fix PL/Python for recursion and interleaved set-returning functions.
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
10 years ago
|
|
|
proc->calldepth = 0;
|
|
|
|
proc->argstack = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* get information required for output conversion of the return value,
|
|
|
|
* but only if this isn't a trigger.
|
|
|
|
*/
|
|
|
|
if (!is_trigger)
|
|
|
|
{
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
Oid rettype = procStruct->prorettype;
|
|
|
|
HeapTuple rvTypeTup;
|
|
|
|
Form_pg_type rvTypeStruct;
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
rvTypeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettype));
|
|
|
|
if (!HeapTupleIsValid(rvTypeTup))
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
elog(ERROR, "cache lookup failed for type %u", rettype);
|
|
|
|
rvTypeStruct = (Form_pg_type) GETSTRUCT(rvTypeTup);
|
|
|
|
|
|
|
|
/* Disallow pseudotype result, except for void or record */
|
|
|
|
if (rvTypeStruct->typtype == TYPTYPE_PSEUDO)
|
|
|
|
{
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
if (rettype == VOIDOID ||
|
|
|
|
rettype == RECORDOID)
|
|
|
|
/* okay */ ;
|
|
|
|
else if (rettype == TRIGGEROID || rettype == EVTTRIGGEROID)
|
|
|
|
ereport(ERROR,
|
|
|
|
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
|
|
|
errmsg("trigger functions can only be called as triggers")));
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
else
|
|
|
|
ereport(ERROR,
|
|
|
|
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
Phase 3 of pgindent updates.
Don't move parenthesized lines to the left, even if that means they
flow past the right margin.
By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis. However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent. That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.
This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
8 years ago
|
|
|
errmsg("PL/Python functions cannot return type %s",
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
format_type_be(rettype))));
|
|
|
|
}
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
/* set up output function for procedure result */
|
|
|
|
PLy_output_setup_func(&proc->result, proc->mcxt,
|
|
|
|
rettype, -1, proc);
|
|
|
|
|
|
|
|
ReleaseSysCache(rvTypeTup);
|
|
|
|
}
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* In a trigger function, we use proc->result and proc->result_in
|
|
|
|
* for converting tuples, but we don't yet have enough info to set
|
|
|
|
* them up. PLy_exec_trigger will deal with it.
|
|
|
|
*/
|
|
|
|
proc->result.typoid = InvalidOid;
|
|
|
|
proc->result_in.typoid = InvalidOid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now get information required for input conversion of the
|
|
|
|
* procedure's arguments. Note that we ignore output arguments here.
|
|
|
|
* If the function returns record, those I/O functions will be set up
|
|
|
|
* when the function is first called.
|
|
|
|
*/
|
|
|
|
if (procStruct->pronargs)
|
|
|
|
{
|
|
|
|
Oid *types;
|
|
|
|
char **names,
|
|
|
|
*modes;
|
|
|
|
int pos,
|
|
|
|
total;
|
|
|
|
|
|
|
|
/* extract argument type info from the pg_proc tuple */
|
|
|
|
total = get_func_arg_info(procTup, &types, &names, &modes);
|
|
|
|
|
|
|
|
/* count number of in+inout args into proc->nargs */
|
|
|
|
if (modes == NULL)
|
|
|
|
proc->nargs = total;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* proc->nargs was initialized to 0 above */
|
|
|
|
for (i = 0; i < total; i++)
|
|
|
|
{
|
|
|
|
if (modes[i] != PROARGMODE_OUT &&
|
|
|
|
modes[i] != PROARGMODE_TABLE)
|
|
|
|
(proc->nargs)++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
/* Allocate arrays for per-input-argument data */
|
|
|
|
proc->argnames = (char **) palloc0(sizeof(char *) * proc->nargs);
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
proc->args = (PLyDatumToOb *) palloc0(sizeof(PLyDatumToOb) * proc->nargs);
|
|
|
|
|
|
|
|
for (i = pos = 0; i < total; i++)
|
|
|
|
{
|
|
|
|
HeapTuple argTypeTup;
|
|
|
|
Form_pg_type argTypeStruct;
|
|
|
|
|
|
|
|
if (modes &&
|
|
|
|
(modes[i] == PROARGMODE_OUT ||
|
|
|
|
modes[i] == PROARGMODE_TABLE))
|
|
|
|
continue; /* skip OUT arguments */
|
|
|
|
|
|
|
|
Assert(types[i] == procStruct->proargtypes.values[pos]);
|
|
|
|
|
|
|
|
argTypeTup = SearchSysCache1(TYPEOID,
|
|
|
|
ObjectIdGetDatum(types[i]));
|
|
|
|
if (!HeapTupleIsValid(argTypeTup))
|
|
|
|
elog(ERROR, "cache lookup failed for type %u", types[i]);
|
|
|
|
argTypeStruct = (Form_pg_type) GETSTRUCT(argTypeTup);
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
/* disallow pseudotype arguments */
|
|
|
|
if (argTypeStruct->typtype == TYPTYPE_PSEUDO)
|
|
|
|
ereport(ERROR,
|
|
|
|
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
|
|
|
errmsg("PL/Python functions cannot accept type %s",
|
|
|
|
format_type_be(types[i]))));
|
|
|
|
|
|
|
|
/* set up I/O function info */
|
|
|
|
PLy_input_setup_func(&proc->args[pos], proc->mcxt,
|
|
|
|
types[i], -1, /* typmod not known */
|
|
|
|
proc);
|
|
|
|
|
|
|
|
/* get argument name */
|
|
|
|
proc->argnames[pos] = names ? pstrdup(names[i]) : NULL;
|
|
|
|
|
|
|
|
ReleaseSysCache(argTypeTup);
|
|
|
|
|
|
|
|
pos++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* get the text of the function.
|
|
|
|
*/
|
|
|
|
prosrcdatum = SysCacheGetAttr(PROCOID, procTup,
|
|
|
|
Anum_pg_proc_prosrc, &isnull);
|
|
|
|
if (isnull)
|
|
|
|
elog(ERROR, "null prosrc");
|
|
|
|
procSource = TextDatumGetCString(prosrcdatum);
|
|
|
|
|
|
|
|
PLy_procedure_compile(proc, procSource);
|
|
|
|
|
|
|
|
pfree(procSource);
|
|
|
|
}
|
|
|
|
PG_CATCH();
|
|
|
|
{
|
|
|
|
MemoryContextSwitchTo(oldcxt);
|
|
|
|
PLy_procedure_delete(proc);
|
|
|
|
PG_RE_THROW();
|
|
|
|
}
|
|
|
|
PG_END_TRY();
|
|
|
|
|
|
|
|
MemoryContextSwitchTo(oldcxt);
|
|
|
|
return proc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Insert the procedure into the Python interpreter
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
PLy_procedure_compile(PLyProcedure *proc, const char *src)
|
|
|
|
{
|
|
|
|
PyObject *crv = NULL;
|
|
|
|
char *msrc;
|
|
|
|
|
|
|
|
proc->globals = PyDict_Copy(PLy_interp_globals);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SD is private preserved data between calls. GD is global data shared by
|
|
|
|
* all functions
|
|
|
|
*/
|
|
|
|
proc->statics = PyDict_New();
|
|
|
|
if (!proc->statics)
|
|
|
|
PLy_elog(ERROR, NULL);
|
|
|
|
PyDict_SetItemString(proc->globals, "SD", proc->statics);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* insert the function code into the interpreter
|
|
|
|
*/
|
|
|
|
msrc = PLy_procedure_munge_source(proc->pyname, src);
|
|
|
|
/* Save the mangled source for later inclusion in tracebacks */
|
|
|
|
proc->src = MemoryContextStrdup(proc->mcxt, msrc);
|
|
|
|
crv = PyRun_String(msrc, Py_file_input, proc->globals, NULL);
|
|
|
|
pfree(msrc);
|
|
|
|
|
|
|
|
if (crv != NULL)
|
|
|
|
{
|
|
|
|
int clen;
|
|
|
|
char call[NAMEDATALEN + 256];
|
|
|
|
|
|
|
|
Py_DECREF(crv);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* compile a call to the function
|
|
|
|
*/
|
|
|
|
clen = snprintf(call, sizeof(call), "%s()", proc->pyname);
|
|
|
|
if (clen < 0 || clen >= sizeof(call))
|
|
|
|
elog(ERROR, "string would overflow buffer");
|
|
|
|
proc->code = Py_CompileString(call, "<string>", Py_eval_input);
|
|
|
|
if (proc->code != NULL)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (proc->proname)
|
|
|
|
PLy_elog(ERROR, "could not compile PL/Python function \"%s\"",
|
|
|
|
proc->proname);
|
|
|
|
else
|
|
|
|
PLy_elog(ERROR, "could not compile anonymous PL/Python code block");
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
PLy_procedure_delete(PLyProcedure *proc)
|
|
|
|
{
|
|
|
|
Py_XDECREF(proc->code);
|
|
|
|
Py_XDECREF(proc->statics);
|
|
|
|
Py_XDECREF(proc->globals);
|
|
|
|
MemoryContextDelete(proc->mcxt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decide whether a cached PLyProcedure struct is still valid
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup)
|
|
|
|
{
|
|
|
|
if (proc == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* If the pg_proc tuple has changed, it's not valid */
|
|
|
|
if (!(proc->fn_xmin == HeapTupleHeaderGetRawXmin(procTup->t_data) &&
|
|
|
|
ItemPointerEquals(&proc->fn_tid, &procTup->t_self)))
|
|
|
|
return false;
|
|
|
|
|
Make PL/Python handle domain-type conversions correctly.
Fix PL/Python so that it can handle domains over composite, and so that
it enforces domain constraints correctly in other cases that were not
always done properly before. Notably, it didn't do arrays of domains
right (oversight in commit c12d570fa), and it failed to enforce domain
constraints when returning a composite type containing a domain field,
and if a transform function is being used for a domain's base type then
it failed to enforce domain constraints on the result. Also, in many
places it missed checking domain constraints on null values, because
the plpy_typeio code simply wasn't called for Py_None.
Rather than try to band-aid these problems, I made a significant
refactoring of the plpy_typeio logic. The existing design of recursing
for array and composite members is extended to also treat domains as
containers requiring recursion, and the APIs for the module are cleaned
up and simplified.
The patch also modifies plpy_typeio to rely on the typcache more than
it did before (which was pretty much not at all). This reduces the
need for repetitive lookups, and lets us get rid of an ad-hoc scheme
for detecting changes in composite types. I added a couple of small
features to typcache to help with that.
Although some of this is fixing bugs that long predate v11, I don't
think we should risk a back-patch: it's a significant amount of code
churn, and there've been no complaints from the field about the bugs.
Tom Lane, reviewed by Anthony Bykov
Discussion: https://postgr.es/m/24449.1509393613@sss.pgh.pa.us
8 years ago
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
|
|
|
PLy_procedure_munge_source(const char *name, const char *src)
|
|
|
|
{
|
|
|
|
char *mrc,
|
|
|
|
*mp;
|
|
|
|
const char *sp;
|
|
|
|
size_t mlen;
|
|
|
|
int plen;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* room for function source and the def statement
|
|
|
|
*/
|
|
|
|
mlen = (strlen(src) * 2) + strlen(name) + 16;
|
|
|
|
|
|
|
|
mrc = palloc(mlen);
|
|
|
|
plen = snprintf(mrc, mlen, "def %s():\n\t", name);
|
|
|
|
Assert(plen >= 0 && plen < mlen);
|
|
|
|
|
|
|
|
sp = src;
|
|
|
|
mp = mrc + plen;
|
|
|
|
|
|
|
|
while (*sp != '\0')
|
|
|
|
{
|
|
|
|
if (*sp == '\r' && *(sp + 1) == '\n')
|
|
|
|
sp++;
|
|
|
|
|
|
|
|
if (*sp == '\n' || *sp == '\r')
|
|
|
|
{
|
|
|
|
*mp++ = '\n';
|
|
|
|
*mp++ = '\t';
|
|
|
|
sp++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*mp++ = *sp++;
|
|
|
|
}
|
|
|
|
*mp++ = '\n';
|
|
|
|
*mp++ = '\n';
|
|
|
|
*mp = '\0';
|
|
|
|
|
|
|
|
if (mp > (mrc + mlen))
|
|
|
|
elog(FATAL, "buffer overrun in PLy_munge_source");
|
|
|
|
|
|
|
|
return mrc;
|
|
|
|
}
|