diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index b3ce4bae53..1fd4f85b49 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1781,7 +1781,7 @@ ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo, */ if (map != NULL) slot = execute_attr_map_slot(map, slot, - MakeTupleTableSlot(tupdesc, &TTSOpsVirtual)); + MakeSingleTupleTableSlot(tupdesc, &TTSOpsVirtual)); modifiedCols = bms_union(ExecGetInsertedCols(rootrel, estate), ExecGetUpdatedCols(rootrel, estate)); } @@ -1866,7 +1866,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo, */ if (map != NULL) slot = execute_attr_map_slot(map, slot, - MakeTupleTableSlot(tupdesc, &TTSOpsVirtual)); + MakeSingleTupleTableSlot(tupdesc, &TTSOpsVirtual)); modifiedCols = bms_union(ExecGetInsertedCols(rootrel, estate), ExecGetUpdatedCols(rootrel, estate)); rel = rootrel->ri_RelationDesc; @@ -1918,7 +1918,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo, */ if (map != NULL) slot = execute_attr_map_slot(map, slot, - MakeTupleTableSlot(tupdesc, &TTSOpsVirtual)); + MakeSingleTupleTableSlot(tupdesc, &TTSOpsVirtual)); modifiedCols = bms_union(ExecGetInsertedCols(rootrel, estate), ExecGetUpdatedCols(rootrel, estate)); rel = rootrel->ri_RelationDesc; @@ -2025,7 +2025,7 @@ ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo, */ if (map != NULL) slot = execute_attr_map_slot(map, slot, - MakeTupleTableSlot(tupdesc, &TTSOpsVirtual)); + MakeSingleTupleTableSlot(tupdesc, &TTSOpsVirtual)); modifiedCols = bms_union(ExecGetInsertedCols(rootrel, estate), ExecGetUpdatedCols(rootrel, estate)); diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index f447802843..687e15fcf3 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -1100,7 +1100,7 @@ const TupleTableSlotOps TTSOpsBufferHeapTuple = { */ /* -------------------------------- - * MakeTupleTableSlot + * MakeSingleTupleTableSlot * * Basic routine to make an empty TupleTableSlot of given * TupleTableSlotType. If tupleDesc is specified the slot's descriptor is @@ -1109,7 +1109,7 @@ const TupleTableSlotOps TTSOpsBufferHeapTuple = { * -------------------------------- */ TupleTableSlot * -MakeTupleTableSlot(TupleDesc tupleDesc, +MakeSingleTupleTableSlot(TupleDesc tupleDesc, const TupleTableSlotOps *tts_ops) { Size basesz, @@ -1171,7 +1171,7 @@ TupleTableSlot * ExecAllocTableSlot(List **tupleTable, TupleDesc desc, const TupleTableSlotOps *tts_ops) { - TupleTableSlot *slot = MakeTupleTableSlot(desc, tts_ops); + TupleTableSlot *slot = MakeSingleTupleTableSlot(desc, tts_ops); *tupleTable = lappend(*tupleTable, slot); @@ -1225,24 +1225,6 @@ ExecResetTupleTable(List *tupleTable, /* tuple table */ list_free(tupleTable); } -/* -------------------------------- - * MakeSingleTupleTableSlot - * - * This is a convenience routine for operations that need a standalone - * TupleTableSlot not gotten from the main executor tuple table. It makes - * a single slot of given TupleTableSlotType and initializes it to use the - * given tuple descriptor. - * -------------------------------- - */ -TupleTableSlot * -MakeSingleTupleTableSlot(TupleDesc tupdesc, - const TupleTableSlotOps *tts_ops) -{ - TupleTableSlot *slot = MakeTupleTableSlot(tupdesc, tts_ops); - - return slot; -} - /* -------------------------------- * ExecDropSingleTupleTableSlot * diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 679e57fbdd..54ec4514b5 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -293,8 +293,6 @@ typedef struct MinimalTupleTableSlot ((slot) == NULL || TTS_EMPTY(slot)) /* in executor/execTuples.c */ -extern TupleTableSlot *MakeTupleTableSlot(TupleDesc tupleDesc, - const TupleTableSlotOps *tts_ops); extern TupleTableSlot *ExecAllocTableSlot(List **tupleTable, TupleDesc desc, const TupleTableSlotOps *tts_ops); extern void ExecResetTupleTable(List *tupleTable, bool shouldFree);