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

Commitb8d7174

Browse files
committed
Store table oid and tuple's tid in tuple slots directly.
After the introduction of tuple table slots all table AMs need tosupport returning the table oid of the tuple stored in a slot createdby said AM. It does not make sense to re-implement that in every AM,therefore move handling of table OIDs into the TupleTableSlotstructure itself. It's possible that we, at a later date, might wantto get rid of HeapTupleData.t_tableOid entirely, but doing so beforethe abstractions for table AMs are integrated turns out to be toohard, so delay that for now.Similarly, every AM needs to support the concept of a tupleidentifier (tid / item pointer) for its tuples. It's quite possiblethat we'll generalize the exact form of a tid at a future point (toallow for things like index organized tables), but for now many partsof the code know about tids, so there's not much point in abstractingtids away. Therefore also move into slot (rather than providing API toset/get the tid associated with the tuple in a slot).Once table AM includes insert/updating/deleting tuples, theresponsibility to set the correct tid after such an action will moveinto that. After that change, code doing such modifications, shouldnot have to deal with HeapTuples directly anymore.Author: Andres Freund, Haribabu Kommi and Ashutosh BapatDiscussion:https://postgr.es/m/20180703070645.wchpu5muyto5n647@alap3.anarazel.de
1 parent5408e23 commitb8d7174

File tree

7 files changed

+69
-44
lines changed

7 files changed

+69
-44
lines changed

‎src/backend/commands/copy.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2710,10 +2710,10 @@ CopyFrom(CopyState cstate)
27102710
tuple=heap_form_tuple(tupDesc,values,nulls);
27112711

27122712
/*
2713-
* Constraints might reference the tableoid column, so initialize
2714-
*t_tableOid before evaluating them.
2713+
* Constraints might reference the tableoid column, so(re-)initialize
2714+
*tts_tableOid before evaluating them.
27152715
*/
2716-
tuple->t_tableOid=RelationGetRelid(target_resultRelInfo->ri_RelationDesc);
2716+
myslot->tts_tableOid=RelationGetRelid(target_resultRelInfo->ri_RelationDesc);
27172717

27182718
/* Triggers and stuff need to be invoked in query context. */
27192719
MemoryContextSwitchTo(oldcontext);
@@ -2899,7 +2899,7 @@ CopyFrom(CopyState cstate)
28992899
MemoryContextSwitchTo(oldcontext);
29002900
}
29012901

2902-
tuple->t_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
2902+
slot->tts_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
29032903
}
29042904

29052905
skip_tuple= false;
@@ -2995,14 +2995,18 @@ CopyFrom(CopyState cstate)
29952995

29962996
/*
29972997
* AFTER ROW Triggers might reference the tableoid
2998-
* column, so initializet_tableOid before evaluating
2999-
* them.
2998+
* column, so(re-)initializetts_tableOid before
2999+
*evaluatingthem.
30003000
*/
3001-
tuple->t_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
3001+
slot->tts_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
30023002
}
30033003
else
3004+
{
30043005
heap_insert(resultRelInfo->ri_RelationDesc,tuple,
30053006
mycid,hi_options,bistate);
3007+
ItemPointerCopy(&tuple->t_self,&slot->tts_tid);
3008+
slot->tts_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
3009+
}
30063010

30073011
/* And create index entries for it */
30083012
if (resultRelInfo->ri_NumIndices>0)

‎src/backend/commands/tablecmds.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4860,7 +4860,10 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
48604860

48614861
/* Write the tuple out to the new relation */
48624862
if (newrel)
4863+
{
48634864
heap_insert(newrel,tuple,mycid,hi_options,bistate);
4865+
ItemPointerCopy(&tuple->t_self,&newslot->tts_tid);
4866+
}
48644867

48654868
ResetExprContext(econtext);
48664869

‎src/backend/executor/execReplication.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ ExecSimpleRelationInsert(EState *estate, TupleTableSlot *slot)
424424

425425
/* OK, store the tuple and create index entries for it */
426426
simple_heap_insert(rel,tuple);
427+
ItemPointerCopy(&tuple->t_self,&slot->tts_tid);
427428

428429
if (resultRelInfo->ri_NumIndices>0)
429430
recheckIndexes=ExecInsertIndexTuples(slot,&(tuple->t_self),
@@ -496,6 +497,7 @@ ExecSimpleRelationUpdate(EState *estate, EPQState *epqstate,
496497

497498
/* OK, update the tuple and index entries for it */
498499
simple_heap_update(rel,&hsearchslot->tuple->t_self,hslot->tuple);
500+
ItemPointerCopy(&hslot->tuple->t_self,&slot->tts_tid);
499501

500502
if (resultRelInfo->ri_NumIndices>0&&
501503
!HeapTupleIsHeapOnly(hslot->tuple))

‎src/backend/executor/execTuples.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ tts_heap_store_tuple(TupleTableSlot *slot, HeapTuple tuple, bool shouldFree)
436436
hslot->tuple=tuple;
437437
hslot->off=0;
438438
slot->tts_flags &= ~TTS_FLAG_EMPTY;
439+
slot->tts_tid=tuple->t_self;
439440

440441
if (shouldFree)
441442
slot->tts_flags |=TTS_FLAG_SHOULDFREE;
@@ -817,6 +818,7 @@ tts_buffer_heap_store_tuple(TupleTableSlot *slot, HeapTuple tuple,
817818
slot->tts_nvalid=0;
818819
bslot->base.tuple=tuple;
819820
bslot->base.off=0;
821+
slot->tts_tid=tuple->t_self;
820822

821823
/*
822824
* If tuple is on a disk page, keep the page pinned as long as we hold a
@@ -1304,6 +1306,8 @@ ExecStoreHeapTuple(HeapTuple tuple,
13041306
elog(ERROR,"trying to store a heap tuple into wrong type of slot");
13051307
tts_heap_store_tuple(slot,tuple,shouldFree);
13061308

1309+
slot->tts_tableOid=tuple->t_tableOid;
1310+
13071311
returnslot;
13081312
}
13091313

@@ -1343,6 +1347,7 @@ ExecStoreBufferHeapTuple(HeapTuple tuple,
13431347
elog(ERROR,"trying to store an on-disk heap tuple into wrong type of slot");
13441348
tts_buffer_heap_store_tuple(slot,tuple,buffer, false);
13451349

1350+
slot->tts_tableOid=tuple->t_tableOid;
13461351

13471352
returnslot;
13481353
}
@@ -1368,6 +1373,8 @@ ExecStorePinnedBufferHeapTuple(HeapTuple tuple,
13681373
elog(ERROR,"trying to store an on-disk heap tuple into wrong type of slot");
13691374
tts_buffer_heap_store_tuple(slot,tuple,buffer, true);
13701375

1376+
slot->tts_tableOid=tuple->t_tableOid;
1377+
13711378
returnslot;
13721379
}
13731380

‎src/backend/executor/nodeForeignscan.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,11 @@ ForeignNext(ForeignScanState *node)
5555
MemoryContextSwitchTo(oldcontext);
5656

5757
/*
58-
* If any system columns are requested, we have to force the tuple into
59-
* physical-tuple form to avoid "cannot extract system attribute from
60-
* virtual tuple" errors later. We also insert a valid value for
61-
* tableoid, which is the only actually-useful system column.
58+
* Insert valid value into tableoid, the only actually-useful system
59+
* column.
6260
*/
6361
if (plan->fsSystemCol&& !TupIsNull(slot))
64-
{
65-
HeapTupletup=ExecFetchSlotHeapTuple(slot, true,NULL);
66-
67-
tup->t_tableOid=RelationGetRelid(node->ss.ss_currentRelation);
68-
}
62+
slot->tts_tableOid=RelationGetRelid(node->ss.ss_currentRelation);
6963

7064
returnslot;
7165
}

‎src/backend/executor/nodeModifyTable.c

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,15 @@ ExecProcessReturning(ResultRelInfo *resultRelInfo,
166166
/* Make tuple and any needed join variables available to ExecProject */
167167
if (tupleSlot)
168168
econtext->ecxt_scantuple=tupleSlot;
169-
else
170-
{
171-
HeapTupletuple;
172-
173-
/*
174-
* RETURNING expressions might reference the tableoid column, so
175-
* initialize t_tableOid before evaluating them.
176-
*/
177-
Assert(!TupIsNull(econtext->ecxt_scantuple));
178-
tuple=ExecFetchSlotHeapTuple(econtext->ecxt_scantuple, true,NULL);
179-
tuple->t_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
180-
}
181169
econtext->ecxt_outertuple=planSlot;
182170

171+
/*
172+
* RETURNING expressions might reference the tableoid column, so
173+
* reinitialize tts_tableOid before evaluating them.
174+
*/
175+
econtext->ecxt_scantuple->tts_tableOid=
176+
RelationGetRelid(resultRelInfo->ri_RelationDesc);
177+
183178
/* Compute the RETURNING expressions */
184179
returnExecProject(projectReturning);
185180
}
@@ -332,19 +327,21 @@ ExecInsert(ModifyTableState *mtstate,
332327

333328
/*
334329
* AFTER ROW Triggers or RETURNING expressions might reference the
335-
* tableoid column, so initialize t_tableOid before evaluating them.
330+
* tableoid column, so (re-)initialize tts_tableOid before evaluating
331+
* them.
336332
*/
337-
tuple->t_tableOid=RelationGetRelid(resultRelationDesc);
333+
slot->tts_tableOid=RelationGetRelid(resultRelInfo->ri_RelationDesc);
334+
338335
}
339336
else
340337
{
341338
WCOKindwco_kind;
342339

343340
/*
344-
* Constraints might reference the tableoid column, so initialize
345-
*t_tableOid before evaluating them.
341+
* Constraints might reference the tableoid column, so(re-)initialize
342+
*tts_tableOid before evaluating them.
346343
*/
347-
tuple->t_tableOid=RelationGetRelid(resultRelationDesc);
344+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
348345

349346
/*
350347
* Check any RLS WITH CHECK policies.
@@ -458,6 +455,8 @@ ExecInsert(ModifyTableState *mtstate,
458455
estate->es_output_cid,
459456
HEAP_INSERT_SPECULATIVE,
460457
NULL);
458+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
459+
ItemPointerCopy(&tuple->t_self,&slot->tts_tid);
461460

462461
/* insert index entries for tuple */
463462
recheckIndexes=ExecInsertIndexTuples(slot,&(tuple->t_self),
@@ -503,6 +502,8 @@ ExecInsert(ModifyTableState *mtstate,
503502
heap_insert(resultRelationDesc,tuple,
504503
estate->es_output_cid,
505504
0,NULL);
505+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
506+
ItemPointerCopy(&tuple->t_self,&slot->tts_tid);
506507

507508
/* insert index entries for tuple */
508509
if (resultRelInfo->ri_NumIndices>0)
@@ -515,7 +516,7 @@ ExecInsert(ModifyTableState *mtstate,
515516
if (canSetTag)
516517
{
517518
(estate->es_processed)++;
518-
setLastTid(&(tuple->t_self));
519+
setLastTid(&slot->tts_tid);
519520
}
520521

521522
/*
@@ -647,8 +648,6 @@ ExecDelete(ModifyTableState *mtstate,
647648
}
648649
elseif (resultRelInfo->ri_FdwRoutine)
649650
{
650-
HeapTupletuple;
651-
652651
/*
653652
* delete from foreign table: let the FDW do it
654653
*
@@ -670,12 +669,11 @@ ExecDelete(ModifyTableState *mtstate,
670669

671670
/*
672671
* RETURNING expressions might reference the tableoid column, so
673-
* initializet_tableOid before evaluating them.
672+
*(re)initializetts_tableOid before evaluating them.
674673
*/
675674
if (TTS_EMPTY(slot))
676675
ExecStoreAllNullTuple(slot);
677-
tuple=ExecFetchSlotHeapTuple(slot, true,NULL);
678-
tuple->t_tableOid=RelationGetRelid(resultRelationDesc);
676+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
679677
}
680678
else
681679
{
@@ -985,20 +983,21 @@ ExecUpdate(ModifyTableState *mtstate,
985983

986984
/*
987985
* AFTER ROW Triggers or RETURNING expressions might reference the
988-
* tableoid column, so initialize t_tableOid before evaluating them.
986+
* tableoid column, so (re-)initialize tts_tableOid before evaluating
987+
* them.
989988
*/
990-
tuple->t_tableOid=RelationGetRelid(resultRelationDesc);
989+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
991990
}
992991
else
993992
{
994993
LockTupleModelockmode;
995994
boolpartition_constraint_failed;
996995

997996
/*
998-
* Constraints might reference the tableoid column, so initialize
999-
*t_tableOid before evaluating them.
997+
* Constraints might reference the tableoid column, so(re-)initialize
998+
*tts_tableOid before evaluating them.
1000999
*/
1001-
tuple->t_tableOid=RelationGetRelid(resultRelationDesc);
1000+
slot->tts_tableOid=RelationGetRelid(resultRelationDesc);
10021001

10031002
/*
10041003
* Check any RLS UPDATE WITH CHECK policies
@@ -1184,6 +1183,8 @@ lreplace:;
11841183
estate->es_crosscheck_snapshot,
11851184
true/* wait for commit */ ,
11861185
&hufd,&lockmode);
1186+
ItemPointerCopy(&tuple->t_self,&slot->tts_tid);
1187+
11871188
switch (result)
11881189
{
11891190
caseHeapTupleSelfUpdated:

‎src/include/executor/tuptable.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#defineTUPTABLE_H
1616

1717
#include"access/htup.h"
18+
#include"access/sysattr.h"
1819
#include"access/tupdesc.h"
1920
#include"access/htup_details.h"
2021
#include"storage/buf.h"
@@ -126,6 +127,8 @@ typedef struct TupleTableSlot
126127
#defineFIELDNO_TUPLETABLESLOT_ISNULL 6
127128
bool*tts_isnull;/* current per-attribute isnull flags */
128129
MemoryContexttts_mcxt;/* slot itself is in this context */
130+
ItemPointerDatatts_tid;/* stored tuple's tid */
131+
Oidtts_tableOid;/* table oid of tuple */
129132
}TupleTableSlot;
130133

131134
/* routines for a TupleTableSlot implementation */
@@ -398,6 +401,17 @@ slot_getsysattr(TupleTableSlot *slot, int attnum, bool *isnull)
398401
{
399402
AssertArg(attnum<0);/* caller error */
400403

404+
if (attnum==TableOidAttributeNumber)
405+
{
406+
*isnull= false;
407+
returnObjectIdGetDatum(slot->tts_tableOid);
408+
}
409+
elseif (attnum==SelfItemPointerAttributeNumber)
410+
{
411+
*isnull= false;
412+
returnPointerGetDatum(&slot->tts_tid);
413+
}
414+
401415
/* Fetch the system attribute from the underlying tuple. */
402416
returnslot->tts_ops->getsysattr(slot,attnum,isnull);
403417
}

0 commit comments

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