Skip to content

Commit 29c94e0

Browse files
anarazelanarazel
committed
Split ExecStoreTuple into ExecStoreHeapTuple and ExecStoreBufferHeapTuple.
Upcoming changes introduce further types of tuple table slots, in preparation of making table storage pluggable. New storage methods will have different representation of tuples, therefore the slot accessor should refer explicitly to heap tuples. Instead of just renaming the functions, split it into one function that accepts heap tuples not residing in buffers, and one accepting ones in buffers. Previously one function was used for both, but that was a bit awkward already, and splitting will allow us to represent slot types for tuples in buffers and normal memory separately. This is split out from the patch introducing abstract slots, as this largely consists out of mechanical changes. Author: Ashutosh Bapat Reviewed-By: Andres Freund Discussion: https://postgr.es/m/20180220224318.gw4oe5jadhpmcdnm@alap3.anarazel.de
1 parent bbdfbb9 commit 29c94e0

32 files changed

+172
-145
lines changed

‎contrib/postgres_fdw/postgres_fdw.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,10 +1443,9 @@ postgresIterateForeignScan(ForeignScanState *node)
14431443
/*
14441444
* Return the next tuple.
14451445
*/
1446-
ExecStoreTuple(fsstate->tuples[fsstate->next_tuple++],
1447-
slot,
1448-
InvalidBuffer,
1449-
false);
1446+
ExecStoreHeapTuple(fsstate->tuples[fsstate->next_tuple++],
1447+
slot,
1448+
false);
14501449

14511450
return slot;
14521451
}
@@ -3517,7 +3516,7 @@ store_returning_result(PgFdwModifyState *fmstate,
35173516
NULL,
35183517
fmstate->temp_cxt);
35193518
/* tuple will be deleted when it is cleared from the slot */
3520-
ExecStoreTuple(newtup, slot, InvalidBuffer, true);
3519+
ExecStoreHeapTuple(newtup, slot, true);
35213520
}
35223521
PG_CATCH();
35233522
{
@@ -3790,7 +3789,7 @@ get_returning_data(ForeignScanState *node)
37903789
dmstate->retrieved_attrs,
37913790
node,
37923791
dmstate->temp_cxt);
3793-
ExecStoreTuple(newtup, slot, InvalidBuffer, false);
3792+
ExecStoreHeapTuple(newtup, slot, false);
37943793
}
37953794
PG_CATCH();
37963795
{

‎src/backend/access/heap/heapam.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4502,14 +4502,14 @@ ProjIndexIsUnchanged(Relation relation, HeapTuple oldtup, HeapTuple newtup)
45024502
int i;
45034503

45044504
ResetExprContext(econtext);
4505-
ExecStoreTuple(oldtup, slot, InvalidBuffer, false);
4505+
ExecStoreHeapTuple(oldtup, slot, false);
45064506
FormIndexDatum(indexInfo,
45074507
slot,
45084508
estate,
45094509
old_values,
45104510
old_isnull);
45114511

4512-
ExecStoreTuple(newtup, slot, InvalidBuffer, false);
4512+
ExecStoreHeapTuple(newtup, slot, false);
45134513
FormIndexDatum(indexInfo,
45144514
slot,
45154515
estate,

‎src/backend/catalog/index.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2866,7 +2866,7 @@ IndexBuildHeapRangeScan(Relation heapRelation,
28662866
MemoryContextReset(econtext->ecxt_per_tuple_memory);
28672867

28682868
/* Set up for predicate or expression evaluation */
2869-
ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
2869+
ExecStoreHeapTuple(heapTuple, slot, false);
28702870

28712871
/*
28722872
* In a partial index, discard tuples that don't satisfy the
@@ -3015,7 +3015,7 @@ IndexCheckExclusion(Relation heapRelation,
30153015
MemoryContextReset(econtext->ecxt_per_tuple_memory);
30163016

30173017
/* Set up for predicate or expression evaluation */
3018-
ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
3018+
ExecStoreHeapTuple(heapTuple, slot, false);
30193019

30203020
/*
30213021
* In a partial index, ignore tuples that don't satisfy the predicate.
@@ -3436,7 +3436,7 @@ validate_index_heapscan(Relation heapRelation,
34363436
MemoryContextReset(econtext->ecxt_per_tuple_memory);
34373437

34383438
/* Set up for predicate or expression evaluation */
3439-
ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
3439+
ExecStoreHeapTuple(heapTuple, slot, false);
34403440

34413441
/*
34423442
* In a partial index, discard tuples that don't satisfy the

‎src/backend/catalog/indexing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ CatalogIndexInsert(CatalogIndexState indstate, HeapTuple heapTuple)
9696

9797
/* Need a slot to hold the tuple being examined */
9898
slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRelation));
99-
ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
99+
ExecStoreHeapTuple(heapTuple, slot, false);
100100

101101
/*
102102
* for each index, form and insert the index tuple

‎src/backend/commands/analyze.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ compute_index_stats(Relation onerel, double totalrows,
799799
ResetExprContext(econtext);
800800

801801
/* Set up for predicate or expression evaluation */
802-
ExecStoreTuple(heapTuple, slot, InvalidBuffer, false);
802+
ExecStoreHeapTuple(heapTuple, slot, false);
803803

804804
/* If index is partial, check predicate */
805805
if (predicate != NULL)

‎src/backend/commands/constraint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ unique_key_recheck(PG_FUNCTION_ARGS)
124124
*/
125125
slot = MakeSingleTupleTableSlot(RelationGetDescr(trigdata->tg_relation));
126126

127-
ExecStoreTuple(new_row, slot, InvalidBuffer, false);
127+
ExecStoreHeapTuple(new_row, slot, false);
128128

129129
/*
130130
* Typically the index won't have expressions, but if it does we need an

‎src/backend/commands/copy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2684,7 +2684,7 @@ CopyFrom(CopyState cstate)
26842684

26852685
/* Place tuple in tuple slot --- but slot shouldn't free it */
26862686
slot = myslot;
2687-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
2687+
ExecStoreHeapTuple(tuple, slot, false);
26882688

26892689
/* Determine the partition to heap_insert the tuple into */
26902690
if (proute)
@@ -3119,7 +3119,7 @@ CopyFromInsertBatch(CopyState cstate, EState *estate, CommandId mycid,
31193119
List *recheckIndexes;
31203120

31213121
cstate->cur_lineno = firstBufferedLineNo + i;
3122-
ExecStoreTuple(bufferedTuples[i], myslot, InvalidBuffer, false);
3122+
ExecStoreHeapTuple(bufferedTuples[i], myslot, false);
31233123
recheckIndexes =
31243124
ExecInsertIndexTuples(myslot, &(bufferedTuples[i]->t_self),
31253125
estate, false, NULL, NIL);

‎src/backend/commands/functioncmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2337,7 +2337,7 @@ ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic, DestReceiver
23372337
rettupdata.t_tableOid = InvalidOid;
23382338
rettupdata.t_data = td;
23392339

2340-
slot = ExecStoreTuple(&rettupdata, tstate->slot, InvalidBuffer, false);
2340+
slot = ExecStoreHeapTuple(&rettupdata, tstate->slot, false);
23412341
tstate->dest->receiveSlot(slot, tstate->dest);
23422342

23432343
end_tup_output(tstate);

‎src/backend/commands/tablecmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4776,7 +4776,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
47764776
* Process supplied expressions to replace selected columns.
47774777
* Expression inputs come from the old tuple.
47784778
*/
4779-
ExecStoreTuple(tuple, oldslot, InvalidBuffer, false);
4779+
ExecStoreHeapTuple(tuple, oldslot, false);
47804780
econtext->ecxt_scantuple = oldslot;
47814781

47824782
foreach(l, tab->newvals)
@@ -4806,7 +4806,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
48064806
}
48074807

48084808
/* Now check any constraints on the possibly-changed tuple */
4809-
ExecStoreTuple(tuple, newslot, InvalidBuffer, false);
4809+
ExecStoreHeapTuple(tuple, newslot, false);
48104810
econtext->ecxt_scantuple = newslot;
48114811

48124812
foreach(l, notnull_attrs)
@@ -8526,7 +8526,7 @@ validateCheckConstraint(Relation rel, HeapTuple constrtup)
85268526

85278527
while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
85288528
{
8529-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
8529+
ExecStoreHeapTuple(tuple, slot, false);
85308530

85318531
if (!ExecCheck(exprstate, econtext))
85328532
ereport(ERROR,

‎src/backend/commands/trigger.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,7 +2571,7 @@ ExecBRInsertTriggers(EState *estate, ResultRelInfo *relinfo,
25712571

25722572
if (newslot->tts_tupleDescriptor != tupdesc)
25732573
ExecSetSlotDescriptor(newslot, tupdesc);
2574-
ExecStoreTuple(newtuple, newslot, InvalidBuffer, false);
2574+
ExecStoreHeapTuple(newtuple, newslot, false);
25752575
slot = newslot;
25762576
}
25772577
return slot;
@@ -2652,7 +2652,7 @@ ExecIRInsertTriggers(EState *estate, ResultRelInfo *relinfo,
26522652

26532653
if (newslot->tts_tupleDescriptor != tupdesc)
26542654
ExecSetSlotDescriptor(newslot, tupdesc);
2655-
ExecStoreTuple(newtuple, newslot, InvalidBuffer, false);
2655+
ExecStoreHeapTuple(newtuple, newslot, false);
26562656
slot = newslot;
26572657
}
26582658
return slot;
@@ -3078,7 +3078,7 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
30783078

30793079
if (newslot->tts_tupleDescriptor != tupdesc)
30803080
ExecSetSlotDescriptor(newslot, tupdesc);
3081-
ExecStoreTuple(newtuple, newslot, InvalidBuffer, false);
3081+
ExecStoreHeapTuple(newtuple, newslot, false);
30823082
slot = newslot;
30833083
}
30843084
return slot;
@@ -3186,7 +3186,7 @@ ExecIRUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
31863186

31873187
if (newslot->tts_tupleDescriptor != tupdesc)
31883188
ExecSetSlotDescriptor(newslot, tupdesc);
3189-
ExecStoreTuple(newtuple, newslot, InvalidBuffer, false);
3189+
ExecStoreHeapTuple(newtuple, newslot, false);
31903190
slot = newslot;
31913191
}
31923192
return slot;
@@ -3514,7 +3514,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
35143514
oldslot = estate->es_trig_oldtup_slot;
35153515
if (oldslot->tts_tupleDescriptor != tupdesc)
35163516
ExecSetSlotDescriptor(oldslot, tupdesc);
3517-
ExecStoreTuple(oldtup, oldslot, InvalidBuffer, false);
3517+
ExecStoreHeapTuple(oldtup, oldslot, false);
35183518
}
35193519
if (HeapTupleIsValid(newtup))
35203520
{
@@ -3528,7 +3528,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
35283528
newslot = estate->es_trig_newtup_slot;
35293529
if (newslot->tts_tupleDescriptor != tupdesc)
35303530
ExecSetSlotDescriptor(newslot, tupdesc);
3531-
ExecStoreTuple(newtup, newslot, InvalidBuffer, false);
3531+
ExecStoreHeapTuple(newtup, newslot, false);
35323532
}
35333533

35343534
/*

‎src/backend/executor/execIndexing.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ check_exclusion_or_unique_constraint(Relation heap, Relation index,
750750
* Extract the index column values and isnull flags from the existing
751751
* tuple.
752752
*/
753-
ExecStoreTuple(tup, existing_slot, InvalidBuffer, false);
753+
ExecStoreHeapTuple(tup, existing_slot, false);
754754
FormIndexDatum(indexInfo, existing_slot, estate,
755755
existing_values, existing_isnull);
756756

‎src/backend/executor/execMain.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,7 @@ ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo,
19571957
{
19581958
tuple = do_convert_tuple(tuple, map);
19591959
ExecSetSlotDescriptor(slot, tupdesc);
1960-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
1960+
ExecStoreHeapTuple(tuple, slot, false);
19611961
}
19621962
}
19631963

@@ -2036,7 +2036,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
20362036
{
20372037
tuple = do_convert_tuple(tuple, map);
20382038
ExecSetSlotDescriptor(slot, tupdesc);
2039-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
2039+
ExecStoreHeapTuple(tuple, slot, false);
20402040
}
20412041
}
20422042

@@ -2084,7 +2084,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
20842084
{
20852085
tuple = do_convert_tuple(tuple, map);
20862086
ExecSetSlotDescriptor(slot, tupdesc);
2087-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
2087+
ExecStoreHeapTuple(tuple, slot, false);
20882088
}
20892089
}
20902090

@@ -2190,7 +2190,7 @@ ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo,
21902190
{
21912191
tuple = do_convert_tuple(tuple, map);
21922192
ExecSetSlotDescriptor(slot, tupdesc);
2193-
ExecStoreTuple(tuple, slot, InvalidBuffer, false);
2193+
ExecStoreHeapTuple(tuple, slot, false);
21942194
}
21952195
}
21962196

‎src/backend/executor/execPartition.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
258258
if (myslot != NULL && map != NULL)
259259
{
260260
tuple = do_convert_tuple(tuple, map);
261-
ExecStoreTuple(tuple, myslot, InvalidBuffer, true);
261+
ExecStoreHeapTuple(tuple, myslot, true);
262262
slot = myslot;
263263
}
264264

@@ -842,7 +842,7 @@ ConvertPartitionTupleSlot(TupleConversionMap *map,
842842
*p_my_slot = new_slot;
843843
Assert(new_slot != NULL);
844844
ExecSetSlotDescriptor(new_slot, map->outdesc);
845-
ExecStoreTuple(tuple, new_slot, InvalidBuffer, shouldFree);
845+
ExecStoreHeapTuple(tuple, new_slot, shouldFree);
846846

847847
return tuple;
848848
}

‎src/backend/executor/execReplication.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ RelationFindReplTupleByIndex(Relation rel, Oid idxoid,
146146
if ((scantuple = index_getnext(scan, ForwardScanDirection)) != NULL)
147147
{
148148
found = true;
149-
ExecStoreTuple(scantuple, outslot, InvalidBuffer, false);
149+
ExecStoreHeapTuple(scantuple, outslot, false);
150150
ExecMaterializeSlot(outslot);
151151

152152
xwait = TransactionIdIsValid(snap.xmin) ?
@@ -310,7 +310,7 @@ RelationFindReplTupleSeq(Relation rel, LockTupleMode lockmode,
310310
continue;
311311

312312
found = true;
313-
ExecStoreTuple(scantuple, outslot, InvalidBuffer, false);
313+
ExecStoreHeapTuple(scantuple, outslot, false);
314314
ExecMaterializeSlot(outslot);
315315

316316
xwait = TransactionIdIsValid(snap.xmin) ?

‎src/backend/executor/execScan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ ExecScanFetch(ScanState *node,
7878
return ExecClearTuple(slot);
7979

8080
/* Store test tuple in the plan node's scan slot */
81-
ExecStoreTuple(estate->es_epqTuple[scanrelid - 1],
82-
slot, InvalidBuffer, false);
81+
ExecStoreHeapTuple(estate->es_epqTuple[scanrelid - 1],
82+
slot, false);
8383

8484
/* Check if it meets the access-method conditions */
8585
if (!(*recheckMtd) (node, slot))

0 commit comments

Comments
 (0)