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

Commitf1b4c77

Browse files
committed
Fix reporting of constraint violations for table partitioning.
After a tuple is routed to a partition, it has been converted from theroot table's row type to the partition's row type. ExecConstraintsneeds to report the failure using the original tuple and the parent'stuple descriptor rather than the ones for the selected partition.Amit Langote
1 parent3e353a7 commitf1b4c77

File tree

8 files changed

+86
-26
lines changed

8 files changed

+86
-26
lines changed

‎src/backend/commands/copy.c‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2426,6 +2426,7 @@ CopyFrom(CopyState cstate)
24262426
cstate->rel,
24272427
1,/* dummy rangetable index */
24282428
true,/* do load partition check expression */
2429+
NULL,
24292430
0);
24302431

24312432
ExecOpenIndices(resultRelInfo, false);
@@ -2491,7 +2492,7 @@ CopyFrom(CopyState cstate)
24912492
for (;;)
24922493
{
24932494
TupleTableSlot*slot,
2494-
*oldslot=NULL;
2495+
*oldslot;
24952496
boolskip_tuple;
24962497
Oidloaded_oid=InvalidOid;
24972498

@@ -2533,6 +2534,7 @@ CopyFrom(CopyState cstate)
25332534
ExecStoreTuple(tuple,slot,InvalidBuffer, false);
25342535

25352536
/* Determine the partition to heap_insert the tuple into */
2537+
oldslot=slot;
25362538
if (cstate->partition_dispatch_info)
25372539
{
25382540
intleaf_part_index;
@@ -2587,7 +2589,6 @@ CopyFrom(CopyState cstate)
25872589
* point on. Use a dedicated slot from this point on until
25882590
* we're finished dealing with the partition.
25892591
*/
2590-
oldslot=slot;
25912592
slot=cstate->partition_tuple_slot;
25922593
Assert(slot!=NULL);
25932594
ExecSetSlotDescriptor(slot,RelationGetDescr(partrel));
@@ -2624,7 +2625,7 @@ CopyFrom(CopyState cstate)
26242625
/* Check the constraints of the tuple */
26252626
if (cstate->rel->rd_att->constr||
26262627
resultRelInfo->ri_PartitionCheck)
2627-
ExecConstraints(resultRelInfo,slot,estate);
2628+
ExecConstraints(resultRelInfo,slot,oldslot,estate);
26282629

26292630
if (useHeapMultiInsert)
26302631
{
@@ -2686,10 +2687,6 @@ CopyFrom(CopyState cstate)
26862687
{
26872688
resultRelInfo=saved_resultRelInfo;
26882689
estate->es_result_relation_info=resultRelInfo;
2689-
2690-
/* Switch back to the slot corresponding to the root table */
2691-
Assert(oldslot!=NULL);
2692-
slot=oldslot;
26932690
}
26942691
}
26952692
}

‎src/backend/commands/tablecmds.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,7 @@ ExecuteTruncate(TruncateStmt *stmt)
13241324
rel,
13251325
0,/* dummy rangetable index */
13261326
false,
1327+
NULL,
13271328
0);
13281329
resultRelInfo++;
13291330
}

‎src/backend/executor/execMain.c‎

Lines changed: 58 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -828,6 +828,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
828828
resultRelation,
829829
resultRelationIndex,
830830
true,
831+
NULL,
831832
estate->es_instrument);
832833
resultRelInfo++;
833834
}
@@ -1218,6 +1219,7 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
12181219
RelationresultRelationDesc,
12191220
IndexresultRelationIndex,
12201221
boolload_partition_check,
1222+
Relationpartition_root,
12211223
intinstrument_options)
12221224
{
12231225
MemSet(resultRelInfo,0,sizeof(ResultRelInfo));
@@ -1259,6 +1261,11 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
12591261
resultRelInfo->ri_PartitionCheck=
12601262
RelationGetPartitionQual(resultRelationDesc,
12611263
true);
1264+
/*
1265+
* The following gets set to NULL unless we are initializing leaf
1266+
* partitions for tuple-routing.
1267+
*/
1268+
resultRelInfo->ri_PartitionRoot=partition_root;
12621269
}
12631270

12641271
/*
@@ -1322,6 +1329,7 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
13221329
rel,
13231330
0,/* dummy rangetable index */
13241331
true,
1332+
NULL,
13251333
estate->es_instrument);
13261334
estate->es_trig_target_relations=
13271335
lappend(estate->es_trig_target_relations,rInfo);
@@ -1743,9 +1751,21 @@ ExecPartitionCheck(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
17431751
returnExecQual(resultRelInfo->ri_PartitionCheckExpr,econtext, true);
17441752
}
17451753

1754+
/*
1755+
* ExecConstraints - check constraints of the tuple in 'slot'
1756+
*
1757+
* This checks the traditional NOT NULL and check constraints, as well as
1758+
* the partition constraint, if any.
1759+
*
1760+
* Note: 'slot' contains the tuple to check the constraints of, which may
1761+
* have been converted from the original input tuple after tuple routing,
1762+
* while 'orig_slot' contains the original tuple to be shown in the message,
1763+
* if an error occurs.
1764+
*/
17461765
void
17471766
ExecConstraints(ResultRelInfo*resultRelInfo,
1748-
TupleTableSlot*slot,EState*estate)
1767+
TupleTableSlot*slot,TupleTableSlot*orig_slot,
1768+
EState*estate)
17491769
{
17501770
Relationrel=resultRelInfo->ri_RelationDesc;
17511771
TupleDesctupdesc=RelationGetDescr(rel);
@@ -1767,22 +1787,34 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
17671787
slot_attisnull(slot,attrChk))
17681788
{
17691789
char*val_desc;
1790+
Relationorig_rel=rel;
1791+
TupleDescorig_tupdesc=tupdesc;
1792+
1793+
/*
1794+
* choose the correct relation to build val_desc from the
1795+
* tuple contained in orig_slot
1796+
*/
1797+
if (resultRelInfo->ri_PartitionRoot)
1798+
{
1799+
rel=resultRelInfo->ri_PartitionRoot;
1800+
tupdesc=RelationGetDescr(rel);
1801+
}
17701802

17711803
insertedCols=GetInsertedColumns(resultRelInfo,estate);
17721804
updatedCols=GetUpdatedColumns(resultRelInfo,estate);
17731805
modifiedCols=bms_union(insertedCols,updatedCols);
17741806
val_desc=ExecBuildSlotValueDescription(RelationGetRelid(rel),
1775-
slot,
1807+
orig_slot,
17761808
tupdesc,
17771809
modifiedCols,
17781810
64);
17791811

17801812
ereport(ERROR,
17811813
(errcode(ERRCODE_NOT_NULL_VIOLATION),
17821814
errmsg("null value in column \"%s\" violates not-null constraint",
1783-
NameStr(tupdesc->attrs[attrChk-1]->attname)),
1815+
NameStr(orig_tupdesc->attrs[attrChk-1]->attname)),
17841816
val_desc ?errdetail("Failing row contains %s.",val_desc) :0,
1785-
errtablecol(rel,attrChk)));
1817+
errtablecol(orig_rel,attrChk)));
17861818
}
17871819
}
17881820
}
@@ -1794,41 +1826,57 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
17941826
if ((failed=ExecRelCheck(resultRelInfo,slot,estate))!=NULL)
17951827
{
17961828
char*val_desc;
1829+
Relationorig_rel=rel;
1830+
1831+
/* See the comment above. */
1832+
if (resultRelInfo->ri_PartitionRoot)
1833+
{
1834+
rel=resultRelInfo->ri_PartitionRoot;
1835+
tupdesc=RelationGetDescr(rel);
1836+
}
17971837

17981838
insertedCols=GetInsertedColumns(resultRelInfo,estate);
17991839
updatedCols=GetUpdatedColumns(resultRelInfo,estate);
18001840
modifiedCols=bms_union(insertedCols,updatedCols);
18011841
val_desc=ExecBuildSlotValueDescription(RelationGetRelid(rel),
1802-
slot,
1842+
orig_slot,
18031843
tupdesc,
18041844
modifiedCols,
18051845
64);
18061846
ereport(ERROR,
18071847
(errcode(ERRCODE_CHECK_VIOLATION),
18081848
errmsg("new row for relation \"%s\" violates check constraint \"%s\"",
1809-
RelationGetRelationName(rel),failed),
1849+
RelationGetRelationName(orig_rel),failed),
18101850
val_desc ?errdetail("Failing row contains %s.",val_desc) :0,
1811-
errtableconstraint(rel,failed)));
1851+
errtableconstraint(orig_rel,failed)));
18121852
}
18131853
}
18141854

18151855
if (resultRelInfo->ri_PartitionCheck&&
18161856
!ExecPartitionCheck(resultRelInfo,slot,estate))
18171857
{
18181858
char*val_desc;
1859+
Relationorig_rel=rel;
1860+
1861+
/* See the comment above. */
1862+
if (resultRelInfo->ri_PartitionRoot)
1863+
{
1864+
rel=resultRelInfo->ri_PartitionRoot;
1865+
tupdesc=RelationGetDescr(rel);
1866+
}
18191867

18201868
insertedCols=GetInsertedColumns(resultRelInfo,estate);
18211869
updatedCols=GetUpdatedColumns(resultRelInfo,estate);
18221870
modifiedCols=bms_union(insertedCols,updatedCols);
18231871
val_desc=ExecBuildSlotValueDescription(RelationGetRelid(rel),
1824-
slot,
1872+
orig_slot,
18251873
tupdesc,
18261874
modifiedCols,
18271875
64);
18281876
ereport(ERROR,
18291877
(errcode(ERRCODE_CHECK_VIOLATION),
18301878
errmsg("new row for relation \"%s\" violates partition constraint",
1831-
RelationGetRelationName(rel)),
1879+
RelationGetRelationName(orig_rel)),
18321880
val_desc ?errdetail("Failing row contains %s.",val_desc) :0));
18331881
}
18341882
}
@@ -3086,6 +3134,7 @@ ExecSetupPartitionTupleRouting(Relation rel,
30863134
partrel,
30873135
1,/* dummy */
30883136
false,
3137+
rel,
30893138
0);
30903139

30913140
/*

‎src/backend/executor/nodeModifyTable.c‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ ExecInsert(ModifyTableState *mtstate,
262262
RelationresultRelationDesc;
263263
OidnewId;
264264
List*recheckIndexes=NIL;
265-
TupleTableSlot*oldslot=NULL;
265+
TupleTableSlot*oldslot=slot;
266266

267267
/*
268268
* get the heap tuple out of the tuple table slot, making sure we have a
@@ -328,7 +328,6 @@ ExecInsert(ModifyTableState *mtstate,
328328
* point on, until we're finished dealing with the partition.
329329
* Use the dedicated slot for that.
330330
*/
331-
oldslot=slot;
332331
slot=mtstate->mt_partition_tuple_slot;
333332
Assert(slot!=NULL);
334333
ExecSetSlotDescriptor(slot,RelationGetDescr(partrel));
@@ -434,7 +433,7 @@ ExecInsert(ModifyTableState *mtstate,
434433
* Check the constraints of the tuple
435434
*/
436435
if (resultRelationDesc->rd_att->constr||resultRelInfo->ri_PartitionCheck)
437-
ExecConstraints(resultRelInfo,slot,estate);
436+
ExecConstraints(resultRelInfo,slot,oldslot,estate);
438437

439438
if (onconflict!=ONCONFLICT_NONE&&resultRelInfo->ri_NumIndices>0)
440439
{
@@ -579,10 +578,6 @@ ExecInsert(ModifyTableState *mtstate,
579578
{
580579
resultRelInfo=saved_resultRelInfo;
581580
estate->es_result_relation_info=resultRelInfo;
582-
583-
/* Switch back to the slot corresponding to the root table */
584-
Assert(oldslot!=NULL);
585-
slot=oldslot;
586581
}
587582

588583
/*
@@ -994,10 +989,12 @@ lreplace:;
994989
resultRelInfo,slot,estate);
995990

996991
/*
997-
* Check the constraints of the tuple
992+
* Check the constraints of the tuple. Note that we pass the same
993+
* slot for the orig_slot argument, because unlike ExecInsert(), no
994+
* tuple-routing is performed here, hence the slot remains unchanged.
998995
*/
999996
if (resultRelationDesc->rd_att->constr||resultRelInfo->ri_PartitionCheck)
1000-
ExecConstraints(resultRelInfo,slot,estate);
997+
ExecConstraints(resultRelInfo,slot,slot,estate);
1001998

1002999
/*
10031000
* replace the heap tuple

‎src/include/executor/executor.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,13 @@ extern void InitResultRelInfo(ResultRelInfo *resultRelInfo,
190190
RelationresultRelationDesc,
191191
IndexresultRelationIndex,
192192
boolload_partition_check,
193+
Relationpartition_root,
193194
intinstrument_options);
194195
externResultRelInfo*ExecGetTriggerResultRel(EState*estate,Oidrelid);
195196
externboolExecContextForcesOids(PlanState*planstate,bool*hasoids);
196197
externvoidExecConstraints(ResultRelInfo*resultRelInfo,
197-
TupleTableSlot*slot,EState*estate);
198+
TupleTableSlot*slot,TupleTableSlot*orig_slot,
199+
EState*estate);
198200
externvoidExecWithCheckOptions(WCOKindkind,ResultRelInfo*resultRelInfo,
199201
TupleTableSlot*slot,EState*estate);
200202
externLockTupleModeExecUpdateLockMode(EState*estate,ResultRelInfo*relinfo);

‎src/include/nodes/execnodes.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ typedef struct ResultRelInfo
349349
List*ri_onConflictSetWhere;
350350
List*ri_PartitionCheck;
351351
List*ri_PartitionCheckExpr;
352+
Relationri_PartitionRoot;
352353
}ResultRelInfo;
353354

354355
/* ----------------

‎src/test/regress/expected/insert.out‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,5 +333,12 @@ select tableoid::regclass, * from p;
333333
p11 | 1 | 2
334334
(1 row)
335335

336+
truncate p;
337+
alter table p add constraint check_b check (b = 3);
338+
-- check that correct input row is shown when constraint check_b fails on p11
339+
-- after "(1, 2)" is routed to it
340+
insert into p values (1, 2);
341+
ERROR: new row for relation "p11" violates check constraint "check_b"
342+
DETAIL: Failing row contains (1, 2).
336343
-- cleanup
337344
drop table p, p1, p11;

‎src/test/regress/sql/insert.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,5 +195,11 @@ alter table p attach partition p1 for values from (1, 2) to (1, 10);
195195
insert into pvalues (1,2);
196196
select tableoid::regclass,*from p;
197197

198+
truncate p;
199+
altertable p addconstraint check_bcheck (b=3);
200+
-- check that correct input row is shown when constraint check_b fails on p11
201+
-- after "(1, 2)" is routed to it
202+
insert into pvalues (1,2);
203+
198204
-- cleanup
199205
droptable p, p1, p11;

0 commit comments

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