diff options
Diffstat (limited to 'src/backend/executor/execJunk.c')
| -rw-r--r-- | src/backend/executor/execJunk.c | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index edaf7aa40cd..0f8b82d4f47 100644 --- a/src/backend/executor/execJunk.c +++ b/src/backend/executor/execJunk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.33 2002/12/12 15:49:28 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.34 2002/12/15 21:01:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -63,8 +63,6 @@ JunkFilter * ExecInitJunkFilter(List *targetList, TupleDesc tupType, TupleTableSlot *slot) { - MemoryContext oldContext; - MemoryContext junkContext; JunkFilter *junkfilter; List *cleanTargetList; int len, @@ -80,19 +78,6 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType, Expr *expr; /* - * Make a memory context that will hold the JunkFilter as well as all - * the subsidiary structures we are about to create. We use smaller- - * than-default sizing parameters since we don't expect a very large - * volume of stuff here. - */ - junkContext = AllocSetContextCreate(CurrentMemoryContext, - "JunkFilterContext", - 1024, - 1024, - ALLOCSET_DEFAULT_MAXSIZE); - oldContext = MemoryContextSwitchTo(junkContext); - - /* * First find the "clean" target list, i.e. all the entries in the * original target list which have a false 'resjunk' NOTE: make copy * of the Resdom nodes, because we have to change the 'resno's... @@ -174,34 +159,15 @@ ExecInitJunkFilter(List *targetList, TupleDesc tupType, junkfilter->jf_cleanLength = cleanLength; junkfilter->jf_cleanTupType = cleanTupType; junkfilter->jf_cleanMap = cleanMap; - junkfilter->jf_junkContext = junkContext; junkfilter->jf_resultSlot = slot; if (slot) ExecSetSlotDescriptor(slot, cleanTupType, false); - MemoryContextSwitchTo(oldContext); - return junkfilter; } /*------------------------------------------------------------------------- - * ExecFreeJunkFilter - * - * Release the data structures created by ExecInitJunkFilter. - *------------------------------------------------------------------------- - */ -void -ExecFreeJunkFilter(JunkFilter *junkfilter) -{ - /* - * Since the junkfilter is inside its own context, we just have to - * delete the context and we're set. - */ - MemoryContextDelete(junkfilter->jf_junkContext); -} - -/*------------------------------------------------------------------------- * ExecGetJunkAttribute * * Given a tuple (slot), the junk filter and a junk attribute's name, |