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

Commit80559fa

Browse files
committed
I found a corner case in which it is possible for RI_FKey_check's call
of HeapTupleSatisfiesItself() to trigger a hint-bit update on the tuple:if the row was updated or deleted by a subtransaction of my own transactionthat was later rolled back. This cannot occur in pre-8.0 of course, sothe hint-bit patch applied a couple weeks ago is OK for existing releases.But for 8.0 it seems we had better fix things so that RI_FKey_check canpass the correct buffer number to HeapTupleSatisfiesItself. Accordingly,add fields to the TriggerData struct to carry the buffer ID(s) for theold and new tuple(s). There are other possible solutions but this oneseems cleanest; it will allow other AFTER-trigger functions to safelydo tqual.c calls if they want to. Put new fields at end of struct sothat there is no API breakage.
1 parent88868d4 commit80559fa

File tree

5 files changed

+73
-24
lines changed

5 files changed

+73
-24
lines changed

‎doc/src/sgml/trigger.sgml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.36 2004/08/13 16:17:19 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.37 2004/10/30 20:52:46 tgl Exp $
33
-->
44

55
<chapter id="triggers">
@@ -256,6 +256,8 @@ typedef struct TriggerData
256256
HeapTuple tg_trigtuple;
257257
HeapTuple tg_newtuple;
258258
Trigger *tg_trigger;
259+
Buffer tg_trigtuplebuf;
260+
Buffer tg_newtuplebuf;
259261
} TriggerData;
260262
</programlisting>
261263

@@ -427,6 +429,27 @@ typedef struct Trigger
427429
</para>
428430
</listitem>
429431
</varlistentry>
432+
433+
<varlistentry>
434+
<term><structfield>tg_trigtuplebuf</></term>
435+
<listitem>
436+
<para>
437+
The buffer containing tg_trigtuple, or InvalidBuffer if there
438+
is no such tuple or it is not stored in a disk buffer.
439+
</para>
440+
</listitem>
441+
</varlistentry>
442+
443+
<varlistentry>
444+
<term><structfield>tg_newtuplebuf</></term>
445+
<listitem>
446+
<para>
447+
The buffer containing tg_newtuple, or InvalidBuffer if there
448+
is no such tuple or it is not stored in a disk buffer.
449+
</para>
450+
</listitem>
451+
</varlistentry>
452+
430453
</variablelist>
431454
</para>
432455

‎src/backend/commands/tablecmds.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.137 2004/10/22 17:20:04 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.138 2004/10/3020:52:56 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -4256,6 +4256,8 @@ validateForeignKeyConstraint(FkConstraint *fkconstraint,
42564256
trigdata.tg_trigtuple=tuple;
42574257
trigdata.tg_newtuple=NULL;
42584258
trigdata.tg_trigger=&trig;
4259+
trigdata.tg_trigtuplebuf=scan->rs_cbuf;
4260+
trigdata.tg_newtuplebuf=InvalidBuffer;
42594261

42604262
fcinfo.context= (Node*)&trigdata;
42614263

‎src/backend/commands/trigger.c

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.173 2004/10/21 21:33:59 tgl Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.174 2004/10/30 20:52:56 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1192,8 +1192,10 @@ ExecBSInsertTriggers(EState *estate, ResultRelInfo *relinfo)
11921192
LocTriggerData.tg_event=TRIGGER_EVENT_INSERT |
11931193
TRIGGER_EVENT_BEFORE;
11941194
LocTriggerData.tg_relation=relinfo->ri_RelationDesc;
1195-
LocTriggerData.tg_newtuple=NULL;
11961195
LocTriggerData.tg_trigtuple=NULL;
1196+
LocTriggerData.tg_newtuple=NULL;
1197+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
1198+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
11971199
for (i=0;i<ntrigs;i++)
11981200
{
11991201
Trigger*trigger=&trigdesc->triggers[tgindx[i]];
@@ -1246,13 +1248,15 @@ ExecBRInsertTriggers(EState *estate, ResultRelInfo *relinfo,
12461248
TRIGGER_EVENT_BEFORE;
12471249
LocTriggerData.tg_relation=relinfo->ri_RelationDesc;
12481250
LocTriggerData.tg_newtuple=NULL;
1251+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
12491252
for (i=0;i<ntrigs;i++)
12501253
{
12511254
Trigger*trigger=&trigdesc->triggers[tgindx[i]];
12521255

12531256
if (!trigger->tgenabled)
12541257
continue;
12551258
LocTriggerData.tg_trigtuple=oldtuple=newtuple;
1259+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
12561260
LocTriggerData.tg_trigger=trigger;
12571261
newtuple=ExecCallTriggerFunc(&LocTriggerData,
12581262
relinfo->ri_TrigFunctions+tgindx[i],
@@ -1305,8 +1309,10 @@ ExecBSDeleteTriggers(EState *estate, ResultRelInfo *relinfo)
13051309
LocTriggerData.tg_event=TRIGGER_EVENT_DELETE |
13061310
TRIGGER_EVENT_BEFORE;
13071311
LocTriggerData.tg_relation=relinfo->ri_RelationDesc;
1308-
LocTriggerData.tg_newtuple=NULL;
13091312
LocTriggerData.tg_trigtuple=NULL;
1313+
LocTriggerData.tg_newtuple=NULL;
1314+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
1315+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
13101316
for (i=0;i<ntrigs;i++)
13111317
{
13121318
Trigger*trigger=&trigdesc->triggers[tgindx[i]];
@@ -1365,13 +1371,15 @@ ExecBRDeleteTriggers(EState *estate, ResultRelInfo *relinfo,
13651371
TRIGGER_EVENT_BEFORE;
13661372
LocTriggerData.tg_relation=relinfo->ri_RelationDesc;
13671373
LocTriggerData.tg_newtuple=NULL;
1374+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
13681375
for (i=0;i<ntrigs;i++)
13691376
{
13701377
Trigger*trigger=&trigdesc->triggers[tgindx[i]];
13711378

13721379
if (!trigger->tgenabled)
13731380
continue;
13741381
LocTriggerData.tg_trigtuple=trigtuple;
1382+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
13751383
LocTriggerData.tg_trigger=trigger;
13761384
newtuple=ExecCallTriggerFunc(&LocTriggerData,
13771385
relinfo->ri_TrigFunctions+tgindx[i],
@@ -1434,8 +1442,10 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
14341442
LocTriggerData.tg_event=TRIGGER_EVENT_UPDATE |
14351443
TRIGGER_EVENT_BEFORE;
14361444
LocTriggerData.tg_relation=relinfo->ri_RelationDesc;
1437-
LocTriggerData.tg_newtuple=NULL;
14381445
LocTriggerData.tg_trigtuple=NULL;
1446+
LocTriggerData.tg_newtuple=NULL;
1447+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
1448+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
14391449
for (i=0;i<ntrigs;i++)
14401450
{
14411451
Trigger*trigger=&trigdesc->triggers[tgindx[i]];
@@ -1509,6 +1519,8 @@ ExecBRUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
15091519
continue;
15101520
LocTriggerData.tg_trigtuple=trigtuple;
15111521
LocTriggerData.tg_newtuple=oldtuple=newtuple;
1522+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
1523+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
15121524
LocTriggerData.tg_trigger=trigger;
15131525
newtuple=ExecCallTriggerFunc(&LocTriggerData,
15141526
relinfo->ri_TrigFunctions+tgindx[i],
@@ -1896,8 +1908,8 @@ AfterTriggerExecute(AfterTriggerEvent event,
18961908
HeapTupleDataoldtuple;
18971909
HeapTupleDatanewtuple;
18981910
HeapTuplerettuple;
1899-
Bufferoldbuffer;
1900-
Buffernewbuffer;
1911+
Bufferoldbuffer=InvalidBuffer;
1912+
Buffernewbuffer=InvalidBuffer;
19011913
inttgindx;
19021914

19031915
/*
@@ -1942,16 +1954,22 @@ AfterTriggerExecute(AfterTriggerEvent event,
19421954
caseTRIGGER_EVENT_INSERT:
19431955
LocTriggerData.tg_trigtuple=&newtuple;
19441956
LocTriggerData.tg_newtuple=NULL;
1957+
LocTriggerData.tg_trigtuplebuf=newbuffer;
1958+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
19451959
break;
19461960

19471961
caseTRIGGER_EVENT_UPDATE:
19481962
LocTriggerData.tg_trigtuple=&oldtuple;
19491963
LocTriggerData.tg_newtuple=&newtuple;
1964+
LocTriggerData.tg_trigtuplebuf=oldbuffer;
1965+
LocTriggerData.tg_newtuplebuf=newbuffer;
19501966
break;
19511967

19521968
caseTRIGGER_EVENT_DELETE:
19531969
LocTriggerData.tg_trigtuple=&oldtuple;
19541970
LocTriggerData.tg_newtuple=NULL;
1971+
LocTriggerData.tg_trigtuplebuf=oldbuffer;
1972+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
19551973
break;
19561974
}
19571975

@@ -1970,9 +1988,9 @@ AfterTriggerExecute(AfterTriggerEvent event,
19701988
/*
19711989
* Release buffers
19721990
*/
1973-
if (ItemPointerIsValid(&(event->ate_oldctid)))
1991+
if (oldbuffer!=InvalidBuffer)
19741992
ReleaseBuffer(oldbuffer);
1975-
if (ItemPointerIsValid(&(event->ate_newctid)))
1993+
if (newbuffer!=InvalidBuffer)
19761994
ReleaseBuffer(newbuffer);
19771995
}
19781996

@@ -2916,6 +2934,14 @@ AfterTriggerSaveEvent(ResultRelInfo *relinfo, int event, bool row_trigger,
29162934
LocTriggerData.tg_trigtuple=oldtup;
29172935
LocTriggerData.tg_newtuple=newtup;
29182936
LocTriggerData.tg_trigger=trigger;
2937+
/*
2938+
* We do not currently know which buffers the passed tuples
2939+
* are in, but it does not matter because RI_FKey_keyequal_upd
2940+
* does not care. We could expand the API of this function
2941+
* if it becomes necessary to set these fields accurately.
2942+
*/
2943+
LocTriggerData.tg_trigtuplebuf=InvalidBuffer;
2944+
LocTriggerData.tg_newtuplebuf=InvalidBuffer;
29192945

29202946
if (RI_FKey_keyequal_upd(&LocTriggerData))
29212947
{

‎src/backend/utils/adt/ri_triggers.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
1919
*
20-
* $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.74 2004/10/15 22:40:11 tgl Exp $
20+
* $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.75 2004/10/30 20:52:59 tgl Exp $
2121
*
2222
* ----------
2323
*/
@@ -186,6 +186,7 @@ RI_FKey_check(PG_FUNCTION_ARGS)
186186
Relationpk_rel;
187187
HeapTuplenew_row;
188188
HeapTupleold_row;
189+
Buffernew_row_buf;
189190
RI_QueryKeyqkey;
190191
void*qplan;
191192
inti;
@@ -213,35 +214,30 @@ RI_FKey_check(PG_FUNCTION_ARGS)
213214
{
214215
old_row=trigdata->tg_trigtuple;
215216
new_row=trigdata->tg_newtuple;
217+
new_row_buf=trigdata->tg_newtuplebuf;
216218
}
217219
else
218220
{
219221
old_row=NULL;
220222
new_row=trigdata->tg_trigtuple;
223+
new_row_buf=trigdata->tg_trigtuplebuf;
221224
}
222225

223226
/*
224227
* We should not even consider checking the row if it is no longer
225228
* valid since it was either deleted (doesn't matter) or updated (in
226229
* which case it'll be checked with its final values).
227-
*
228-
* We do not know what buffer the new_row is in, but it doesn't matter
229-
* since it's not possible for a hint-bit update to occur here (the
230-
* new_row could only contain our own XID, and we haven't yet committed
231-
* or aborted...)
232230
*/
233-
if (new_row)
231+
Assert(new_row_buf!=InvalidBuffer);
232+
if (!HeapTupleSatisfiesItself(new_row->t_data,new_row_buf))
234233
{
235-
if (!HeapTupleSatisfiesItself(new_row->t_data,InvalidBuffer))
236-
{
237-
heap_close(pk_rel,RowShareLock);
238-
returnPointerGetDatum(NULL);
239-
}
234+
heap_close(pk_rel,RowShareLock);
235+
returnPointerGetDatum(NULL);
240236
}
241237

242238
/* ----------
243239
* SQL3 11.9 <referential constraint definition>
244-
*Gereral rules 2) a):
240+
*General rules 2) a):
245241
*If Rf and Rt are empty (no columns to compare given)
246242
*constraint is true if 0 < (SELECT COUNT(*) FROM T)
247243
*

‎src/include/commands/trigger.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.49 2004/09/10 18:40:06 tgl Exp $
9+
* $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.50 2004/10/30 20:53:06 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -34,6 +34,8 @@ typedef struct TriggerData
3434
HeapTupletg_trigtuple;
3535
HeapTupletg_newtuple;
3636
Trigger*tg_trigger;
37+
Buffertg_trigtuplebuf;
38+
Buffertg_newtuplebuf;
3739
}TriggerData;
3840

3941
/* TriggerEvent bit flags */

0 commit comments

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