Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1b5bbe4

Browse files
committed
Fix EvalPlanQualStart to handle partitioned result rels correctly.
The es_root_result_relations array needs to be shallow-copied in thesame way as the main es_result_relations array, else EPQ rechecks onpartitioned result relations fail, as seen in bug #15677 fromNorbert Benkocs.Amit Langote, isolation test case added by meDiscussion:https://postgr.es/m/15677-0bf089579b4cd02d@postgresql.orgDiscussion:https://postgr.es/m/19321.1554567786@sss.pgh.pa.us
1 parent67999b3 commit1b5bbe4

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed

‎src/backend/executor/execMain.c‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3101,7 +3101,7 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
31013101
* es_param_exec_vals, etc.
31023102
*
31033103
* The ResultRelInfo array management is trickier than it looks. We
3104-
* createafresharray for the child but copy all the content from the
3104+
* create fresharrays for the child but copy all the content from the
31053105
* parent. This is because it's okay for the child to share any
31063106
* per-relation state the parent has already created --- but if the child
31073107
* sets up any ResultRelInfo fields, such as its own junkfilter, that
@@ -3118,6 +3118,7 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
31183118
if (parentestate->es_num_result_relations>0)
31193119
{
31203120
intnumResultRelations=parentestate->es_num_result_relations;
3121+
intnumRootResultRels=parentestate->es_num_root_result_relations;
31213122
ResultRelInfo*resultRelInfos;
31223123

31233124
resultRelInfos= (ResultRelInfo*)
@@ -3126,6 +3127,17 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
31263127
numResultRelations*sizeof(ResultRelInfo));
31273128
estate->es_result_relations=resultRelInfos;
31283129
estate->es_num_result_relations=numResultRelations;
3130+
3131+
/* Also transfer partitioned root result relations. */
3132+
if (numRootResultRels>0)
3133+
{
3134+
resultRelInfos= (ResultRelInfo*)
3135+
palloc(numRootResultRels*sizeof(ResultRelInfo));
3136+
memcpy(resultRelInfos,parentestate->es_root_result_relations,
3137+
numRootResultRels*sizeof(ResultRelInfo));
3138+
estate->es_root_result_relations=resultRelInfos;
3139+
estate->es_num_root_result_relations=numRootResultRels;
3140+
}
31293141
}
31303142
/* es_result_relation_info must NOT be copied */
31313143
/* es_trig_target_relations must NOT be copied */

‎src/test/isolation/expected/eval-plan-qual.out‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,15 @@ step multireadwcte: <... completed>
263263
subid id
264264

265265
1 1
266+
267+
starting permutation: simplepartupdate complexpartupdate c1 c2
268+
step simplepartupdate:
269+
update parttbl set a = a;
270+
271+
step complexpartupdate:
272+
with u as (update parttbl set a = a returning parttbl.*)
273+
update parttbl set a = u.a from u;
274+
<waiting ...>
275+
step c1: COMMIT;
276+
step complexpartupdate: <... completed>
277+
step c2: COMMIT;

‎src/test/isolation/specs/eval-plan-qual.spec‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,18 @@ setup
2424

2525
CREATETABLEjointestASSELECTgenerate_series(1,10)ASid,0ASdata;
2626
CREATEINDEXONjointest(id);
27+
28+
CREATETABLEparttbl (aint)PARTITIONBYLIST (a);
29+
CREATETABLEparttbl1PARTITIONOFparttblFORVALUESIN (1);
30+
INSERTINTOparttblVALUES (1);
2731
}
2832

2933
teardown
3034
{
3135
DROPTABLEaccounts;
3236
DROPTABLEpCASCADE;
3337
DROPTABLEtable_a,table_b,jointest;
38+
DROPTABLEparttbl;
3439
}
3540

3641
session"s1"
@@ -99,6 +104,12 @@ step "selectjoinforupdate"{
99104
select*fromjointestajoinjointestbona.id=b.idforupdate;
100105
}
101106

107+
# test for EPQ on a partitioned result table
108+
109+
step"simplepartupdate"{
110+
updateparttblseta=a;
111+
}
112+
102113

103114
session"s2"
104115
setup{BEGINISOLATIONLEVELREADCOMMITTED; }
@@ -133,6 +144,10 @@ step "updateforcip3"{
133144
}
134145
step"wrtwcte"{UPDATEtable_aSETvalue='tableAValue2'WHEREid=1; }
135146
step"wrjt"{UPDATEjointestSETdata=42WHEREid=7; }
147+
step"complexpartupdate"{
148+
withuas (updateparttblseta=areturningparttbl.*)
149+
updateparttblseta=u.afromu;
150+
}
136151
step"c2"{COMMIT; }
137152

138153
session"s3"
@@ -177,3 +192,5 @@ permutation "updateforcip" "updateforcip3" "c1" "c2" "read_a"
177192
permutation"wrtwcte""readwcte""c1""c2"
178193
permutation"wrjt""selectjoinforupdate""c2""c1"
179194
permutation"wrtwcte""multireadwcte""c1""c2"
195+
196+
permutation"simplepartupdate""complexpartupdate""c1""c2"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp