First stage of reclaiming memory in executor by resetting short-term

memory contexts.  Currently, only leaks in expressions executed as
quals or projections are handled.  Clean up some old dead cruft in
executor while at it --- unused fields in state nodes, that sort of thing.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 285bb314d3d..8d4cb98469f 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hashjoin.h,v 1.17 2000/06/28 03:33:05 tgl Exp $
+ * $Id: hashjoin.h,v 1.18 2000/07/12 02:37:30 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,8 @@
  *				hash-join hash table structures
  *
  * Each active hashjoin has a HashJoinTable control block which is
- * palloc'd in the executor's context.	All other storage needed for
- * the hashjoin is kept in private memory contexts, two for each hashjoin.
+ * palloc'd in the executor's per-query context.  All other storage needed
+ * for the hashjoin is kept in private memory contexts, two for each hashjoin.
  * This makes it easy and fast to release the storage when we don't need it
  * anymore.
  *
@@ -69,6 +69,14 @@ typedef struct HashTableData
 								 * file */
 
 	/*
+	 * Info about the datatype being hashed.  We assume that the inner
+	 * and outer sides of the hash are the same type, or at least
+	 * binary-compatible types.
+	 */
+	bool		typByVal;
+	int			typLen;
+
+	/*
 	 * During 1st scan of inner relation, we get tuples from executor. If
 	 * nbatch > 0 then tuples that don't belong in first nbuckets logical
 	 * buckets get dumped into inner-batch temp files. The same statements