From 2e852e541c84af85aa918762fc838fa44a399310 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 21 Feb 2011 21:41:08 -0500 Subject: [PATCH] Remove ExecRemoveJunk(), which is no longer used anywhere. This was a leftover from the pre-8.1 design of junkfilters. It doesn't seem to have any reason to live, since it's merely a combination of two easy function calls, and not a well-designed combination at that (it encourages callers to leak the result tuple). --- src/backend/executor/execJunk.c | 18 +++--------------- src/include/executor/executor.h | 1 - 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index 5d0174c5af..3e995c8f07 100644 --- a/src/backend/executor/execJunk.c +++ b/src/backend/executor/execJunk.c @@ -40,9 +40,9 @@ * * Finally, when at the top level we get back a tuple, we can call * ExecFindJunkAttribute/ExecGetJunkAttribute to retrieve the values of the - * junk attributes we are interested in, and ExecFilterJunk or ExecRemoveJunk - * to remove all the junk attributes from a tuple. This new "clean" tuple is - * then printed, inserted, or updated. + * junk attributes we are interested in, and ExecFilterJunk to remove all the + * junk attributes from a tuple. This new "clean" tuple is then printed, + * inserted, or updated. * *------------------------------------------------------------------------- */ @@ -317,15 +317,3 @@ ExecFilterJunk(JunkFilter *junkfilter, TupleTableSlot *slot) */ return ExecStoreVirtualTuple(resultSlot); } - -/* - * ExecRemoveJunk - * - * Convenience routine to generate a physical clean tuple, - * rather than just a virtual slot. - */ -HeapTuple -ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot) -{ - return ExecCopySlotTuple(ExecFilterJunk(junkfilter, slot)); -} diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 482e8d382d..018b14ac84 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -148,7 +148,6 @@ extern Datum ExecGetJunkAttribute(TupleTableSlot *slot, AttrNumber attno, bool *isNull); extern TupleTableSlot *ExecFilterJunk(JunkFilter *junkfilter, TupleTableSlot *slot); -extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); /*