diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-04-08 12:20:23 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-04-08 12:20:23 -0400 |
| commit | 1b5bbe4bcc912b070ad705ad7a79806692af18c8 (patch) | |
| tree | 47237ac3ce4c3625ee806cabe98dfac2d95413ca /src/backend/executor/execMain.c | |
| parent | 67999b3547f7ee8b8c099f41ddab3001e2792202 (diff) | |
| download | postgresql-1b5bbe4bcc912b070ad705ad7a79806692af18c8.tar.gz postgresql-1b5bbe4bcc912b070ad705ad7a79806692af18c8.zip | |
Fix EvalPlanQualStart to handle partitioned result rels correctly.
The es_root_result_relations array needs to be shallow-copied in the
same way as the main es_result_relations array, else EPQ rechecks on
partitioned result relations fail, as seen in bug #15677 from
Norbert Benkocs.
Amit Langote, isolation test case added by me
Discussion: https://postgr.es/m/15677-0bf089579b4cd02d@postgresql.org
Discussion: https://postgr.es/m/19321.1554567786@sss.pgh.pa.us
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 14704f8838c..bf7631276d9 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -3101,7 +3101,7 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree) * es_param_exec_vals, etc. * * The ResultRelInfo array management is trickier than it looks. We - * create a fresh array for the child but copy all the content from the + * create fresh arrays for the child but copy all the content from the * parent. This is because it's okay for the child to share any * per-relation state the parent has already created --- but if the child * sets up any ResultRelInfo fields, such as its own junkfilter, that @@ -3118,6 +3118,7 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree) if (parentestate->es_num_result_relations > 0) { int numResultRelations = parentestate->es_num_result_relations; + int numRootResultRels = parentestate->es_num_root_result_relations; ResultRelInfo *resultRelInfos; resultRelInfos = (ResultRelInfo *) @@ -3126,6 +3127,17 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree) numResultRelations * sizeof(ResultRelInfo)); estate->es_result_relations = resultRelInfos; estate->es_num_result_relations = numResultRelations; + + /* Also transfer partitioned root result relations. */ + if (numRootResultRels > 0) + { + resultRelInfos = (ResultRelInfo *) + palloc(numRootResultRels * sizeof(ResultRelInfo)); + memcpy(resultRelInfos, parentestate->es_root_result_relations, + numRootResultRels * sizeof(ResultRelInfo)); + estate->es_root_result_relations = resultRelInfos; + estate->es_num_root_result_relations = numRootResultRels; + } } /* es_result_relation_info must NOT be copied */ /* es_trig_target_relations must NOT be copied */ |