diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/executor.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/execnodes.h | 12 | ||||
| -rw-r--r-- | src/include/utils/memutils.h | 12 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 571f35c64e3..31cc2107536 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.84 2002/12/15 16:17:54 tgl Exp $ + * $Id: executor.h,v 1.85 2002/12/15 21:01:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -41,7 +41,6 @@ extern bool ExecSupportsMarkRestore(NodeTag plantype); */ extern JunkFilter *ExecInitJunkFilter(List *targetList, TupleDesc tupType, TupleTableSlot *slot); -extern void ExecFreeJunkFilter(JunkFilter *junkfilter); extern bool ExecGetJunkAttribute(JunkFilter *junkfilter, TupleTableSlot *slot, char *attrName, Datum *value, bool *isNull); extern HeapTuple ExecRemoveJunk(JunkFilter *junkfilter, TupleTableSlot *slot); diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 65c5f23884d..b57d7ac58cc 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: execnodes.h,v 1.86 2002/12/15 16:17:56 tgl Exp $ + * $Id: execnodes.h,v 1.87 2002/12/15 21:01:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -218,16 +218,7 @@ typedef struct ProjectionInfo * cleanMap: A map with the correspondence between the non-junk * attribute numbers of the "original" tuple and the * attribute numbers of the "clean" tuple. - * junkContext: memory context holding the JunkFilter node and all - * its subsidiary data structures. * resultSlot: tuple slot that can be used to hold cleaned tuple. - * - * NOTE: the original targetList and tupType are passed to ExecInitJunkFilter, - * as is the resultSlot. These items do not belong to the JunkFilter. All - * the other subsidiary structures are created during ExecInitJunkFilter, - * and all of them can be freed by deleting the memory context junkContext. - * This would not be needed if we had a cleaner approach to managing - * query-lifetime data structures... * ---------------- */ typedef struct JunkFilter @@ -240,7 +231,6 @@ typedef struct JunkFilter int jf_cleanLength; TupleDesc jf_cleanTupType; AttrNumber *jf_cleanMap; - MemoryContext jf_junkContext; TupleTableSlot *jf_resultSlot; } JunkFilter; diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 8529f948227..94578b8fb6f 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: memutils.h,v 1.48 2002/09/04 20:31:45 momjian Exp $ + * $Id: memutils.h,v 1.49 2002/12/15 21:01:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -116,8 +116,16 @@ extern MemoryContext AllocSetContextCreate(MemoryContext parent, * Recommended default alloc parameters, suitable for "ordinary" contexts * that might hold quite a lot of data. */ -#define ALLOCSET_DEFAULT_MINSIZE (8 * 1024) +#define ALLOCSET_DEFAULT_MINSIZE 0 #define ALLOCSET_DEFAULT_INITSIZE (8 * 1024) #define ALLOCSET_DEFAULT_MAXSIZE (8 * 1024 * 1024) +/* + * Recommended alloc parameters for "small" contexts that are not expected + * to contain much data (for example, a context to contain a query plan). + */ +#define ALLOCSET_SMALL_MINSIZE 0 +#define ALLOCSET_SMALL_INITSIZE (1 * 1024) +#define ALLOCSET_SMALL_MAXSIZE (8 * 1024) + #endif /* MEMUTILS_H */ |