rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix use of relcache TriggerDesc field introduced by commit 05c8482f7f. 

The commit added code which used a relcache TriggerDesc field across
another cache access, which it shouldn't because the relcache doesn't
guarantee it won't get moved.

Diagnosed-by: Tom Lane
Author: Greg Nancarrow
Reviewed-by: Hou Zhijie, Amit Kapila
Discussion: https://postgr.es/m/2309260.1615485644@sss.pgh.pa.us
This commit is contained in:
Amit Kapila 2021-03-12 15:14:41 +05:30
parent 57dcc2ef33
commit e2cda3c20a
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/optimizer/util/clauses.c
View File

@ -114,7 +114,7 @@ static bool target_rel_max_parallel_hazard(max_parallel_hazard_context *context)
static bool target_rel_max_parallel_hazard_recurse(Relation relation, static bool target_rel_max_parallel_hazard_recurse(Relation relation,
CmdType command_type, CmdType command_type,
max_parallel_hazard_context *context); max_parallel_hazard_context *context);
static bool target_rel_trigger_max_parallel_hazard(TriggerDesc *trigdesc, static bool target_rel_trigger_max_parallel_hazard(Relation rel,
max_parallel_hazard_context *context); max_parallel_hazard_context *context);
static bool target_rel_index_max_parallel_hazard(Relation rel, static bool target_rel_index_max_parallel_hazard(Relation rel,
max_parallel_hazard_context *context); max_parallel_hazard_context *context);
@ -926,7 +926,7 @@ target_rel_max_parallel_hazard_recurse(Relation rel,
/* /*
* If any triggers exist, check that they are parallel-safe. * If any triggers exist, check that they are parallel-safe.
*/ */
if (target_rel_trigger_max_parallel_hazard(rel->trigdesc, context)) if (target_rel_trigger_max_parallel_hazard(rel, context))
return true; return true;
/* /*
@ -952,23 +952,29 @@ target_rel_max_parallel_hazard_recurse(Relation rel,
/* /*
* target_rel_trigger_max_parallel_hazard * target_rel_trigger_max_parallel_hazard
* *
* Finds the maximum parallel-mode hazard level for the specified trigger data. * Finds the maximum parallel-mode hazard level for the specified relation's
* trigger data.
*/ */
static bool static bool
target_rel_trigger_max_parallel_hazard(TriggerDesc *trigdesc, target_rel_trigger_max_parallel_hazard(Relation rel,
max_parallel_hazard_context *context) max_parallel_hazard_context *context)
{ {
int i; int i;
if (trigdesc == NULL) if (rel->trigdesc == NULL)
return false; return false;
for (i = 0; i < trigdesc->numtriggers; i++) /*
* Care is needed here to avoid using the same relcache TriggerDesc field
* across other cache accesses, because relcache doesn't guarantee that it
* won't move.
*/
for (i = 0; i < rel->trigdesc->numtriggers; i++)
{ {
int trigtype; int trigtype;
Trigger *trigger = &trigdesc->triggers[i]; Oid tgfoid = rel->trigdesc->triggers[i].tgfoid;
if (max_parallel_hazard_test(func_parallel(trigger->tgfoid), context)) if (max_parallel_hazard_test(func_parallel(tgfoid), context))
return true; return true;
/* /*
@ -977,7 +983,7 @@ target_rel_trigger_max_parallel_hazard(TriggerDesc *trigdesc,
* on insert/update and this isn't supported in a parallel worker (but * on insert/update and this isn't supported in a parallel worker (but
* is safe in the parallel leader). * is safe in the parallel leader).
*/ */
trigtype = RI_FKey_trigger_type(trigger->tgfoid); trigtype = RI_FKey_trigger_type(tgfoid);
if (trigtype == RI_TRIGGER_FK) if (trigtype == RI_TRIGGER_FK)
{ {
if (max_parallel_hazard_test(PROPARALLEL_RESTRICTED, context)) if (max_parallel_hazard_test(PROPARALLEL_RESTRICTED, context))