mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix overly tense optimization of PLpgSQL_func_hashkey: we must represent

Browse Source 
the isTrigger state explicitly, not rely on nonzero-ness of trigrelOid
to indicate trigger-hood, because trigrelOid will be left zero when compiling
for validation.  The (useless) function hash entry built by the validator
was able to match an ordinary non-trigger call later in the same session,
thereby bypassing the check that is supposed to prevent such a call.
Per report from Alvaro.

It might be worth suppressing the useless hash entry altogether, but
that's a bigger change than I want to consider back-patching.

Back-patch to 8.0.  7.4 doesn't have the problem because it doesn't
have validation mode.
This commit is contained in:
Tom Lane 2008-10-09 16:35:07 +00:00
parent 1b0f58a9ce
commit b15531033e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pl/plpgsql/src/pl_comp.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.130 2008/09/01 20:42:46 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.131 2008/10/09 16:35:07 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1941,12 +1941,15 @@ compute_function_hashkey(FunctionCallInfo fcinfo,
/* get function OID */ /* get function OID */
hashkey->funcOid = fcinfo->flinfo->fn_oid; hashkey->funcOid = fcinfo->flinfo->fn_oid;
/* get call context */
hashkey->isTrigger = CALLED_AS_TRIGGER(fcinfo);
/* /*
* if trigger, get relation OID. In validation mode we do not know what * if trigger, get relation OID. In validation mode we do not know what
* relation is intended to be used, so we leave trigrelOid zero; the hash * relation is intended to be used, so we leave trigrelOid zero; the hash
* entry built in this case will never really be used. * entry built in this case will never really be used.
*/ */
if (CALLED_AS_TRIGGER(fcinfo) && !forValidator) if (hashkey->isTrigger && !forValidator)
{ {
TriggerData *trigdata = (TriggerData *) fcinfo->context; TriggerData *trigdata = (TriggerData *) fcinfo->context;

6
src/pl/plpgsql/src/plpgsql.h
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.100 2008/05/15 22:39:49 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.101 2008/10/09 16:35:07 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -616,6 +616,10 @@ typedef struct PLpgSQL_func_hashkey
{ /* Hash lookup key for functions */ { /* Hash lookup key for functions */
Oid funcOid; Oid funcOid;
bool isTrigger; /* true if called as a trigger */
/* be careful that pad bytes in this struct get zeroed! */
/* /*
* For a trigger function, the OID of the relation triggered on is part of * For a trigger function, the OID of the relation triggered on is part of
* the hashkey --- we want to compile the trigger separately for each * the hashkey --- we want to compile the trigger separately for each